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

[IMP]Account : changes made for amount_currency field and related changes applied 

bzr revid: dhr@tinyerp.com-20120829061048-rc6x81wewks3x0e2
This commit is contained in:
Dharti Ratani (OpenERP) 2012-08-29 11:40:48 +05:30
parent 159209a3a6
commit f45b3bf33c
7 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account/account_menuitem.xml
View File

@ -44,7 +44,7 @@
<menuitem id="menu_finance_periodical_processing_billing" name="Billing" parent="menu_finance_periodical_processing" sequence="35"/> <menuitem id="menu_finance_periodical_processing_billing" name="Billing" parent="menu_finance_periodical_processing" sequence="35"/>
<menuitem id="next_id_22" name="Partners" parent="menu_finance_generic_reporting" sequence="1"/> <menuitem id="next_id_22" name="Partners" parent="menu_finance_generic_reporting" sequence="1"/>
<menuitem id="menu_multi_currency" name="Multi-Currencies" parent="menu_finance_generic_reporting" sequence="10"/> <menuitem id="menu_multi_currency" name="Multi-Currencies" parent="menu_finance_generic_reporting" sequence="10" groups="base.group_multi_currency"/>
<menuitem <menuitem
parent="account.menu_finance_legal_statement" parent="account.menu_finance_legal_statement"
id="final_accounting_reports" id="final_accounting_reports"

14
addons/account/account_view.xml
View File

@ -1066,7 +1066,7 @@
<field name="credit" sum="Total credit"/> <field name="credit" sum="Total credit"/>
<field name="account_tax_id"/> <field name="account_tax_id"/>
<field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]"/> <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
<field name="amount_currency" attrs="{'readonly':[('state','=','valid')]}" groups="base.group_multi_currency"/> <field name="amount_currency" attrs="{'readonly':[('state','=','valid')]}"/>
<field name="currency_id" attrs="{'readonly':[('state','=','valid')]}" groups="base.group_multi_currency"/> <field name="currency_id" attrs="{'readonly':[('state','=','valid')]}" groups="base.group_multi_currency"/>
<field name="reconcile_partial_id"/> <field name="reconcile_partial_id"/>
<field name="reconcile_id"/> <field name="reconcile_id"/>
@ -1118,8 +1118,8 @@
<field name="tax_amount"/> <field name="tax_amount"/>
<field name="account_tax_id" domain="[('parent_id','=',False)]"/> <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
</group> </group>
<group attrs="{'readonly':[('state','=','valid')]}" string="Currency" groups="base.group_multi_currency"> <group attrs="{'readonly':[('state','=','valid')]}" string="Currency">
<field name="currency_id"/> <field name="currency_id" groups="base.group_multi_currency"/>
<field name="amount_currency"/> <field name="amount_currency"/>
</group> </group>
<group string="Reconciliation"> <group string="Reconciliation">
@ -1167,7 +1167,7 @@
<separator colspan="4" string="Optional Information"/> <separator colspan="4" string="Optional Information"/>
<field name="currency_id" groups="base.group_multi_currency"/> <field name="currency_id" groups="base.group_multi_currency"/>
<field name="amount_currency" groups="base.group_multi_currency"/> <field name="amount_currency"/>
<field name="quantity"/> <field name="quantity"/>
<field name="move_id" required="False"/> <field name="move_id" required="False"/>
<newline/> <newline/>
@ -1394,8 +1394,8 @@
<field name="account_tax_id" domain="[('parent_id','=',False)]"/> <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
</group> </group>
<group string="Currency" groups="base.group_multi_currency"> <group string="Currency">
<field name="currency_id"/> <field name="currency_id" groups="base.group_multi_currency"/>
<field name="amount_currency"/> <field name="amount_currency"/>
</group> </group>
@ -1431,7 +1431,7 @@
<field name="debit" sum="Total Debit"/> <field name="debit" sum="Total Debit"/>
<field name="credit" sum="Total Credit"/> <field name="credit" sum="Total Credit"/>
<field name="analytic_account_id" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/> <field name="analytic_account_id" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/>
<field name="amount_currency" groups="base.group_multi_currency"/> <field name="amount_currency"/>
<field name="currency_id" groups="base.group_multi_currency"/> <field name="currency_id" groups="base.group_multi_currency"/>
<field name="tax_code_id"/> <field name="tax_code_id"/>
<field name="tax_amount"/> <field name="tax_amount"/>

