[ADD] added currency_id in account.chart.template and remove onchange from company_id...

bzr revid: tpa@tinyerp.com-20130902130839-mpvu7nfzefmzh9kq

diff --git a/addons/account/account.py b/addons/account/account.py
index 45308a9..1a593e4 100644 (file)
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2774,6 +2774,7 @@ class account_chart_template(osv.osv):
         'parent_id': fields.many2one('account.chart.template', 'Parent Chart Template'),
         'code_digits': fields.integer('# of Digits', required=True, help="No. of Digits to use for account code"),
         'visible': fields.boolean('Can be Visible?', help="Set this to False if you don't want this template to be used actively in the wizard that generate Chart of Accounts from templates, this is useful when you want to generate accounts of this template only when loading its child template."),
+        'currency_id': fields.many2one('res.currency', 'Currency'),
         'complete_tax_set': fields.boolean('Complete Set of Taxes', help='This boolean helps you to choose if you want to propose to the user to encode the sale and purchase rates or choose from list of taxes. This last choice assumes that the set of tax defined on this template is complete'),
         'account_root_id': fields.many2one('account.account.template', 'Root Account', domain=[('parent_id','=',False)]),
         'tax_code_root_id': fields.many2one('account.tax.code.template', 'Root Tax Code', domain=[('parent_id','=',False)]),
@@ -3029,16 +3030,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         'complete_tax_set': fields.boolean('Complete Set of Taxes', help='This boolean helps you to choose if you want to propose to the user to encode the sales and purchase rates or use the usual m2o fields. This last choice assumes that the set of tax defined for the chosen template is complete'),
     }
 
-    def onchange_company_id(self, cr, uid, ids, company_id, context=None):
-        if context is None:context = {}
-        if context.get('default_currency_id', False):
-            dummy, view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', context.get('default_currency_id'))
-            return {'value': {'currency_id': view_id}}
-        currency_id = False
-        if company_id:
-            currency_id = self.pool.get('res.company').browse(cr, uid, company_id, context=context).currency_id.id
-        return {'value': {'currency_id': currency_id}}
-
     def onchange_tax_rate(self, cr, uid, ids, rate=False, context=None):
         return {'value': {'purchase_tax_rate': rate or False}}
 
@@ -3048,7 +3039,8 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         res['value'] = {'complete_tax_set': False, 'sale_tax': False, 'purchase_tax': False}
         if chart_template_id:
             data = self.pool.get('account.chart.template').browse(cr, uid, chart_template_id, context=context)
-            res['value'].update({'complete_tax_set': data.complete_tax_set})
+            currency_id = data.currency_id.id or self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id.id
+            res['value'].update({'complete_tax_set': data.complete_tax_set, 'currency_id': currency_id})
             if data.complete_tax_set:
             # default tax is given by the lowest sequence. For same sequence we will take the latest created as it will be the case for tax created while isntalling the generic chart of account
                 sale_tax_ids = tax_templ_obj.search(cr, uid, [("chart_template_id"

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 91c6d66..cb53d7d 100644 (file)
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2120,7 +2120,7 @@
                             <field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)" domain="[('visible','=', True)]"/>
                         </group>
                         <group>
-                            <field name="company_id" widget="selection" on_change="onchange_company_id(company_id)"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
+                            <field name="company_id" widget="selection"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
                             <field name="currency_id" class="oe_inline"/>
                             <field name="sale_tax" attrs="{'invisible': [('complete_tax_set', '!=', True)]}" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
                             <label for="sale_tax_rate" string="Sale Tax" attrs="{'invisible': [('complete_tax_set', '=', True)]}"/>

diff --git a/addons/l10n_us/account_chart_template.xml b/addons/l10n_us/account_chart_template.xml
index 0863680..704afba 100644 (file)
--- a/addons/l10n_us/account_chart_template.xml
+++ b/addons/l10n_us/account_chart_template.xml
@@ -6,6 +6,7 @@
             <field name="name">Basic Chart of Account</field>
             <field name="visible" eval="False" />
             <field name="complete_tax_set" eval="False" />
+            <field name="currency_id" ref="base.USD"/>
         </record>
 
         <record id="account_chart_template_cogs" model="account.chart.template">
@@ -13,45 +14,53 @@
             <field name="visible" eval="False" />
             <field name="parent_id" ref="account_chart_template_basic"/>
             <field name="complete_tax_set" eval="False" />
+            <field name="currency_id" ref="base.USD"/>
         </record>
         <record id="account_chart_template_advertising" model="account.chart.template">
             <field name="name">Advertising</field>
             <field name="complete_tax_set" eval="False" />
             <field name="parent_id" ref="account_chart_template_cogs"/>
+            <field name="currency_id" ref="base.USD"/>
         </record>
         <record id="account_chart_template_agriculture" model="account.chart.template">
             <field name="name">Agriculture</field>
             <field name="complete_tax_set" eval="False" />
             <field name="parent_id" ref="account_chart_template_basic"/>
+            <field name="currency_id" ref="base.USD"/>
         </record>
         <record id="account_chart_template_construction" model="account.chart.template">
             <field name="name">Construction Trades (Plumber, Electrician, HVAC, etc.)</field>
             <field name="complete_tax_set" eval="False" />
             <field name="parent_id" ref="account_chart_template_cogs"/>
+            <field name="currency_id" ref="base.USD"/>
         </record>
 
         <record id="account_chart_template_financial_service" model="account.chart.template">
             <field name="name">Financial Services other than Accounting or Bookkeeping</field>
             <field name="complete_tax_set" eval="False" />
             <field name="parent_id" ref="account_chart_template_cogs"/>
+            <field name="currency_id" ref="base.USD"/>
         </record>
 
         <record id="account_chart_template_general_service" model="account.chart.template">
             <field name="name">General Service-Based Business</field>
             <field name="complete_tax_set" eval="False" />
             <field name="parent_id" ref="account_chart_template_cogs"/>
+            <field name="currency_id" ref="base.USD"/>
         </record>
 
         <record id="account_chart_template_legal_service" model="account.chart.template">
             <field name="name">Legal Services</field>
             <field name="complete_tax_set" eval="False" />
             <field name="parent_id" ref="account_chart_template_basic"/>
+            <field name="currency_id" ref="base.USD"/>
         </record>
 
         <record id="account_chart_template_general_product" model="account.chart.template">
             <field name="name">General Product-Based Business</field>
             <field name="complete_tax_set" eval="False" />
             <field name="parent_id" ref="account_chart_template_basic"/>
+            <field name="currency_id" ref="base.USD"/>
         </record>
     </data>
 </openerp>

diff --git a/addons/l10n_us/l10n_us_wizard.xml b/addons/l10n_us/l10n_us_wizard.xml
index 9373935..19d27fb 100644 (file)
--- a/addons/l10n_us/l10n_us_wizard.xml
+++ b/addons/l10n_us/l10n_us_wizard.xml
@@ -1,13 +1,9 @@
 <openerp>
     <data noupdate="1">
-    
-       <record id="account.action_wizard_multi_chart" model="ir.actions.act_window">
-            <field name="context">{'default_currency_id': "USD"}</field>
-        </record>
-       
+
         <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
             <field name="state">open</field>
         </record>
-        
+
     </data>
 </openerp>