diff --git a/addons/account/account.py b/addons/account/account.py index 22f2b3bda9c..b77ddb17544 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -3348,10 +3348,25 @@ class wizard_multi_charts_accounts(osv.osv_memory): all the provided information to create the accounts, the banks, the journals, the taxes, the tax codes, the accounting properties... accordingly for the chosen company. ''' + obj_data = self.pool.get('ir.model.data') ir_values_obj = self.pool.get('ir.values') obj_wizard = self.browse(cr, uid, ids[0]) company_id = obj_wizard.company_id.id + self.pool.get('res.company').write(cr, uid, [company_id], {'currency_id': obj_wizard.currency_id.id}) + + # When we install the CoA of first company, set the currency to price types and pricelists + if company_id==1: + for ref in (('product','list_price'),('product','standard_price'),('product','list0'),('purchase','list0')): + try: + tmp2 = obj_data.get_object_reference(cr, uid, *ref) + if tmp2: + self.pool.get(tmp2[0]).write(cr, uid, tmp2[1], { + 'currency_id': obj_wizard.currency_id.id + }) + except ValueError, e: + pass + # If the floats for sale/purchase rates have been filled, create templates from them self._create_tax_templates_from_rates(cr, uid, obj_wizard, company_id, context=context) diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml index 11c69a1946c..8e5e73ee588 100644 --- a/addons/purchase/report/request_quotation.rml +++ b/addons/purchase/report/request_quotation.rml @@ -133,7 +133,7 @@
[[ repeatIn(order.order_line,'order_line') ]] - + [[ order_line.name ]] @@ -142,10 +142,10 @@ [[ formatLang(order_line.date_planned, date = True) ]] - [[ formatLang(order_line.product_qty )]] - - - [[ (order_line.product_uom and order_line.product_uom.name) or '' ]] + + [[ formatLang(order_line.product_qty )]] + [[ (order_line.product_uom and order_line.product_uom.name) or '' ]] + @@ -166,4 +166,4 @@ [[ user.signature or '' ]] - \ No newline at end of file +