odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] merge with same branch 

bzr revid: qdp-launchpad@tinyerp.com-20100830105001-srd942nqglul16ey
This commit is contained in:
qdp-launchpad@tinyerp.com 2010-08-30 12:50:01 +02:00
parent becd1d8767 6610dd5511
commit 17b5186d6d
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account/account.py
View File

@ -1000,7 +1000,7 @@ class account_move(osv.osv):
@param context: context arguments, like lang, time zone
@param limit: Returns first 'n' ids of complete result, default is 80.
@return: Returns a list of tupples containing id and name
@return: Returns a list of tuples containing id and name
"""
if not args:

7
addons/account/account_cash_statement.py
View File

@ -77,7 +77,7 @@ class account_cash_statement(osv.osv):
"""
res ={}
for statement in self.browse(cr, uid, ids):
amount_total=0.0
amount_total = 0.0
if statement.journal_id.type not in('cash'):
continue
@ -273,8 +273,6 @@ class account_cash_statement(osv.osv):
'balance_start': balance_start
})
return res
res = super(account_cash_statement, self).onchange_journal_id(cr, uid, statement_id, journal_id, context)
return res
@ -499,8 +497,7 @@ class account_cash_statement(osv.osv):
else:
account_move_line_obj.reconcile_partial(cr, uid, torec, 'statement', context)
if st.journal_id.entry_posted:
account_move_obj.write(cr, uid, [move_id], {'state':'posted'})
account_move_obj.write(cr, uid, [move_id], {'state':'posted'})
done.append(st.id)
vals = {

11
addons/account/invoice.py
View File

@ -1497,12 +1497,13 @@ class account_invoice_tax(osv.osv):
cur_obj = self.pool.get('res.currency')
company_obj = self.pool.get('res.company')
company_currency = False
tax_amount = self.read(cr, uid, ids[0], ['tax_amount'])['tax_amount']
tax_sign = 1
if tax_amount < 0:
tax_sign = -1
elif tax_amount == 0:
tax_sign = 0
if ids:
tax_amount = self.read(cr, uid, ids[0], ['tax_amount'])['tax_amount']
if tax_amount < 0:
tax_sign = -1
elif tax_amount == 0:
tax_sign = 0
if company_id:
company_currency = company_obj.read(cr, uid, [company_id], ['currency_id'])[0]['currency_id'][0]
if currency_id and company_currency:

2
addons/account_voucher/voucher_sales_purchase_view.xml
View File

@ -17,7 +17,7 @@
</group>
<notebook colspan="4">
<page string="Sales Information">
<field name="line_cr_ids" on_change="onchange_price(line_cr_ids, tax_id, parent.partner_id)" default_get="{'journal_id':journal_id, 'partner_id':partner_id}" colspan="4" nolabel="1" height="180">
<field name="line_cr_ids" on_change="onchange_price(line_cr_ids, tax_id, partner_id)" default_get="{'journal_id':journal_id, 'type':type, partner_id':partner_id}" colspan="4" nolabel="1" height="180">
<tree string="Sales Lines" editable="bottom">
<field name="account_id" domain="[('user_type.report_type','=','income'),('type','!=','view')]" widget="selection"/>
<field name="name"/>