Merge lp:~akretion-team/openobject-addons/trunk-addons-do-not-jump-to-product-template into lp:openobject-addons

[Alexis de Lattre]

Remplace all occurences of :

my_browse_rec.product_id.product_tmpl_id.field

by

my_browse_rec.product_id.field

This is the continuity of the work started in this (accepted) merge proposal : https://code.launchpad.net/~akretion-team/openobject-addons/trunk-addons-dont-access-product-template/+merge/114001

This is important because we want to be able to move some fields from product.template to product.product in a custom module when needed, without patching the addons.

[Alexis de Lattre (alexis-via)]

The runbot is green on this branch.

[Olivier Dony (Odoo) (odo-openerp)]

Looks good to me, thanks! Even without the reason underlying your patch, it makes the code more straightforward.
I'll solve the new conflicts and merge.

Thanks for your patience!

review: Approve

=== modified file 'account/account_analytic_line.py'
--- account/account_analytic_line.py	2012-07-06 07:42:15 +0000
+++ account/account_analytic_line.py	2012-07-27 16:07:26 +0000
@@ -83,7 +83,7 @@
             if j_id.type == 'purchase':
                 unit = prod.uom_po_id.id
         if j_id.type <> 'sale':
-            a = prod.product_tmpl_id.property_account_expense.id
+            a = prod.property_account_expense.id
             if not a:
                 a = prod.categ_id.property_account_expense_categ.id
             if not a:
@@ -92,7 +92,7 @@
                                 'for this product: "%s" (id:%d)') % \
                                 (prod.name, prod.id,))
         else:
-            a = prod.product_tmpl_id.property_account_income.id
+            a = prod.property_account_income.id
             if not a:
                 a = prod.categ_id.property_account_income_categ.id
             if not a:

=== modified file 'account/account_invoice.py'
--- account/account_invoice.py	2012-07-14 23:18:43 +0000
+++ account/account_invoice.py	2012-07-27 16:07:26 +0000
@@ -1404,11 +1404,11 @@
         res = self.pool.get('product.product').browse(cr, uid, product, context=context)
 
         if type in ('out_invoice','out_refund'):
-            a = res.product_tmpl_id.property_account_income.id
+            a = res.property_account_income.id
             if not a:
                 a = res.categ_id.property_account_income_categ.id
         else:
-            a = res.product_tmpl_id.property_account_expense.id
+            a = res.property_account_expense.id
             if not a:
                 a = res.categ_id.property_account_expense_categ.id
         a = fpos_obj.map_account(cr, uid, fpos, a)

=== modified file 'account_anglo_saxon/sale.py'
--- account_anglo_saxon/sale.py	2011-01-14 00:11:01 +0000
+++ account_anglo_saxon/sale.py	2012-07-27 16:07:26 +0000
@@ -31,7 +31,7 @@
 #        invoice_line_obj = self.pool.get('account.invoice.line')
 #        for line in invoice_line_obj.browse(cr, uid, line_ids):
 #            if line.product_id:
-#                    a =  line.product_id.product_tmpl_id.property_stock_account_output and line.product_id.product_tmpl_id.property_stock_account_output.id
+#                    a =  line.product_id.property_stock_account_output and line.product_id.property_stock_account_output.id
 #                    if not a:
 #                        a = line.product_id.categ_id.property_stock_account_output_categ and line.product_id.categ_id.property_stock_account_output_categ.id
 #                    if a:

=== modified file 'account_anglo_saxon/stock.py'
--- account_anglo_saxon/stock.py	2011-02-08 06:58:24 +0000
+++ account_anglo_saxon/stock.py	2012-07-27 16:07:26 +0000
@@ -36,7 +36,7 @@
             for inv in self.pool.get('account.invoice').browse(cr, uid, res.values(), context=context):
                 for ol in inv.invoice_line:
                     if ol.product_id:
-                        oa = ol.product_id.product_tmpl_id.property_stock_account_output and ol.product_id.product_tmpl_id.property_stock_account_output.id
+                        oa = ol.product_id.property_stock_account_output and ol.product_id.property_stock_account_output.id
                         if not oa:
                             oa = ol.product_id.categ_id.property_stock_account_output_categ and ol.product_id.categ_id.property_stock_account_output_categ.id
                         if oa:
@@ -48,7 +48,7 @@
             for inv in self.pool.get('account.invoice').browse(cr, uid, res.values(), context=context):
                 for ol in inv.invoice_line:
                     if ol.product_id:
