Merge lp:~camptocamp/margin-analysis/7.0-product_cost_incl_bom_price_history-mismatch-product-template into lp:~margin-analysis-core-editors/margin-analysis/7.0

[Guewen Baconnier @ Camptocamp]

Fixes lp:1268638

Mismatch between product.product and product.template

It expects product.template ids but receive product.product ids.

[lp:~camptocamp/margin-analysis/7.0-product_cost_incl_bom_price_history-mismatch-product-template]

58. By Guewen Baconnier @ Camptocamp on 2014-01-13

[MRG] from lp:~camptocamp/margin-analysis/7.0-product_cost_incl_bom_price_history-mismatch-product-template

59. By Joël Grand-Guillaume @ camptocamp on 2014-02-04

[FIX] The open price history button now display the product correctly by adding domain on template, not product
[IMP] Historic price view now display an inteliggent group by by default

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

Hi,

LGTM, thanks !

Just added the same support to open historic price from product form.

Regards

review: Approve (code review + test)

[lp:~camptocamp/margin-analysis/7.0-product_cost_incl_bom_price_history-mismatch-product-template]

60. By Joël Grand-Guillaume @ camptocamp on 2014-02-05

[FIX] Add a form view on margin details to avoid a keyerror bug

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

Add a little fix in the meanwhile

=== modified file 'product_cost_incl_bom_price_history/product.py'
--- product_cost_incl_bom_price_history/product.py	2013-12-12 10:09:02 +0000
+++ product_cost_incl_bom_price_history/product.py	2014-02-05 09:14:09 +0000
@@ -21,11 +21,9 @@
 
 from openerp.osv import orm, fields
 import decimal_precision as dp
-import openerp
 from openerp.addons.product_price_history.product_price_history import (
     PRODUCT_FIELD_HISTORIZE
 )
-from openerp import SUPERUSER_ID
 import time
 from datetime import datetime, timedelta
 import logging
@@ -60,7 +58,7 @@
                                     if not field_flag:
                                         field_flag = True
         if self._columns[field_name]._multi:
-            raise ValueError('multi is not supported on the cost_price field')
+            raise ValueError('multi is not supported on the %s field' % field_name)
         # use admin user for accessing objects having rules defined on
         # store fields
         result = self._columns[field_name].get(cr, self, ids,
@@ -71,16 +69,12 @@
                 if r in field_dict.keys():
                     if field_name in field_dict[r]:
                         result.pop(r)
-        for id, value in result.items():
-            tpl_id = self.read(cr, uid, id,
-                               ['product_tmpl_id'],
-                               context=context)['product_tmpl_id']
-            _logger.debug("set price history: %s, product_tpl_id: %s, "
-                          "context: %s",
-                          value,
-                          tpl_id,
-                          context)
-            prod_tpl_obj._log_price_change(cr, uid, id,
+        prods = self.read(cr, uid, result.keys(), ['product_tmpl_id'],
+                          context=context, load='_classic_write')
+        tmpls = dict((row['id'], row['product_tmpl_id']) for row in prods)
+        for prod_id, value in result.iteritems():
+            tmpl_id = tmpls[prod_id]
+            prod_tpl_obj._log_price_change(cr, uid, tmpl_id,
                                            field_name,
                                            value,
                                            context=context)
@@ -101,9 +95,6 @@
             fields = list(set(fields))
             fields.remove('cost_price')
             self._set_field_name_values(cr, uid, ids, 'cost_price', context)
-        _logger.debug("call _store_set_values, ids %s, fields: %s",
-                      ids,
-                      fields)
         res = super(product_product, self)._store_set_values(cr,
                                                              uid,
                                                              ids,
@@ -138,37 +129,57 @@
                    context=None, load='_classic_read'):
         if context is None:
             context = {}
-        if fields:
+        if not fields:
+            fields = []
+        else:
+            fields = fields[:]  # avoid to modify the callee's list
+        if fields and not 'id' in fields:
             fields.append('id')
         pt_obj = self.pool.get('product.template')
+
+        historized_fields = [f for f in fields if f in PRODUCT_FIELD_HISTORIZE]
+        remove_tmpl_field = False
+        if fields and not 'product_tmpl_id' in fields and historized_fields:
+            remove_tmpl_field = True
+            fields.append('product_tmpl_id')
+
         results = super(product_product, self)._read_flat(cr, uid, ids,
                                                           fields,
                                                           context=context,
                                                           load=load)
          # Note if fields is empty => read all, so look at history table
-        if not fields or any([f in PRODUCT_FIELD_HISTORIZE for f in fields]):
+        if not fields or historized_fields:
             date_crit = False
             price_history = self.pool.get('product.price.history')
             company_id = pt_obj._get_transaction_company_id(cr, uid,
                                                             context=context)
             if context.get('to_date'):
                 date_crit = context['to_date']
-            # if fields is empty we read all price fields
-            if not fields:
-                price_fields = PRODUCT_FIELD_HISTORIZE
-            # Otherwise we filter on price fields asked in read
+            if load == '_classic_write':
+                # list of ids
+                tmpl_ids = [row['product_tmpl_id'] for row in results]
             else:
-                price_fields = [f for f in PRODUCT_FIELD_HISTORIZE
-                                if f in fields]
-            prod_prices = price_history._get_historic_price(cr, uid,
-                                                            ids,
-                                                            company_id,
-                                                            datetime=date_crit,
-                                                            field_names=price_fields,
-                                                            context=context)
+                # list of (id, name)
+                tmpl_ids = [row['product_tmpl_id'][0] for row in results]
+            prod_prices = price_history._get_historic_price(
+                cr, uid,
+                tmpl_ids,
+                company_id,
+                datetime=date_crit,
+                field_names=historized_fields or PRODUCT_FIELD_HISTORIZE,
+                context=context)
             for result in results:
-                dict_value = prod_prices[result['id']]
+                if load == '_classic_write':
+                    tmpl_id = result['product_tmpl_id']
+                else:
+                    tmpl_id = result['product_tmpl_id'][0]
+                dict_value = prod_prices[tmpl_id]
                 result.update(dict_value)
+
+        if remove_tmpl_field:
+            for row in results:
+                # this field was not asked by the callee
+                del row['product_tmpl_id']
         return results
 
     def _product_value(self, cr, uid, ids, field_names=None,
@@ -184,8 +195,6 @@
         products = self.read(cr, uid, ids,
                              ['id', 'qty_available', 'cost_price'],
                              context=context)
-        _logger.debug("product value get, result :%s, context: %s",
-                      products, context)
         for product in products:
             res[product['id']] = product['qty_available'] * product['cost_price']
         return res

=== modified file 'product_historical_margin/account_invoice_view.xml'
--- product_historical_margin/account_invoice_view.xml	2013-11-28 15:20:12 +0000
+++ product_historical_margin/account_invoice_view.xml	2014-02-05 09:14:09 +0000
@@ -31,6 +31,34 @@
       </field>
     </record>
 
+    <record id="view_invoice_line_form_from_product" model="ir.ui.view">
+      <field name="name">account.invoice.line.from.product.form</field>
+      <field name="model">account.invoice.line</field>
+      <field name="arch" type="xml">
+        <form string="Invoice Line" create="false">
+          <field name="invoice_type"/>
+          <field name="partner_id"/>
+          <field name="invoice_user_id"/>
+          <field name="invoice_id"/>
+          <field name="invoice_date"/>
+          <field name="name" invisible="1"/>
+          <field name="product_id"/>
+          <field name="account_id" invisible="1"/>
+          <field name="quantity"/>
+          <field name="uos_id"/>
+          <field name="price_unit" invisible="1"/>
+          <field name="discount" invisible="1"/>
+          <field name="price_subtotal" invisible="1"/>
+          <field name="subtotal_cost_price" invisible="1"/>
+          <field name="company_id" invisible="1"/>
+          <field name="subtotal_company" sum="Total Net Sales "/>
+          <field name="subtotal_cost_price_company" sum="Total Cost"/>
+          <field name="margin_absolute" sum="Total Absolute Margin"/>
+          <field name="margin_relative" />
+        </form>
+      </field>
+    </record>
+
     <record id="view_account_invoice_line_filter" model="ir.ui.view">
       <field name="name">account.invoice.line.select</field>
       <field name="model">account.invoice.line</field>

=== modified file 'product_price_history/product_price_history.py'
--- product_price_history/product_price_history.py	2013-12-11 15:09:00 +0000
+++ product_price_history/product_price_history.py	2014-02-05 09:14:09 +0000
@@ -22,7 +22,7 @@
 
 import logging
 import time
-from openerp.osv import orm, fields
+from openerp.osv import orm, fields, expression
 import openerp.addons.decimal_precision as dp
 from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
 
@@ -140,6 +140,19 @@
                  "goods stored at this Location, or any of its children."),
     }
 
+    def open_product_historic_prices(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        prod_tpl_obj = self.pool.get('product.template')
+        prod_tpl_ids = []
+        for product in self.browse(cr, uid, ids, context=context):
+            if product.product_tmpl_id.id not in prod_tpl_ids:
+                prod_tpl_ids.append(product.product_tmpl_id.id)
+        res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid, 
+            'product_price_history', 'action_price_history', context=context)
+        res['domain'] = expression.AND([res.get('domain', []), 
+            [('product_id', 'in', prod_tpl_ids)]])
+        return res
 
 class product_template(orm.Model):
     _inherit = "product.template"

=== modified file 'product_price_history/product_price_history_view.xml'
--- product_price_history/product_price_history_view.xml	2013-12-10 13:52:28 +0000
+++ product_price_history/product_price_history_view.xml	2014-02-05 09:14:09 +0000
@@ -56,10 +56,10 @@
                 <field name="product_id"/>
                 <field name="company_id" groups="base.group_multi_company"/>
                 <group expand="0" string="Group By...">
-                    <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'datetime'}"/>
-                    <filter string="Product" domain="[]" context="{'group_by':'product_id'}"/>
-                    <filter string="Name" domain="[]" context="{'group_by':'name'}"/>
-                    <filter string="Company" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                    <filter string="Date" name="group_date" icon="terp-go-month" domain="[]" context="{'group_by':'datetime'}"/>
+                    <filter string="Product" name="group_product_id" domain="[]" context="{'group_by':'product_id'}"/>
+                    <filter string="Name" domain="[]" name="group_name" context="{'group_by':'name'}"/>
+                    <filter string="Company" domain="[]" name="group_company_id" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                 </group>
             </search>
 