6
addons/account/res_config_view.xml
View File

@ -106,9 +106,9 @@
<group> <group>
<label for="id" string="Options"/> <label for="id" string="Options"/>
<div name="account_config"> <div name="account_config">
<div> <div groups="base.group_multi_currency">
<label for="currency_id" groups="base.group_multi_currency"/> <label for="currency_id"/>
<field name="currency_id" class="oe_inline" groups="base.group_multi_currency"/> <field name="currency_id" class="oe_inline"/>
</div> </div>
<div> <div>
<label for="decimal_precision"/> <label for="decimal_precision"/>

2
addons/account_coda/account_coda_view.xml
View File

@ -20,7 +20,7 @@
<field name="company_id" groups="base.group_multi_company"/> <field name="company_id" groups="base.group_multi_company"/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Bank Account" icon="terp-folder-yellow" domain="[]" context="{'group_by':'bank_id'}"/> <filter string="Bank Account" icon="terp-folder-yellow" domain="[]" context="{'group_by':'bank_id'}"/>
<filter string="Currency" icon="terp-dolar" domain="[]" context="{'group_by':'currency'}"/> <filter string="Currency" icon="terp-dolar" domain="[]" context="{'group_by':'currency'}" groups="base.group_multi_currency"/>
</group> </group>
</search> </search>
</field> </field>

2
addons/account_followup/wizard/account_followup_print_view.xml
View File

@ -92,7 +92,7 @@
<label string="%%(followup_amount)s: Total Amount Due"/> <label string="%%(followup_amount)s: Total Amount Due"/>
<label string="%%(date)s: Current Date"/> <label string="%%(date)s: Current Date"/>
<label string="%%(company_name)s: User's Company name"/> <label string="%%(company_name)s: User's Company name"/>
<label string="%%(company_currency)s: User's Company Currency"/> <label string="%%(company_currency)s: User's Company Currency" groups="base.group_multi_currency"/>
<label string="%%(heading)s: Move line header"/> <label string="%%(heading)s: Move line header"/>
<label string="%%(line)s: Ledger Posting lines"/> <label string="%%(line)s: Ledger Posting lines"/>
</group> </group>

18
addons/account_payment/account_payment_view.xml
View File