-                        oa = ol.product_id.product_tmpl_id.property_stock_account_input and ol.product_id.product_tmpl_id.property_stock_account_input.id
+                        oa = ol.product_id.property_stock_account_input and ol.product_id.property_stock_account_input.id
                         if not oa:
                             oa = ol.product_id.categ_id.property_stock_account_input_categ and ol.product_id.categ_id.property_stock_account_input_categ.id        
                         if oa:

=== modified file 'analytic_user_function/analytic_user_function.py'
--- analytic_user_function/analytic_user_function.py	2011-12-19 16:54:40 +0000
+++ analytic_user_function/analytic_user_function.py	2012-07-27 16:07:26 +0000
@@ -85,10 +85,10 @@
             res.setdefault('value',{})
             res['value']= super(hr_analytic_timesheet, self).on_change_account_id(cr, uid, ids, account_id)['value']
             res['value']['product_id'] = r.product_id.id
-            res['value']['product_uom_id'] = r.product_id.product_tmpl_id.uom_id.id
+            res['value']['product_uom_id'] = r.product_id.uom_id.id
 
             #the change of product has to impact the amount, uom and general_account_id
-            a = r.product_id.product_tmpl_id.property_account_expense.id
+            a = r.product_id.property_account_expense.id
             if not a:
                 a = r.product_id.categ_id.property_account_expense_categ.id
             if not a:
@@ -123,7 +123,7 @@
                 res['value']['product_id'] = r.product_id.id
 
                 #the change of product has to impact the amount, uom and general_account_id
-                a = r.product_id.product_tmpl_id.property_account_expense.id
+                a = r.product_id.property_account_expense.id
                 if not a:
                     a = r.product_id.categ_id.property_account_expense_categ.id
                 if not a:

=== modified file 'hr_expense/hr_expense.py'
--- hr_expense/hr_expense.py	2012-07-05 09:29:21 +0000
+++ hr_expense/hr_expense.py	2012-07-27 16:07:26 +0000
@@ -164,7 +164,7 @@
             for l in exp.line_ids:
                 tax_id = []
                 if l.product_id:
-                    acc = l.product_id.product_tmpl_id.property_account_expense
+                    acc = l.product_id.property_account_expense
                     if not acc:
                         acc = l.product_id.categ_id.property_account_expense_categ
                     tax_id = [x.id for x in l.product_id.supplier_taxes_id]

=== modified file 'hr_timesheet/hr_timesheet.py'
--- hr_timesheet/hr_timesheet.py	2012-07-23 12:10:29 +0000
+++ hr_timesheet/hr_timesheet.py	2012-07-27 16:07:26 +0000
@@ -125,7 +125,7 @@
         if emp_id:
             emp = emp_obj.browse(cr, uid, emp_id[0], context=context)
             if bool(emp.product_id):
-                a = emp.product_id.product_tmpl_id.property_account_expense.id
+                a = emp.product_id.property_account_expense.id
                 if not a:
                     a = emp.product_id.categ_id.property_account_expense_categ.id
                 if a:

=== modified file 'hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py'
--- hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py	2012-07-26 12:31:58 +0000
+++ hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py	2012-07-27 16:07:26 +0000
@@ -117,7 +117,7 @@
 
                 taxes = product.taxes_id
                 tax = fiscal_pos_obj.map_tax(cr, uid, account.partner_id.property_account_position, taxes)