@@ -73,18 +73,34 @@
         <field name="view_type">form</field>
         <field name="view_id" ref="view_product_price_history_from_product"/>
         <field name="search_view_id" ref="view_product_price_history_filter"/>
+        <field name="context">{'search_default_group_product_id':1,'search_default_group_name': 1,'group_by':[]}</field>
     </record>
 
-    <act_window
+
+    <menuitem action="action_price_history"
+            id="menu_product_price_history_action_form"
+            parent="stock.next_id_61" sequence="2"/>
+
+   <!--  <act_window
             context="{'search_default_product_id': [active_id], 'default_product_id': active_id}"
             id="act_product_prices_history_open"
             name="Prices History"
             res_model="product.price.history"
-            src_model="product.product"/>
-
-    <menuitem action="action_price_history"
-            id="menu_product_price_history_action_form"
-            parent="stock.next_id_61" sequence="2"/>
+            src_model="product.product"/> -->
+
+    <record id="product_search_form_view_stock" model="ir.ui.view">
+        <field name="name">product.product.price_history.form</field>
+        <field name="model">product.product</field>
+        <field name="inherit_id" ref="product.product_normal_form_view"/>
+        <field name="arch" type="xml">
+            <div class="oe_right oe_button_box" name="buttons" position="inside">
+                <button name="open_product_historic_prices"
+                            string="Prices History" groups="product.group_costing_method"
+                            type="object" />
+            </div>
+        </field>
+    </record>
+
     
   </data>
 </openerp>

=== modified file 'product_price_history/wizard/historic_prices.py'
--- product_price_history/wizard/historic_prices.py	2013-12-12 10:09:02 +0000
+++ product_price_history/wizard/historic_prices.py	2014-02-05 09:14:09 +0000
@@ -25,8 +25,11 @@
 
 
 class historic_prices(orm.TransientModel):
+    """ Will display an inventory valuation of the stock with quantity > 0
+        at the given date.
+    """
     _name = 'historic.prices'
-    _description = 'Product historical prices'
+    _description = 'Inventory Valuation'
 
     def _default_location(self, cr, uid, ids, context=None):
         try:
@@ -159,3 +162,4 @@
             'domain': domain,
             'search_view_id': filter_id,
             }
+

=== modified file 'product_price_history/wizard/historic_prices_view.xml'
--- product_price_history/wizard/historic_prices_view.xml	2013-12-10 10:36:54 +0000
+++ product_price_history/wizard/historic_prices_view.xml	2014-02-05 09:14:09 +0000
@@ -32,6 +32,5 @@
         id="menu_action_product_historic_prices_tree"
         parent="stock.next_id_61" />
 
-
   </data>
 </openerp>