Merge lp:~dorian-kemps/unifield-server/US-8040 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/specific_rules/report/report_stock_inventory.py'
--- bin/addons/specific_rules/report/report_stock_inventory.py	2019-03-29 08:46:15 +0000
+++ bin/addons/specific_rules/report/report_stock_inventory.py	2021-02-09 15:57:38 +0000
@@ -311,9 +311,10 @@
         with_zero = False
         values = {'state': 'done'}
         cond = ['state=%(state)s']
+        having = ['having round(sum(product_qty), 6) != 0']
 
-        having = "having round(sum(product_qty), 6) != 0"
         full_prod_list = []
+        batch_list = []
 
         cond.append('location_id in %(location_ids)s')
         if report.location_id:
@@ -323,8 +324,8 @@
 
         if report.product_id:
             cond.append('product_id in %(product_ids)s')
+            full_prod_list = [report.product_id.id]
             values['product_ids'] = (report.product_id.id,)
-            with_zero = True
         elif report.product_list_id:
             cond.append('product_id in %(product_ids)s')
             full_prod_list = self.pool.get('product.product').search(self.cr, self.uid, [('list_ids', '=', report.product_list_id.id)], context=self.localcontext)
@@ -345,29 +346,41 @@
             cond.append('date<%(stock_level_date)s')
             values['stock_level_date'] = '%s 23:59:59' % report.stock_level_date
 
-        if (not report.product_id or not report.product_list_id or not report.prodlot_id or not report.expiry_date) \
-                and report.display_0:
-            with_zero = True
+        if (not report.product_list_id or not report.prodlot_id or not report.expiry_date) and report.display_0:
             to_date = datetime.now()
             if report.stock_level_date:
                 to_date = datetime.strptime(values['stock_level_date'], '%Y-%m-%d %H:%M:%S')
             from_date = (to_date + relativedelta(months=-int(report.in_last_x_months))).strftime('%Y-%m-%d 00:00:00')