-                account_id = product.product_tmpl_id.property_account_income.id or product.categ_id.property_account_income_categ.id
+                account_id = product.property_account_income.id or product.categ_id.property_account_income_categ.id
                 if not account_id:
                     raise osv.except_osv(_("Configuration Error"), _("No income account defined for product '%s'") % product.name)
                 curr_line = {

=== modified file 'mrp/mrp.py'
--- mrp/mrp.py	2012-07-25 16:15:21 +0000
+++ mrp/mrp.py	2012-07-27 16:07:26 +0000
@@ -957,7 +957,7 @@
 
     def _make_production_produce_line(self, cr, uid, production, context=None):
         stock_move = self.pool.get('stock.move')
-        source_location_id = production.product_id.product_tmpl_id.property_stock_production.id
+        source_location_id = production.product_id.property_stock_production.id
         destination_location_id = production.location_dest_id.id
         move_name = _('PROD: %s') + production.name
         data = {
@@ -985,7 +985,7 @@
         if production_line.product_id.type not in ('product', 'consu'):
             return False
         move_name = _('PROD: %s') % production.name
-        destination_location_id = production.product_id.product_tmpl_id.property_stock_production.id
+        destination_location_id = production.product_id.property_stock_production.id
         if not source_location_id:
             source_location_id = production.location_src_id.id
         move_id = stock_move.create(cr, uid, {

=== modified file 'mrp/procurement.py'
--- mrp/procurement.py	2012-06-01 14:40:59 +0000
+++ mrp/procurement.py	2012-07-27 16:07:26 +0000
@@ -79,7 +79,7 @@
         procurement_obj = self.pool.get('procurement.order')
         for procurement in procurement_obj.browse(cr, uid, ids, context=context):
             res_id = procurement.move_id.id
-            newdate = datetime.strptime(procurement.date_planned, '%Y-%m-%d %H:%M:%S') - relativedelta(days=procurement.product_id.product_tmpl_id.produce_delay or 0.0)
+            newdate = datetime.strptime(procurement.date_planned, '%Y-%m-%d %H:%M:%S') - relativedelta(days=procurement.product_id.produce_delay or 0.0)
             newdate = newdate - relativedelta(days=company.manufacturing_lead)
             produce_id = production_obj.create(cr, uid, {
                 'origin': procurement.origin,

=== modified file 'mrp/test/order_process.yml'
--- mrp/test/order_process.yml	2012-04-03 08:27:56 +0000
+++ mrp/test/order_process.yml	2012-07-27 16:07:26 +0000
@@ -94,7 +94,7 @@
     assert order.state == 'confirmed', "Production order should be confirmed."
     assert order.move_created_ids, "Trace Record is not created for Final Product."
     move = order.move_created_ids[0]
-    source_location_id = order.product_id.product_tmpl_id.property_stock_production.id
+    source_location_id = order.product_id.property_stock_production.id
     assert move.date == order.date_planned, "Planned date is not correspond."
     assert move.product_id.id == order.product_id.id, "Product is not correspond."
     assert move.product_uom.id == order.product_uom.id, "UOM is not correspond."

=== modified file 'mrp_subproduct/mrp_subproduct.py'
--- mrp_subproduct/mrp_subproduct.py	2012-05-22 16:10:55 +0000
+++ mrp_subproduct/mrp_subproduct.py	2012-07-27 16:07:26 +0000
@@ -75,7 +75,7 @@
         """
         picking_id = super(mrp_production,self).action_confirm(cr, uid, ids)
         for production in self.browse(cr, uid, ids):
-            source = production.product_id.product_tmpl_id.property_stock_production.id
+            source = production.product_id.property_stock_production.id
             if not production.bom_id:
                 continue
             for sub_product in production.bom_id.sub_products:

=== modified file 'procurement/procurement.py'
--- procurement/procurement.py	2012-06-11 09:59:14 +0000
+++ procurement/procurement.py	2012-07-27 16:07:26 +0000
@@ -285,7 +285,7 @@
         user = self.pool.get('res.users').browse(cr, uid, uid)
         partner_obj = self.pool.get('res.partner')
         for procurement in self.browse(cr, uid, ids):
-            if procurement.product_id.product_tmpl_id.supply_method <> 'buy':
+            if procurement.product_id.supply_method <> 'buy':
                 return False
             if not procurement.product_id.seller_ids:
                 message = _('No supplier defined for this product !')
@@ -333,7 +333,7 @@
                 if not procurement.move_id:
                     source = procurement.location_id.id
                     if procurement.procure_method == 'make_to_order':
-                        source = procurement.product_id.product_tmpl_id.property_stock_procurement.id
+                        source = procurement.product_id.property_stock_procurement.id
                     id = move_obj.create(cr, uid, {
                         'name': procurement.name,
                         'location_id': source,

=== modified file 'project_timesheet/project_timesheet.py'
--- project_timesheet/project_timesheet.py	2012-06-27 13:54:25 +0000
+++ project_timesheet/project_timesheet.py	2012-07-27 16:07:26 +0000
@@ -88,7 +88,7 @@
             raise osv.except_osv(_('Bad Configuration !'),
                  _('No journal defined on the related employee.\nFill in the timesheet tab of the employee form.'))
 
-        a = emp.product_id.product_tmpl_id.property_account_expense.id
+        a = emp.product_id.property_account_expense.id
         if not a:
             a = emp.product_id.categ_id.property_account_expense_categ.id
             if not a:

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2012-07-25 12:07:19 +0000
+++ purchase/purchase.py	2012-07-27 16:07:26 +0000
@@ -434,7 +434,7 @@
             inv_lines = []
             for po_line in order.order_line:
                 if po_line.product_id:
-                    acc_id = po_line.product_id.product_tmpl_id.property_account_expense.id
+                    acc_id = po_line.product_id.property_account_expense.id
                     if not acc_id:
                         acc_id = po_line.product_id.categ_id.property_account_expense_categ.id
                     if not acc_id:
@@ -485,7 +485,7 @@
     def has_stockable_product(self,cr, uid, ids, *args):
         for order in self.browse(cr, uid, ids):
             for order_line in order.order_line:
-                if order_line.product_id and order_line.product_id.product_tmpl_id.type in ('product', 'consu'):
+                if order_line.product_id and order_line.product_id.type in ('product', 'consu'):
                     return True
         return False
 
@@ -1048,7 +1048,7 @@
             context.update({'lang': partner.lang, 'partner_id': partner_id})
 
             product = prod_obj.browse(cr, uid, procurement.product_id.id, context=context)
-            taxes_ids = procurement.product_id.product_tmpl_id.supplier_taxes_id
+            taxes_ids = procurement.product_id.supplier_taxes_id
             taxes = acc_pos_obj.map_tax(cr, uid, partner.property_account_position, taxes_ids)
 
             name = product.partner_ref

=== modified file 'purchase/wizard/purchase_line_invoice.py'
--- purchase/wizard/purchase_line_invoice.py	2012-07-14 20:51:50 +0000
+++ purchase/wizard/purchase_line_invoice.py	2012-07-27 16:07:26 +0000
@@ -102,7 +102,7 @@
                     if not line.partner_id.id in invoices:
                         invoices[line.partner_id.id] = []
                     if line.product_id:
-                        a = line.product_id.product_tmpl_id.property_account_expense.id
+                        a = line.product_id.property_account_expense.id
                         if not a:
                             a = line.product_id.categ_id.property_account_expense_categ.id
                         if not a:

=== modified file 'sale/sale.py'
--- sale/sale.py	2012-07-23 13:14:53 +0000
+++ sale/sale.py	2012-07-27 16:07:26 +0000
@@ -950,7 +950,7 @@
             date_planned = self._get_date_planned(cr, uid, order, line, order.date_order, context=context)
 
             if line.product_id:
-                if line.product_id.product_tmpl_id.type in ('product', 'consu'):
+                if line.product_id.type in ('product', 'consu'):
                     if not picking_id:
                         picking_id = picking_obj.create(cr, uid, self._prepare_order_picking(cr, uid, order, context=context))
                     move_id = move_obj.create(cr, uid, self._prepare_order_line_move(cr, uid, order, line, picking_id, date_planned, context=context))
@@ -1014,7 +1014,7 @@
     def has_stockable_products(self, cr, uid, ids, *args):
         for order in self.browse(cr, uid, ids):
             for order_line in order.order_line:
-                if order_line.product_id and order_line.product_id.product_tmpl_id.type in ('product', 'consu'):
+                if order_line.product_id and order_line.product_id.type in ('product', 'consu'):
                     return True
         return False
 
@@ -1188,7 +1188,7 @@
         if not line.invoiced:
             if not account_id:
                 if line.product_id:
-                    account_id = line.product_id.product_tmpl_id.property_account_income.id
+                    account_id = line.product_id.property_account_income.id
                     if not account_id:
                         account_id = line.product_id.categ_id.property_account_income_categ.id
                     if not account_id:

=== modified file 'sale/stock.py'
--- sale/stock.py	2012-07-14 20:36:23 +0000
+++ sale/stock.py	2012-07-27 16:07:26 +0000
@@ -161,13 +161,13 @@
                     else:
                         name = sale_line.name
                     if type in ('out_invoice', 'out_refund'):
-                        account_id = sale_line.product_id.product_tmpl_id.\
+                        account_id = sale_line.product_id.\
                                 property_account_income.id
                         if not account_id:
                             account_id = sale_line.product_id.categ_id.\
                                     property_account_income_categ.id
                     else:
-                        account_id = sale_line.product_id.product_tmpl_id.\
+                        account_id = sale_line.product_id.\
                                 property_account_expense.id
                         if not account_id:
                             account_id = sale_line.product_id.categ_id.\

=== modified file 'sale/test/picking_order_policy.yml'
--- sale/test/picking_order_policy.yml	2012-07-14 22:12:00 +0000
+++ sale/test/picking_order_policy.yml	2012-07-27 16:07:26 +0000
@@ -121,7 +121,7 @@
         assert invoice.payment_term.id == order.payment_term.id, "Payment term is not correspond."
     for so_line in order.order_line:
         inv_line = so_line.invoice_lines[0]
-        ac = so_line.product_id.product_tmpl_id.property_account_income.id or so_line.product_id.categ_id.property_account_income_categ.id
+        ac = so_line.product_id.property_account_income.id or so_line.product_id.categ_id.property_account_income_categ.id
         assert inv_line.product_id.id == so_line.product_id.id or False,"Product is not correspond"
         assert inv_line.account_id.id == ac,"Account of Invoice line is not corresponding."
         assert inv_line.uos_id.id == (so_line.product_uos and so_line.product_uos.id) or so_line.product_uom.id, "Product UOS is not correspond."

=== modified file 'stock/product.py'
--- stock/product.py	2012-07-09 13:40:24 +0000
+++ stock/product.py	2012-07-27 16:07:26 +0000
@@ -132,7 +132,7 @@
 
                     if diff > 0:
                         if not stock_input_acc:
-                            stock_input_acc = product.product_tmpl_id.\
+                            stock_input_acc = product.\
                                 property_stock_account_input.id
                         if not stock_input_acc:
                             stock_input_acc = product.categ_id.\
@@ -158,7 +158,7 @@
                                     })
                     elif diff < 0:
                         if not stock_output_acc:
-                            stock_output_acc = product.product_tmpl_id.\
+                            stock_output_acc = product.\
                                 property_stock_account_output.id
                         if not stock_output_acc:
                             stock_output_acc = product.categ_id.\

=== modified file 'stock/stock.py'
--- stock/stock.py	2012-07-27 09:10:29 +0000
+++ stock/stock.py	2012-07-27 16:07:26 +0000
@@ -1029,14 +1029,12 @@
             origin += ':' + move_line.picking_id.origin
 
         if invoice_vals['type'] in ('out_invoice', 'out_refund'):
-            account_id = move_line.product_id.product_tmpl_id.\
-                    property_account_income.id
+            account_id = move_line.product_id.property_account_income.id
             if not account_id:
                 account_id = move_line.product_id.categ_id.\
                         property_account_income_categ.id
         else:
-            account_id = move_line.product_id.product_tmpl_id.\
-                    property_account_expense.id
+            account_id = move_line.product_id.property_account_expense.id
             if not account_id:
                 account_id = move_line.product_id.categ_id.\
                         property_account_expense_categ.id
@@ -2729,7 +2727,7 @@
                 change = line.product_qty - amount
                 lot_id = line.prod_lot_id.id
                 if change:
-                    location_id = line.product_id.product_tmpl_id.property_stock_inventory.id
+                    location_id = line.product_id.property_stock_inventory.id
                     value = {
                         'name': 'INV:' + str(line.inventory_id.id) + ':' + line.inventory_id.name,
                         'product_id': line.product_id.id,

=== modified file 'stock/test/opening_stock.yml'
--- stock/test/opening_stock.yml	2011-12-23 11:06:43 +0000
+++ stock/test/opening_stock.yml	2012-07-27 16:07:26 +0000
@@ -66,7 +66,7 @@
     for move_line in inventory.move_ids:
         for line in inventory.inventory_line_id:
             if move_line.product_id.id == line.product_id.id and move_line.prodlot_id.id == line.prod_lot_id.id:
-                location_id = line.product_id.product_tmpl_id.property_stock_inventory.id
+                location_id = line.product_id.property_stock_inventory.id
                 assert move_line.product_qty == line.product_qty, "Qty is not correspond."
                 assert move_line.product_uom.id == line.product_uom.id, "UOM is not correspond."
                 assert move_line.date == inventory.date, "Date is not correspond."

=== modified file 'stock_planning/stock_planning.py'
--- stock_planning/stock_planning.py	2012-06-22 06:48:54 +0000
+++ stock_planning/stock_planning.py	2012-07-27 16:07:26 +0000
@@ -191,7 +191,7 @@
             coeff_def2uom = 1
             if (product_uom != product.uom_id.id):
                 coeff_def2uom, round_value = self._from_default_uom_factor(cr, uid, product_id, product_uom, {})
-            qty = rounding(coeff_def2uom * product_amt/(product.product_tmpl_id.list_price), round_value)
+            qty = rounding(coeff_def2uom * product_amt/(product.list_price), round_value)
         res = {'value': {'product_qty': qty}}
         return res