[FIX]account_voucher: change payment view to add some field and currency when it is the same than company.
Also add some missing field in account voucher sale form bzr revid: csn@openerp.com-20130423152439-ixdfgasutdv1pj62
This commit is contained in:
parent
2e4aafa7dc
commit
630f1eb42d
|
@ -826,6 +826,8 @@ class account_voucher(osv.osv):
|
||||||
currency_id = False
|
currency_id = False
|
||||||
if journal.currency:
|
if journal.currency:
|
||||||
currency_id = journal.currency.id
|
currency_id = journal.currency.id
|
||||||
|
else:
|
||||||
|
currency_id = journal.company_id.currency_id.id
|
||||||
vals['value'].update({'currency_id': currency_id})
|
vals['value'].update({'currency_id': currency_id})
|
||||||
res = self.onchange_partner_id(cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context)
|
res = self.onchange_partner_id(cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context)
|
||||||
for key in res.keys():
|
for key in res.keys():
|
||||||
|
|
|
@ -305,6 +305,7 @@
|
||||||
on_change="onchange_journal(journal_id, line_cr_ids, False, partner_id, date, amount, type, company_id, context)"
|
on_change="onchange_journal(journal_id, line_cr_ids, False, partner_id, date, amount, type, company_id, context)"
|
||||||
string="Payment Method"/>
|
string="Payment Method"/>
|
||||||
</group>
|
</group>
|
||||||
|
|
||||||
<group>
|
<group>
|
||||||
<field name="date" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
|
<field name="date" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
|
||||||
<field name="period_id"/>
|
<field name="period_id"/>
|
||||||
|
@ -319,6 +320,21 @@
|
||||||
<field name="type" invisible="True"/>
|
<field name="type" invisible="True"/>
|
||||||
</group>
|
</group>
|
||||||
</group>
|
</group>
|
||||||
|
<group>
|
||||||
|
<group>
|
||||||
|
<field name="writeoff_amount" widget="monetary" options="{'currency_field': 'currency_id'}"/>
|
||||||
|
<field name="payment_option" required="1"/>
|
||||||
|
<field name="writeoff_acc_id"
|
||||||
|
attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
|
||||||
|
domain="[('type','=','other')]"/>
|
||||||
|
<field name="comment"
|
||||||
|
attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
|
||||||
|
<field name="analytic_id"
|
||||||
|
groups="analytic.group_analytic_accounting"/>
|
||||||
|
</group>
|
||||||
|
<group>
|
||||||
|
</group>
|
||||||
|
</group>
|
||||||
<notebook invisible="1">
|
<notebook invisible="1">
|
||||||
<page string="Payment Information" groups="base.group_user">
|
<page string="Payment Information" groups="base.group_user">
|
||||||
<label for="line_cr_ids"/>
|
<label for="line_cr_ids"/>
|
||||||
|
@ -364,17 +380,6 @@
|
||||||
<field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" groups="base.group_multi_currency"/>
|
<field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" groups="base.group_multi_currency"/>
|
||||||
<field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
|
<field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
|
||||||
</group>
|
</group>
|
||||||
<group>
|
|
||||||
<field name="writeoff_amount" widget="monetary" options="{'currency_field': 'currency_id'}"/>
|
|
||||||
<field name="payment_option" required="1"/>
|
|
||||||
<field name="writeoff_acc_id"
|
|
||||||
attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
|
|
||||||
domain="[('type','=','other')]"/>
|
|
||||||
<field name="comment"
|
|
||||||
attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
|
|
||||||
<field name="analytic_id"
|
|
||||||
groups="analytic.group_analytic_accounting"/>
|
|
||||||
</group>
|
|
||||||
</group>
|
</group>
|
||||||
</page>
|
</page>
|
||||||
</notebook>
|
</notebook>
|
||||||
|
|
|
@ -145,6 +145,12 @@
|
||||||
</field>
|
</field>
|
||||||
</page>
|
</page>
|
||||||
</notebook>
|
</notebook>
|
||||||
|
<group col="4" invisible="1">
|
||||||
|
<field name="is_multi_currency" invisible="1"/>
|
||||||
|
<field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3" invisible="1"/>
|
||||||
|
<field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" groups="base.group_multi_currency" invisible="1"/>
|
||||||
|
<field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
|
||||||
|
</group>
|
||||||
</sheet>
|
</sheet>
|
||||||
<div class="oe_chatter">
|
<div class="oe_chatter">
|
||||||
<field name="message_follower_ids" widget="mail_followers"/>
|
<field name="message_follower_ids" widget="mail_followers"/>
|
||||||
|
|
Loading…
Reference in New Issue