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

[REV] revert revision 7730 that will be pushed to trunk via another branch (a dedicated one) 

bzr revid: qdp-launchpad@openerp.com-20121010100832-asu2rj6j7x5328f0
This commit is contained in:
Quentin (OpenERP) 2012-10-10 12:08:32 +02:00
parent 96cbbe9d59
commit 5f8c1b4907
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/account/account_bank_statement.py
View File

@ -461,10 +461,9 @@ class account_bank_statement(osv.osv):
return {}
balance_start = self._compute_balance_end_real(cr, uid, journal_id, context=context)
journal_data = self.pool.get('account.journal').read(cr, uid, journal_id, ['company_id', 'currency'], context=context)
journal_data = self.pool.get('account.journal').read(cr, uid, journal_id, ['company_id'], context=context)
company_id = journal_data['company_id']
currency_id = journal_data['currency'] or self.pool.get('res.company').browse(cr, uid, company_id[0], context=context).currency_id.id
return {'value': {'balance_start': balance_start, 'company_id': company_id, 'currency': currency_id}}
return {'value': {'balance_start': balance_start, 'company_id': company_id}}
def unlink(self, cr, uid, ids, context=None):
stat = self.read(cr, uid, ids, ['state'], context=context)

9
addons/account/account_view.xml
View File

@ -633,10 +633,13 @@
<field name="period_id" class="oe_inline"/>
</div>
<field name='company_id' widget="selection" groups="base.group_multi_company" />
<field name="currency" invisible="1"/>
</group><group>
<field name="balance_start" widget="monetary" options="{'currency_field' : 'currency'}"/>
<field name="balance_end_real" widget="monetary" options='{"currency_field" : "currency"}'/>
<label for="balance_start"/>
<div>
<field name="balance_start" class="oe_inline"/>
<field name="currency" class="oe_inline"/>
</div>
<field name="balance_end_real"/>
</group>
</group>