@ -30,7 +30,7 @@
<field name="debit" sum="Total debit"/> <field name="debit" sum="Total debit"/>
<field name="credit" sum="Total credit"/> <field name="credit" sum="Total credit"/>
<field name="amount_to_pay"/> <field name="amount_to_pay"/>
<field name="amount_currency" groups="base.group_multi_currency"/> <field name="amount_currency"/>
<field name="currency_id" groups="base.group_multi_currency"/> <field name="currency_id" groups="base.group_multi_currency"/>
<field name="period_id" invisible="1"/> <field name="period_id" invisible="1"/>
</tree> </tree>
@ -131,10 +131,10 @@
<field name="move_line_id" on_change="onchange_move_line(move_line_id,parent.mode,parent.date_prefered,parent.date_scheduled,currency,company_currency)" domain="[('reconcile_id','=', False), ('credit', '>',0),('amount_to_pay','>',0)] "/> <field name="move_line_id" on_change="onchange_move_line(move_line_id,parent.mode,parent.date_prefered,parent.date_scheduled,currency,company_currency)" domain="[('reconcile_id','=', False), ('credit', '>',0),('amount_to_pay','>',0)] "/>
<separator colspan="4" string="Transaction Information"/> <separator colspan="4" string="Transaction Information"/>
<field name="date"/> <field name="date"/>
<label for="amount_currency" groups="base.group_multi_currency"/> <label for="amount_currency"/>
<div groups="base.group_multi_currency"> <div>
<field name="amount_currency" on_change="onchange_amount(amount_currency,currency,company_currency)" class="oe_inline"/> <field name="amount_currency" on_change="onchange_amount(amount_currency,currency,company_currency)" class="oe_inline"/>
<field name="currency" nolabel="1" class="oe_inline"/> <field name="currency" nolabel="1" class="oe_inline" groups="base.group_multi_currency"/>
</div> </div>
<field name="partner_id" on_change="onchange_partner(partner_id,parent.mode)"/> <field name="partner_id" on_change="onchange_partner(partner_id,parent.mode)"/>
<field domain="[('partner_id','=',partner_id)]" name="bank_id"/> <field domain="[('partner_id','=',partner_id)]" name="bank_id"/>
@ -171,7 +171,7 @@
<field name="bank_id" domain="[('partner_id', '=', partner_id)]"/> <field name="bank_id" domain="[('partner_id', '=', partner_id)]"/>
<field name="ml_maturity_date"/> <field name="ml_maturity_date"/>
<field name="date"/> <field name="date"/>
<field name="amount_currency" string="Amount" groups="base.group_multi_currency"/> <field name="amount_currency" string="Amount"/>
<field name="currency" groups="base.group_multi_currency"/> <field name="currency" groups="base.group_multi_currency"/>
<field name="name"/> <field name="name"/>
<field name="amount" sum="Total in Company Currency" invisible="1"/> <field name="amount" sum="Total in Company Currency" invisible="1"/>
@ -257,10 +257,10 @@
<field name="move_line_id" on_change="onchange_move_line(move_line_id, False, currency, company_currency)" domain="[('reconcile_id','=', False), ('credit', '>',0),('amount_to_pay','>',0)]"/> <field name="move_line_id" on_change="onchange_move_line(move_line_id, False, currency, company_currency)" domain="[('reconcile_id','=', False), ('credit', '>',0),('amount_to_pay','>',0)]"/>
<separator colspan="4" string="Transaction Information"/> <separator colspan="4" string="Transaction Information"/>
<field name="date"/> <field name="date"/>
<label for="amount_currency" groups="base.group_multi_currency"/> <label for="amount_currency"/>
<div groups="base.group_multi_currency"> <div>
<field name="amount_currency" on_change="onchange_amount(amount_currency,currency,company_currency)" class="oe_inline"/> <field name="amount_currency" on_change="onchange_amount(amount_currency,currency,company_currency)" class="oe_inline"/>
<field name="currency" class="oe_inline"/> <field name="currency" class="oe_inline" groups="base.group_multi_currency"/>
</div> </div>
<field name="partner_id" on_change="onchange_partner(partner_id, False)"/> <field name="partner_id" on_change="onchange_partner(partner_id, False)"/>
<field domain="[('partner_id','=',partner_id)]" name="bank_id"/> <field domain="[('partner_id','=',partner_id)]" name="bank_id"/>
@ -302,7 +302,7 @@
<field name="partner_id"/> <field name="partner_id"/>
<field name="communication"/> <field name="communication"/>
<field name="amount" sum="Amount Total"/> <field name="amount" sum="Amount Total"/>
<field name="amount_currency" sum="Currency Amount Total" groups="base.group_multi_currency"/> <field name="amount_currency" sum="Currency Amount Total"/>
<field name="currency" groups="base.group_multi_currency"/> <field name="currency" groups="base.group_multi_currency"/>
<field name="bank_id" domain="[('partner_id', '=', partner_id)]"/> <field name="bank_id" domain="[('partner_id', '=', partner_id)]"/>
<field name="move_line_id" on_change="onchange_move_line(move_line_id,parent.mode)"/> <field name="move_line_id" on_change="onchange_move_line(move_line_id,parent.mode)"/>

6
addons/account_voucher/voucher_payment_receipt_view.xml
View File

@ -104,7 +104,7 @@
<group string="Other Information" col="4"> <group string="Other Information" col="4">
<field name="currency_id" colspan="4" groups="base.group_multi_currency"/> <field name="currency_id" colspan="4" groups="base.group_multi_currency"/>
<field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/> <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
<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)"/> <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"/>
<field name="number" colspan="4"/> <field name="number" colspan="4"/>
</group> </group>
@ -194,7 +194,7 @@
<separator string="Currency Options" colspan="4"/> <separator string="Currency Options" colspan="4"/>
<field name="is_multi_currency" 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"/> <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
<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)" /> <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 col="2"> <group col="2">
@ -366,7 +366,7 @@
<group col="4" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}"> <group col="4" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
<field name="is_multi_currency" 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"/> <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
<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)"/> <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> <group>