-
-            self.cr.execute("""select distinct(product_id) from stock_move 
-                where state='done' and (location_id in %s or location_dest_id in %s) and date >= %s and date <= %s""",
+            with_zero = True
+
+            plus_bn, w_prod = "", ""
+            if report.product_id:
+                plus_bn = ", prodlot_id"
+                w_prod = " product_id = %s AND" % report.product_id.id
+
+            self.cr.execute("""select distinct product_id""" + plus_bn + """ from stock_move 
+                where""" + w_prod + """ state='done' and (location_id in %s or location_dest_id in %s) and date >= %s and date <= %s""",
                             (values['location_ids'], values['location_ids'], from_date, to_date))
             for x in self.cr.fetchall():
                 full_prod_list.append(x[0])
+                if report.product_id and x[1]:
+                    batch_list.append(x[1])
 
-        if with_zero:
-            having = ""
+        if report.product_id and report.display_0:
+            if batch_list:
+                having.append('or prodlot_id in %(batch_list)s')
+                values['batch_list'] = tuple(batch_list)
+            else:
+                having.append('or prodlot_id is NULL')
+        elif with_zero:
+            having = []
 
         self.cr.execute("""select sum(product_qty), product_id, expired_date, prodlot_id, location_id
             from report_stock_inventory
             where
-                """+' and '.join(cond)+"""
+                """ + ' and '.join(cond) + """ 
             group by product_id, expired_date, uom_id, prodlot_id, location_id
-            """ + having, values)
+            """ + ' '.join(having), values)
 
         all_product_ids = {}
         all_bn_ids = {}
@@ -442,7 +455,7 @@
                 'product_name': product_data[product_id].name,
                 'uom': product_data[product_id].uom_id.name,
                 'sum_value':  cost_price * rounded_qty,
-                'with_product_list': with_zero,
+                'with_zero': with_zero,
                 'lines': {},
             }
             total_value += final_result[product_code]['sum_value']

=== modified file 'bin/addons/specific_rules/report/report_stock_inventory_all_locations_xls.mako'
--- bin/addons/specific_rules/report/report_stock_inventory_all_locations_xls.mako	2019-02-25 09:43:25 +0000
+++ bin/addons/specific_rules/report/report_stock_inventory_all_locations_xls.mako	2021-02-09 15:57:38 +0000
@@ -230,7 +230,7 @@
 
     % for prd in lines:
         % for line in prd['lines'].itervalues():
-          % if line['qty'] or prd['with_product_list']:
+          % if line['qty'] or prd['with_zero']:
           <Row ss:AutoFitHeight="1">
             <Cell ss:StyleID="line"><Data ss:Type="String">${(prd['product_code'])|x}</Data></Cell>
             <Cell ss:StyleID="line"><Data ss:Type="String">${(prd['product_name'])|x}</Data></Cell>

=== modified file 'bin/addons/specific_rules/report/report_stock_inventory_view.xml'
--- bin/addons/specific_rules/report/report_stock_inventory_view.xml	2019-03-18 16:21:17 +0000
+++ bin/addons/specific_rules/report/report_stock_inventory_view.xml	2021-02-09 15:57:38 +0000
@@ -55,9 +55,9 @@
                            domain="[('src_product_id', '=', product_id)]" attrs="{'readonly': ['|', ('state', '!=', 'draft'), ('product_list_id', '!=', False)]}" />
                     <field name="expiry_date" attrs="{'readonly': ['|', ('prodlot_id', '!=', False), ('state', '!=', 'draft')]}" />
                     <newline/>
-                    <field name="display_0" attrs="{'invisible': ['|', '|', '|', ('product_id', '!=', False), ('product_list_id', '!=', False), ('prodlot_id', '!=', False), ('expiry_date', '!=', False)]}" />
+                    <field name="display_0" attrs="{'invisible': ['|', '|', ('product_list_id', '!=', False), ('prodlot_id', '!=', False), ('expiry_date', '!=', False)]}" />
                     <field name="in_last_x_months" nolabel="1" colspan="2"
-                           attrs="{'readonly': [('state', '!=', 'draft')], 'invisible': ['|', '|', '|', '|', ('product_id', '!=', False), ('product_list_id', '!=', False), ('prodlot_id', '!=', False), ('expiry_date', '!=', False), ('display_0', '=', False)], 'required': [('display_0', '=', True), ('state', '=', 'draft')]}" />
+                           attrs="{'readonly': [('state', '!=', 'draft')], 'invisible': ['|', '|', '|', ('product_list_id', '!=', False), ('prodlot_id', '!=', False), ('expiry_date', '!=', False), ('display_0', '=', False)], 'required': [('display_0', '=', True), ('state', '=', 'draft')]}" />
 
                     <separator colspan="4" string="Actions" />
                     <group colspan="4" col="2">

=== modified file 'bin/addons/specific_rules/report/report_stock_inventory_xls.mako'
--- bin/addons/specific_rules/report/report_stock_inventory_xls.mako	2019-03-18 16:21:17 +0000
+++ bin/addons/specific_rules/report/report_stock_inventory_xls.mako	2021-02-09 15:57:38 +0000
@@ -232,7 +232,7 @@
     </Row>
     
     % for prd in lines:
-      % if prd['sum_qty'] or prd['with_product_list']:
+      % if prd['sum_qty'] or prd['with_zero']:
       <Row ss:AutoFitHeight="1">
           <Cell ss:StyleID="sumline"><Data ss:Type="String">${(prd['product_code'])|x}</Data></Cell>
           <Cell ss:StyleID="sumline"><Data ss:Type="String">${(prd['product_name'])|x}</Data></Cell>
@@ -245,7 +245,7 @@
           <Cell ss:StyleID="sumline"><Data ss:Type="Number">${(round(prd['sum_value'], 2))|x}</Data></Cell>
       </Row>
         % for line in prd['lines'].itervalues():
-          % if line['qty'] or prd['with_product_list']:
+          % if line['qty'] or prd['with_zero']:
           <Row ss:AutoFitHeight="1">
             <Cell ss:StyleID="line"><Data ss:Type="String">${(prd['product_code'])|x}</Data></Cell>
             <Cell ss:StyleID="line"><Data ss:Type="String">${(prd['product_name'])|x}</Data></Cell>