Dharti Ratani(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-currencyfield-only-multicurrencygroup-dhr
into lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-currencyfield-only-multicurrencygroup-dhr/+merge/121772
Hello Sir,
Added multi_currency group to all currency related fields.
Thanks
dhr.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-currencyfield-only-multicurrencygroup-dhr/+merge/121772
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-currencyfield-only-multicurrencygroup-dhr.
=== modified file 'account/account_bank_view.xml'
--- account/account_bank_view.xml 2012-08-13 16:06:57 +0000
+++ account/account_bank_view.xml 2012-08-29 08:45:26 +0000
@@ -15,7 +15,7 @@
<group name="accounting" col="2" colspan="2" attrs="{'invisible': [('company_id','=', False)]}">
<separator string="Accounting Information" colspan="2"/>
<field name="journal_id"/>
- <field name="currency_id"/>
+ <field name="currency_id" groups="base.group_multi_currency"/>
</group>
</group>
</field>
@@ -28,7 +28,7 @@
<field name="inherit_id" ref="base.view_partner_bank_tree"/>
<field name="arch" type="xml">
<field name="acc_number" position="after">
- <field name="currency_id"/>
+ <field name="currency_id" groups="base.group_multi_currency"/>
</field>
</field>
</record>
=== modified file 'account/account_invoice_view.xml'
--- account/account_invoice_view.xml 2012-08-15 22:30:38 +0000
+++ account/account_invoice_view.xml 2012-08-29 08:45:26 +0000
@@ -127,7 +127,7 @@
<field name="user_id"/>
<field name="date_due"/>
<field name="origin"/>
- <field name="currency_id"/>
+ <field name="currency_id" groups="base.group_multi_currency"/>
<field name="residual" sum="Residual Amount"/>
<field name="amount_untaxed" sum="Untaxed Amount"/>
<field name="amount_total" sum="Total Amount"/>
@@ -184,7 +184,7 @@
name="account_id" groups="account.group_account_user"/>
<field name="journal_id" groups="account.group_account_user"
on_change="onchange_journal_id(journal_id, context)" widget="selection"/>
- <field name="currency_id"/>
+ <field name="currency_id" groups="base.group_multi_currency"/>
</group>
</group>
<notebook>
@@ -265,7 +265,7 @@
<field name="debit"/>
<field name="credit"/>
<field name="amount_currency"/>
- <field name="currency_id"/>
+ <field name="currency_id" groups="base.group_multi_currency"/>
</tree>
</field>
</page>
@@ -326,9 +326,9 @@
<field domain="[('company_id', '=', company_id),('type','=', 'receivable')]"
name="account_id" groups="account.group_account_user"/>
- <label for="currency_id"/>
+ <label for="currency_id" groups="base.group_multi_currency"/>
<div>
- <field name="currency_id" class="oe_inline"/>
+ <field name="currency_id" class="oe_inline" groups="base.group_multi_currency"/>
<!-- note fp: I don't think we need this feature ?
<button name="%(action_account_change_currency)d" type="action"
icon="terp-stock_effects-object-colorize"
@@ -418,8 +418,8 @@
<field name="journal_id" groups="base.group_user"/>
<field name="debit"/>
<field name="credit"/>
- <field name="amount_currency"/>
- <field name="currency_id"/>
+ <field name="amount_currency" groups="base.group_multi_currency"/>
+ <field name="currency_id" groups="base.group_multi_currency"/>
</tree>
</field>
</page>
=== modified file 'account/account_menuitem.xml'
--- account/account_menuitem.xml 2012-07-18 13:14:03 +0000
+++ account/account_menuitem.xml 2012-08-29 08:45:26 +0000
@@ -44,7 +44,7 @@
<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="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
parent="account.menu_finance_legal_statement"
id="final_accounting_reports"
=== modified file 'account/account_view.xml'
--- account/account_view.xml 2012-08-13 16:06:57 +0000
+++ account/account_view.xml 2012-08-29 08:45:26 +0000
@@ -197,14 +197,14 @@
<field name="credit" attrs="{'readonly':[('type','=','view')]}"/>
<field name="balance"/>
</group>
- <group>
+ <group groups="base.group_multi_currency">
<field name="tax_ids" domain="[('parent_id','=',False)]" widget="many2many_tags"/>
<field name="reconcile"/>
<field name="child_consol_ids"
attrs="{'invisible':[('type','!=','consolidation')]}"
widget="many2many_tags"/>
</group>
- <group>
+ <group groups="base.group_multi_currency">
<field name="currency_id"/>
<field name="currency_mode" attrs="{'readonly': [('currency_id','=',False)]}"/>
</group>
@@ -248,7 +248,7 @@
<field name="balance"/>
<field name="type"/>
<field name="company_id" groups="base.group_multi_company"/>
- <field name="company_currency_id"/>
+ <field name="company_currency_id" groups="base.group_multi_currency"/>
</tree>
</field>
</record>
@@ -296,7 +296,7 @@
<field name="debit"/>
<field name="credit"/>
<field name="balance"/>
- <field name="company_currency_id"/>
+ <field name="company_currency_id" groups="base.group_multi_currency"/>
<field name="company_id" groups="base.group_multi_company"/>
<field name="type"/>
<field name="parent_id" invisible="1"/>
@@ -321,7 +321,7 @@
<field name="parent_id" invisible="1"/>
<field name="user_type" invisible="1"/>
<field name="type" invisible="1"/>
- <field name="currency_id"/>
+ <field name="currency_id" groups="base.group_multi_currency"/>
<field name="exchange_rate"/>
<field name="foreign_balance"/>
<field name="adjusted_balance"/>
@@ -489,7 +489,7 @@
<group>
<field name="default_debit_account_id" attrs="{'required':[('type','in', ('cash', 'bank'))]}" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
<field name="default_credit_account_id" attrs="{'required':[('type','in',('cash', 'bank'))]}" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
- <field name="currency"/>
+ <field name="currency" groups="base.group_multi_currency"/>
<field name="company_id" groups="base.group_multi_company"/>
</group>
</group>
@@ -645,7 +645,7 @@
<label for="balance_start"/>
<div>
<field name="balance_start" class="oe_inline"/>
- <field name="currency" class="oe_inline"/>
+ <field name="currency" class="oe_inline" groups="base.group_multi_currency"/>
</div>
<field name="balance_end_real"/>
</group>
@@ -1067,7 +1067,7 @@
<field name="account_tax_id"/>
<field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
<field name="amount_currency" attrs="{'readonly':[('state','=','valid')]}"/>
- <field name="currency_id" attrs="{'readonly':[('state','=','valid')]}"/>
+ <field name="currency_id" attrs="{'readonly':[('state','=','valid')]}" groups="base.group_multi_currency"/>
<field name="reconcile_partial_id"/>
<field name="reconcile_id"/>
<field name="state"/>
@@ -1119,7 +1119,7 @@
<field name="account_tax_id" domain="[('parent_id','=',False)]"/>
</group>
<group attrs="{'readonly':[('state','=','valid')]}" string="Currency">
- <field name="currency_id"/>
+ <field name="currency_id" groups="base.group_multi_currency"/>
<field name="amount_currency"/>
</group>
<group string="Reconciliation">
@@ -1166,7 +1166,7 @@
<field name="credit"/>
<separator colspan="4" string="Optional Information"/>
- <field name="currency_id"/>
+ <field name="currency_id" groups="base.group_multi_currency"/>
<field name="amount_currency"/>
<field name="quantity"/>
<field name="move_id" required="False"/>
@@ -1395,7 +1395,7 @@
</group>
<group string="Currency">
- <field name="currency_id"/>
+ <field name="currency_id" groups="base.group_multi_currency"/>
<field name="amount_currency"/>
</group>
@@ -1432,7 +1432,7 @@
<field name="credit" sum="Total Credit"/>
<field name="analytic_account_id" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/>
<field name="amount_currency"/>
- <field name="currency_id"/>
+ <field name="currency_id" groups="base.group_multi_currency"/>
<field name="tax_code_id"/>
<field name="tax_amount"/>
<field name="state"/>
@@ -2075,7 +2075,7 @@
<field name="type"/>
<field name="user_type"/>
- <field name="currency_id"/>
+ <field name="currency_id" groups="base.group_multi_currency"/>
<field name="reconcile"/>
<field name="chart_template_id"/>
</group>
@@ -2400,7 +2400,7 @@
<tree editable="bottom">
<field name="acc_name"/>
<field name="account_type"/>
- <field name="currency_id" widget="selection"/>
+ <field name="currency_id" widget="selection" groups="base.group_multi_currency"/>
</tree>
</field>
</div>
@@ -2565,7 +2565,7 @@
<field name="date" attrs="{'readonly':[('state','!=','draft')]}" on_change="onchange_date(date, company_id)"/>
<field name="closing_date" readonly="1"/>
<field name="period_id" class="oe_inline"/>
- <field name="currency" invisible="1"/>
+ <field name="currency" invisible="1" groups="base.group_multi_currency"/>
</group>
</group>
<notebook>
=== modified file 'account/project/project_view.xml'
--- account/project/project_view.xml 2012-08-08 10:59:07 +0000
+++ account/project/project_view.xml 2012-08-29 08:45:26 +0000
@@ -56,7 +56,7 @@
<field name="credit"/>
<field name="balance"/>
<field name="state" invisible="1"/>
- <field name="currency_id"/>
+ <field name="currency_id" groups="base.group_multi_currency"/>
<field name="date" invisible="1"/>
<field name="user_id" invisible="1"/>
<field name="partner_id" invisible="1"/>
@@ -140,7 +140,7 @@
<label for="amount_currency"/>
<div>
<field name="amount_currency" class="oe_inline"/>
- <field name="currency_id" class="oe_inline"/>
+ <field name="currency_id" class="oe_inline" groups="base.group_multi_currency"/>
</div>
</group>
<group string="Product Information">
@@ -250,7 +250,7 @@
<label for="amount_currency"/>
<div>
<field name="amount_currency" class="oe_inline"/>
- <field name="currency_id" class="oe_inline"/>
+ <field name="currency_id" class="oe_inline" groups="base.group_multi_currency"/>
</div>
<field invisible="1" name="general_account_id"/>
</group>
=== modified file 'account/report/account_analytic_entries_report_view.xml'
--- account/report/account_analytic_entries_report_view.xml 2012-08-08 10:59:07 +0000
+++ account/report/account_analytic_entries_report_view.xml 2012-08-29 08:45:26 +0000
@@ -14,7 +14,7 @@
<field name="name" invisible="1"/>
<field name="partner_id" invisible="1"/>
<field name="company_id" invisible="1" groups="base.group_multi_company"/>
- <field name="currency_id" invisible="1"/>
+ <field name="currency_id" invisible="1" groups="base.group_multi_currency"/>
<field name="account_id" invisible="1" groups="analytic.group_analytic_accounting"/>
<field name="general_account_id" invisible="1"/>
<field name="journal_id" invisible="1"/>
=== modified file 'account/report/account_entries_report_view.xml'
--- account/report/account_entries_report_view.xml 2012-08-08 10:59:07 +0000
+++ account/report/account_entries_report_view.xml 2012-08-29 08:45:26 +0000
@@ -13,7 +13,7 @@
<field name="nbr" sum="# of Entries "/>
<field name="quantity" sum="# of Products Qty " invisible="not context.get('quantity_visible', False)"/>
<field name="amount_currency" invisible="not context.get('amount_currency_visible', False)"/>
- <field name="currency_id" invisible="not context.get('currency_id_visible', False)"/>
+ <field name="currency_id" invisible="not context.get('currency_id_visible', False)" groups="base.group_multi_currency"/>
<field name="debit"/>
<field name="credit"/>
<field name="balance"/>
=== modified file 'account/report/account_invoice_report_view.xml'
--- account/report/account_invoice_report_view.xml 2012-08-08 10:59:07 +0000
+++ account/report/account_invoice_report_view.xml 2012-08-29 08:45:26 +0000
@@ -19,7 +19,7 @@
<field name="categ_id" invisible="1"/>
<field name="state" invisible="1"/>
<field name="period_id" invisible="1"/>
- <field name="currency_id" invisible="1"/>
+ <field name="currency_id" invisible="1" groups="base.group_multi_currency"/>
<field name="journal_id" invisible="1"/>
<field name="partner_bank_id" invisible="1"/>
<field name="date_due" invisible="1"/>
=== modified file 'account/report/account_report_view.xml'
--- account/report/account_report_view.xml 2012-08-08 10:59:07 +0000
+++ account/report/account_report_view.xml 2012-08-29 08:45:26 +0000
@@ -92,7 +92,7 @@
<field name="partner_id"/>
<field name="amount_untaxed" sum="Untaxed Amount"/>
<field name="amount_total" sum="Total Amount"/>
- <field name="currency_id"/>
+ <field name="currency_id" groups="base.group_multi_currency"/>
<field name="date_invoice"/>
<field name="date_due"/>
<field name="residual"/>
@@ -121,7 +121,7 @@
<field name="account_id"/>
<field name="quantity"/>
<field name="amount_total"/>
- <field name="currency_id"/>
+ <field name="currency_id" groups="base.group_multi_currency"/>
</tree>
</field>
</record>
@@ -168,7 +168,7 @@
<field name="user_type"/>
<field name="quantity"/>
<field name="amount_total"/>
- <field name="currency_id"/>
+ <field name="currency_id" groups="base.group_multi_currency"/>
</tree>
</field>
</record>
=== modified file 'account/res_config_view.xml'
--- account/res_config_view.xml 2012-08-13 16:06:57 +0000
+++ account/res_config_view.xml 2012-08-29 08:45:26 +0000
@@ -106,7 +106,7 @@
<group>
<label for="id" string="Options"/>
<div name="account_config">
- <div>
+ <div groups="base.group_multi_currency">
<label for="currency_id"/>
<field name="currency_id" class="oe_inline"/>
</div>
=== modified file 'account/wizard/account_change_currency_view.xml'
--- account/wizard/account_change_currency_view.xml 2012-08-08 10:59:07 +0000
+++ account/wizard/account_change_currency_view.xml 2012-08-29 08:45:26 +0000
@@ -7,7 +7,7 @@
<field name="arch" type="xml">
<form string="Invoice Currency" version="7.0">
<group string="This wizard will change the currency of the invoice">
- <field name="currency_id"/>
+ <field name="currency_id" groups="base.group_multi_currency"/>
</group>
<footer>
<button name="change_currency" string="Change Currency" type="object" class="oe_highlight"/>
=== modified file 'account_asset/account_asset_view.xml'
--- account_asset/account_asset_view.xml 2012-08-13 16:06:57 +0000
+++ account_asset/account_asset_view.xml 2012-08-29 08:45:26 +0000
@@ -100,7 +100,7 @@
</group>
<group>
<field name="purchase_date"/>
- <field name="currency_id"/>
+ <field name="currency_id" groups="base.group_multi_currency"/>
<field name="company_id" widget="selection" groups="base.group_multi_company" on_change="onchange_company_id(company_id)"/>
</group>
</group>
@@ -192,7 +192,7 @@
<field name="partner_id"/>
<field name="purchase_value"/>
<field name="value_residual"/>
- <field name="currency_id"/>
+ <field name="currency_id" groups="base.group_multi_currency"/>
<field name="company_id" groups="base.group_multi_company"/>
<field name="state"/>
</tree>
@@ -211,7 +211,7 @@
<field name="purchase_date"/>
<field name="purchase_value"/>
<field name="value_residual"/>
- <field name="currency_id"/>
+ <field name="currency_id" groups="base.group_multi_currency"/>
<field name="company_id" groups="base.group_multi_company"/>
<field name="state"/>
</tree>
=== modified file 'account_coda/account_coda_view.xml'
--- account_coda/account_coda_view.xml 2012-08-13 16:06:57 +0000
+++ account_coda/account_coda_view.xml 2012-08-29 08:45:26 +0000
@@ -16,11 +16,11 @@
<filter string="Info" domain="[('state','=','info')]" icon="terp-folder-yellow"/>
<field name="bank_id"/>
<field name="journal"/>
- <field name="currency"/>
+ <field name="currency" groups="base.group_multi_currency"/>
<field name="company_id" groups="base.group_multi_company"/>
<group expand="0" string="Group By...">
<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>
</search>
</field>
@@ -32,7 +32,7 @@
<tree string="CODA Bank Account Configuration">
<field name="name"/>
<field name="bank_id"/>
- <field name="currency"/>
+ <field name="currency" groups="base.group_multi_currency"/>
<field name="description1"/>
<field name="journal"/>
<field name="state"/>
@@ -48,7 +48,7 @@
<field name="name" colspan="4"/>
<field name="bank_id" domain="[('partner_id.ref_companies', 'in', [company_id])]"/>
<field name="description1"/>
- <field name="currency"/>
+ <field name="currency" groups="base.group_multi_currency"/>
<field name="description2"/>
<field name="coda_st_naming"/>
<field name="state" on_change="onchange_state(state)"/>
@@ -305,7 +305,7 @@
<field name="name"/>
<field name="date"/>
<field name="coda_bank_account_id"/>
- <field name="currency"/>
+ <field name="currency" groups="base.group_multi_currency"/>
<field name="period_id"/>
<field name="type"/>
<newline/>
=== modified file 'account_followup/wizard/account_followup_print_view.xml'
--- account_followup/wizard/account_followup_print_view.xml 2012-08-09 10:12:39 +0000
+++ account_followup/wizard/account_followup_print_view.xml 2012-08-29 08:45:26 +0000
@@ -92,7 +92,7 @@
<label string="%%(followup_amount)s: Total Amount Due"/>
<label string="%%(date)s: Current Date"/>
<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="%%(line)s: Ledger Posting lines"/>
</group>
=== modified file 'account_payment/account_payment_view.xml'
--- account_payment/account_payment_view.xml 2012-08-13 16:06:57 +0000
+++ account_payment/account_payment_view.xml 2012-08-29 08:45:26 +0000
@@ -31,7 +31,7 @@
<field name="credit" sum="Total credit"/>
<field name="amount_to_pay"/>
<field name="amount_currency"/>
- <field name="currency_id"/>
+ <field name="currency_id" groups="base.group_multi_currency"/>
<field name="period_id" invisible="1"/>
</tree>
</field>
@@ -134,7 +134,7 @@
<label for="amount_currency"/>
<div>
<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>
<field name="partner_id" on_change="onchange_partner(partner_id,parent.mode)"/>
<field domain="[('partner_id','=',partner_id)]" name="bank_id"/>
@@ -154,7 +154,7 @@
<label for="amount"/>
<div>
<field name="amount" class="oe_inline"/>
- <field name="company_currency" class="oe_inline"/>
+ <field name="company_currency" class="oe_inline" groups="base.group_multi_currency"/>
</div>
<separator colspan="4" string="Entry Information"/>
<field name="create_date" readonly="1"/>
@@ -172,7 +172,7 @@
<field name="ml_maturity_date"/>
<field name="date"/>
<field name="amount_currency" string="Amount"/>
- <field name="currency"/>
+ <field name="currency" groups="base.group_multi_currency"/>
<field name="name"/>
<field name="amount" sum="Total in Company Currency" invisible="1"/>
</tree>
@@ -260,7 +260,7 @@
<label for="amount_currency"/>
<div>
<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>
<field name="partner_id" on_change="onchange_partner(partner_id, False)"/>
<field domain="[('partner_id','=',partner_id)]" name="bank_id"/>
@@ -278,7 +278,7 @@
<page string="Information">
<group col="4" string="General Information">
<field name="amount"/>
- <field name="company_currency" nolabel="1"/>
+ <field name="company_currency" nolabel="1" groups="base.group_multi_currency"/>
</group>
<group col="4" string="Entry Information">
<field name="create_date"/>
@@ -303,7 +303,7 @@
<field name="communication"/>
<field name="amount" sum="Amount Total"/>
<field name="amount_currency" sum="Currency Amount Total"/>
- <field name="currency"/>
+ <field name="currency" groups="base.group_multi_currency"/>
<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="create_date"/>
=== modified file 'account_voucher/account_voucher_view.xml'
--- account_voucher/account_voucher_view.xml 2012-08-15 22:30:38 +0000
+++ account_voucher/account_voucher_view.xml 2012-08-29 08:45:26 +0000
@@ -49,7 +49,7 @@
<sheet string="Accounting Voucher">
<group col="6" colspan="4">
<field name="partner_id" required="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
- <field name="payment_rate_currency_id" invisible="1"/>
+ <field name="payment_rate_currency_id" invisible="1" groups="base.group_multi_currency"/>
<field name="date" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id)"/>
<field name="journal_id" widget="selection" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
<field name="type" required="1"/>
@@ -75,7 +75,7 @@
</group>
<group string="Other Information">
<field name="number"/>
- <field name="currency_id"/>
+ <field name="currency_id" groups="base.group_multi_currency"/>
</group>
<group col="4" attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}">
<separator string="Total" colspan="4"/>
=== modified file 'account_voucher/report/account_voucher_sales_receipt_view.xml'
--- account_voucher/report/account_voucher_sales_receipt_view.xml 2012-08-08 10:59:07 +0000
+++ account_voucher/report/account_voucher_sales_receipt_view.xml 2012-08-29 08:45:26 +0000
@@ -16,7 +16,7 @@
<field name="company_id" invisible="1"/>
<field name="partner_id" invisible="1"/>
<field name="state" invisible="1"/>
- <field name="currency_id" invisible="1"/>
+ <field name="currency_id" invisible="1" groups="base.group_multi_currency"/>
<field name="journal_id" invisible="1"/>
<field name="date_due" invisible="1"/>
<field name="account_id" invisible="1"/>
=== modified file 'account_voucher/voucher_payment_receipt_view.xml'
--- account_voucher/voucher_payment_receipt_view.xml 2012-08-15 22:30:38 +0000
+++ account_voucher/voucher_payment_receipt_view.xml 2012-08-29 08:45:26 +0000
@@ -102,9 +102,9 @@
<field name="narration" nolabel="1" colspan="2"/>
</group>
<group string="Other Information" col="4">
- <field name="currency_id" colspan="4"/>
+ <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_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="number" colspan="4"/>
</group>
@@ -137,7 +137,7 @@
<label for="amount" string="Amount"/>
<div>
<field name="amount" invisible="context.get('line_type', False)" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)" class="oe_inline"/>
- <field name="currency_id" class="oe_inline"/>
+ <field name="currency_id" class="oe_inline" groups="base.group_multi_currency"/>
</div>
<field name="journal_id"
domain="[('type','in',['bank', 'cash'])]"
@@ -194,7 +194,7 @@
<separator string="Currency Options" colspan="4"/>
<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_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"/>
</group>
<group col="2">
@@ -232,7 +232,7 @@
<field name="state"/>
<field name="reconcile_id"/>
<field name="amount_currency"/>
- <field name="currency_id"/>
+ <field name="currency_id" groups="base.group_multi_currency"/>
</tree>
</field>
</page>
@@ -302,7 +302,7 @@
<field name="amount" class="oe_inline"
invisible="context.get('line_type', False)"
on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
- <field name="currency_id" class="oe_inline"/>
+ <field name="currency_id" class="oe_inline" groups="base.group_multi_currency"/>
</div>
<field name="journal_id"
@@ -366,7 +366,7 @@
<group col="4" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
<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_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"/>
</group>
<group>
@@ -401,7 +401,7 @@
<field name="state"/>
<field name="reconcile_id"/>
<field name="amount_currency"/>
- <field name="currency_id"/>
+ <field name="currency_id" groups="base.group_multi_currency"/>
</tree>
</field>
</page>
=== modified file 'account_voucher/voucher_sales_purchase_view.xml'
--- account_voucher/voucher_sales_purchase_view.xml 2012-08-16 05:10:19 +0000
+++ account_voucher/voucher_sales_purchase_view.xml 2012-08-29 08:45:26 +0000
@@ -80,7 +80,7 @@
<field name="date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
<field name="name"/>
<field name="paid" invisible="1"/>
- <field name="currency_id" invisible="1"/>
+ <field name="currency_id" invisible="1" groups="base.group_multi_currency"/>
</group>
<field name="type" invisible="True"/>
</group>
@@ -229,7 +229,7 @@
<field name="date" string="Bill Date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
<field name="date_due"/>
<field name="paid" invisible="1"/>
- <field name="currency_id" invisible="1"/>
+ <field name="currency_id" invisible="1" groups="base.group_multi_currency"/>
<field name="journal_id"
domain="[('type','in',['purchase','purchase_refund'])]"
widget="selection"
=== modified file 'crm/crm_lead_view.xml'
--- crm/crm_lead_view.xml 2012-08-24 17:27:29 +0000
+++ crm/crm_lead_view.xml 2012-08-29 08:45:26 +0000
@@ -324,7 +324,7 @@
<b><field name="name"/></b>
<t t-if="record.planned_revenue.raw_value">
- <b><t t-esc="Math.round(record.planned_revenue.value)"/>
- <field name="company_currency"/></b>
+ <field name="company_currency" groups="base.group_multi_currency"/></b>
</t>
</div>
<div>
@@ -435,7 +435,7 @@
<label for="planned_revenue" class="oe_edit_only"/>
<h2>
<field name="planned_revenue" class="oe_inline"/>
- <field name="company_currency" class="oe_inline"/> at
+ <field name="company_currency" class="oe_inline" groups="base.group_multi_currency"/> at
<field name="probability" class="oe_inline" widget="integer"/>%% success rate
</h2>
</div>
=== modified file 'hr_expense/report/hr_expense_report_view.xml'
--- hr_expense/report/hr_expense_report_view.xml 2012-08-17 12:24:06 +0000
+++ hr_expense/report/hr_expense_report_view.xml 2012-08-29 08:45:26 +0000
@@ -16,7 +16,7 @@
<field name="analytic_account" invisible="1" groups="analytic.group_analytic_accounting"/>
<field name="department_id" invisible="1"/>
<field name="company_id" invisible="1"/>
- <field name="currency_id" invisible="1"/>
+ <field name="currency_id" invisible="1" groups="base.group_multi_currency"/>
<field name="product_id" invisible="1"/>
<field name="product_qty" invisible="1"/>
<field name="state" invisible="1"/>
=== modified file 'point_of_sale/point_of_sale_view.xml'
--- point_of_sale/point_of_sale_view.xml 2012-08-24 13:07:30 +0000
+++ point_of_sale/point_of_sale_view.xml 2012-08-29 08:45:26 +0000
@@ -963,7 +963,7 @@
<field name="total_entry_encoding" />
<field name="balance_end_real" />
<field name="difference" />
- <field name="currency" />
+ <field name="currency" groups="base.group_multi_currency" />
<field name="state" />
</tree>
</field>
=== modified file 'product/pricelist_view.xml'
--- product/pricelist_view.xml 2012-08-09 06:05:16 +0000
+++ product/pricelist_view.xml 2012-08-29 08:45:26 +0000
@@ -119,7 +119,7 @@
<field name="name" string="Products Price"/>
<field name="type"/>
<field name="active" />
- <field name="currency_id"/>
+ <field name="currency_id" groups="base.group_multi_currency"/>
</search>
</field>
</record>
@@ -132,7 +132,7 @@
<tree string="Products Price List">
<field name="name"/>
<field name="type"/>
- <field name="currency_id"/>
+ <field name="currency_id" groups="base.group_multi_currency"/>
<field name="active" />
</tree>
</field>
@@ -149,7 +149,7 @@
<group col="4">
<field name="active"/>
<field name="type"/>
- <field name="currency_id"/>
+ <field name="currency_id" groups="base.group_multi_currency"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group>
<field name="version_id">
@@ -230,7 +230,7 @@
<field name="name"/>
<field name="active"/>
<field name="field"/>
- <field name="currency_id"/>
+ <field name="currency_id" groups="base.group_multi_currency"/>
</group>
</form>
</field>
=== modified file 'project/project_view.xml'
--- project/project_view.xml 2012-08-28 18:02:37 +0000
+++ project/project_view.xml 2012-08-29 08:45:26 +0000
@@ -136,7 +136,7 @@
<field name="company_id" groups="base.group_multi_company" widget="selection" required="1"/>
<field name="priority"/>
<field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
- <field name="currency_id" groups="base.group_multi_company" required="1"/>
+ <field name="currency_id" groups="base.group_multi_currency" required="1"/>
<field name="parent_id" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
</group>
</group>
=== modified file 'project_timesheet/project_timesheet_view.xml'
--- project_timesheet/project_timesheet_view.xml 2012-08-13 16:06:57 +0000
+++ project_timesheet/project_timesheet_view.xml 2012-08-29 08:45:26 +0000
@@ -10,7 +10,7 @@
<field name="use_tasks" position="after">
<field name="use_timesheets"/>
<field name="timesheet_count"/>
- <field name="currency_id"/>
+ <field name="currency_id" groups="base.group_multi_currency"/>
<field name="partner_id"/>
</field>
<xpath expr="//div[contains(@class, 'oe_kanban_project_list')]" position="inside">
@@ -20,7 +20,7 @@
<xpath expr="//div[contains(@class, 'oe_kanban_project_deadline')]" position="before">
<div class="oe_kanban_project_fields oe_kanban_project_invoice" t-if="record.partner_id.raw_value">
<div>Amount to invoice</div>
- <div><field name="amount_to_invoice"/> <t t-esc="record.currency_id.raw_value[1].split(' ')[1][1]"/></div>
+ <div ><field name="amount_to_invoice"/> <t t-esc="record.currency_id.raw_value[1].split(' ')[1][1]" groups="base.group_multi_currency"/></div>
<div>Time to Invoice</div>
<div><field name="time_to_invoice"/> <field name="company_uom_id"/></div>
</div>
=== modified file 'report_intrastat/report_intrastat_view.xml'
--- report_intrastat/report_intrastat_view.xml 2012-08-09 06:05:16 +0000
+++ report_intrastat/report_intrastat_view.xml 2012-08-29 08:45:26 +0000
@@ -84,7 +84,7 @@
<field name="weight"/>
<field name="value"/>
<field name="supply_units"/>
- <field name="currency_id"/>
+ <field name="currency_id" groups="base.group_multi_currency"/>
<field name="type"/>
</tree>
</field>
=== modified file 'stock/wizard/stock_partial_move_view.xml'
--- stock/wizard/stock_partial_move_view.xml 2012-08-09 06:05:16 +0000
+++ stock/wizard/stock_partial_move_view.xml 2012-08-29 08:45:26 +0000
@@ -44,7 +44,7 @@
<field name="prodlot_id" domain="[('product_id', '=', product_id)]" groups="stock.group_production_lot"/>
<field name="update_cost" invisible="1"/>
<field name="cost" attrs="{'invisible': [('update_cost','=', False)]}"/>
- <field name="currency" attrs="{'invisible': [('update_cost','=', False)]}"/>
+ <field name="currency" attrs="{'invisible': [('update_cost','=', False)]}" groups="base.group_multi_currency"/>
</tree>
</field>
</record>
@@ -63,7 +63,7 @@
<field name="prodlot_id" domain="[('product_id', '=', product_id)]"/>
<field name="update_cost" invisible="1"/>
<field name="cost" attrs="{'invisible': [('update_cost','=', False)]}"/>
- <field name="currency" attrs="{'invisible': [('update_cost','=', False)]}"/>
+ <field name="currency" attrs="{'invisible': [('update_cost','=', False)]}" groups="base.group_multi_currency"/>
</group>
</form>
</field>
=== modified file 'stock/wizard/stock_partial_picking_view.xml'
--- stock/wizard/stock_partial_picking_view.xml 2012-08-09 06:05:16 +0000
+++ stock/wizard/stock_partial_picking_view.xml 2012-08-29 08:45:26 +0000
@@ -27,7 +27,7 @@
<!-- Removed as this feature is not logic: price must be updated upon reception of invoice -->
<field name="update_cost" invisible="1"/>
<field name="cost" invisible="1"/>
- <field name="currency" invisible="1"/>
+ <field name="currency" invisible="1" groups="base.group_multi_currency"/>
</tree>
</field>
<footer>
@@ -52,7 +52,7 @@
<!-- Removed as this feature is not logic: price must be updated upon reception of invoice -->
<field name="update_cost" invisible="1"/>
<field name="cost" invisible="1"/>
- <field name="currency" invisible="1"/>
+ <field name="currency" invisible="1" groups="base.group_multi_currency"/>
</tree>
</field>
</record>
@@ -71,7 +71,7 @@
<field name="prodlot_id" domain="[('product_id', '=', product_id)]" attrs="{'required':[('tracking','=',True)]}"/>
<field name="update_cost" invisible="1"/>
<field name="cost" attrs="{'invisible': [('update_cost','=', False)]}"/>
- <field name="currency" attrs="{'invisible': [('update_cost','=', False)]}"/>
+ <field name="currency" attrs="{'invisible': [('update_cost','=', False)]}" groups="base.group_multi_currency"/>
</group>
</form>
</field>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
