IMP IMPORTANT imprrovements on product pack, get pack with sale order constraint

Author: jjscarafia

product_pack/__init__.py

@@ -2,8 +2,4 @@
 ##############################################################################
 # For copyright and license notices, see __openerp__.py file in root directory
 ##############################################################################
-from . import pack
-from . import product
-from . import sale_order_line_pack_line
-from . import sale_order_line
-from . import sale_order
+from . import models

product_pack/__openerp__.py

@@ -20,14 +20,13 @@
 ##############################################################################
 {
     'name': 'Product Pack',
-    'version': '8.0.1.0.0',
+    'version': '8.0.1.1.0',
     'category': 'Product',
     'sequence': 14,
     'summary': '',
     'description': """
 Product Pack
 ============
-# TODO que el boton de abrir lineas de un pack habra una form para configurar eso.
 # TODO implementar totalice en price get
 # TODO ver de permitir packs dentro de packs (robar de v7)
 # TODO calcular correctamente pack virtual available para negativos
@@ -53,8 +52,8 @@
     'data': [
         'security/ir.model.access.csv',
         'security/product_security.xml',
-        'pack_view.xml',
-        'sale_view.xml',
+        'views/pack_view.xml',
+        'views/sale_view.xml',
     ],
     'demo': [
     ],

product_pack/models/__init__.py

@@ -0,0 +1,9 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+# For copyright and license notices, see __openerp__.py file in root directory
+##############################################################################
+from . import pack
+from . import product
+from . import sale_order_line_pack_line
+from . import sale_order_line
+from . import sale_order

product_pack/pack.py product_pack/models/pack.py

@@ -18,14 +18,13 @@ class product_pack(models.Model):
         'product.product', 'Product', required=True)
 
     @api.multi
-    def get_sale_order_line_vals(self, line, order, sequence, fiscal_position):
+    def get_sale_order_line_vals(self, line, order):
         self.ensure_one()
-        sequence += 1
         # pack_price = 0.0
         subproduct = self.product_id
         quantity = self.quantity * line.product_uom_qty
 
-        tax_ids = self.env['account.fiscal.position'].map_tax(
+        tax_ids = order.fiscal_position.map_tax(
             subproduct.taxes_id)
         tax_id = [(6, 0, tax_ids)]
 
@@ -65,7 +64,6 @@ def get_sale_order_line_vals(self, line, order, sequence, fiscal_position):
             'name': '%s%s' % (
                 '> ' * (line.pack_depth + 1), subproduct_name
             ),
-            'sequence': sequence,
             # 'delay': subproduct.sale_delay or 0.0,
             'product_id': subproduct.id,
             # 'procurement_ids': (

product_pack/product.py product_pack/models/product.py

@@ -121,3 +121,16 @@ class product_template(models.Model):
         'Pack?',
         help='Is a Product Pack?',
     )
+
+    # @api.model
+    # def _price_get(self, products, ptype='list_price'):
+    #     res = super(product_template, self)._price_get(
+    #         products, ptype=ptype)
+    #     for product in products:
+    #         if (
+    #                 product.pack and
+    #                 product.pack_price_type == 'totalice_price'):
+    #             # TODO should use price and not list_price
+    #             res[product.id] = sum(product.mapped(
+    #                 'pack_line_ids.product_id.list_price'))
+    #     return res

product_pack/models/sale_order.py

@@ -0,0 +1,46 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+# For copyright and license notices, see __openerp__.py file in root directory
+##############################################################################
+from openerp import models, api
+
+
+class sale_order(models.Model):
+    _inherit = 'sale.order'
+
+    @api.model
+    def create(self, vals):
+        result = super(sale_order, self).create(vals)
+        result.expand_packs()
+        return result
+
+    @api.multi
+    def write(self, vals):
+        result = super(sale_order, self).write(vals)
+        if vals.get('order_line'):
+            self.expand_packs()
+        return result
+
+    # def copy(self, cr, uid, id, default={}, context=None):
+    #     line_obj = self.pool.get('sale.order.line')
+    #     result = super(sale_order, self).copy(cr, uid, id, default, context)
+    #     sale = self.browse(cr, uid, result, context)
+    #     for line in sale.order_line:
+    #         if line.pack_parent_line_id:
+    #             line_obj.unlink(cr, uid, [line.id], context)
+    #     self.expand_packs(cr, uid, sale.id, context)
+    #     return result
+
+    @api.one
+    def expand_packs(self):
+        """
+        """
+        pack_lines = self.order_line.filtered(
+                lambda l: l.state == 'draft' and
+                l.product_id.pack and
+                not l.product_id.sale_order_pack)
+        print 'pack_lines', pack_lines
+        while pack_lines:
+            pack_lines = pack_lines.update_pack_lines()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

product_pack/sale_order_line.py product_pack/models/sale_order_line.py

@@ -39,25 +39,49 @@ class sale_order_line(models.Model):
         'Lines in pack'
     )
 
+    @api.multi
+    def update_pack_lines(self):
+        pack_lines = self.env['sale.order.line']
+        for line in self:
+            for subline in line.product_id.pack_line_ids:
+                vals = subline.get_sale_order_line_vals(
+                    line, line.order_id)
+                vals['sequence'] = line.sequence
+                existing_subline = line.search([
+                    ('product_id', '=', subline.product_id.id),
+                    ('pack_parent_line_id', '=', line.id),
+                    ], limit=1)
+                # if subline already exists we update, if not we create
+                if existing_subline:
+                    existing_subline.write(vals)
+                else:
+                    new_line = line.create(vals)
+                    if (
+                            new_line.state == 'draft' and
+                            new_line.product_id.pack and
+                            not new_line.product_id.sale_order_pack):
+                        pack_lines += new_line
+        return pack_lines
+
     @api.multi
     def button_save_data(self):
         return True
 
     @api.multi
-    def button_details(self):
-        context = self.env.context.copy()
-        context['view_buttons'] = True
+    def action_pack_detail(self):
+        view_id = self.env['ir.model.data'].xmlid_to_res_id(
+            'product_pack.view_order_line_form2')
         view = {
             'name': _('Details'),
             'view_type': 'form',
             'view_mode': 'form',
             'res_model': 'sale.order.line',
-            'view_id': False,
+            'view_id': view_id,
             'type': 'ir.actions.act_window',
             'target': 'new',
             'readonly': True,
             'res_id': self.id,
-            'context': context
+            'context': self.env.context
         }
         return view