Merge lp:~camptocamp/stock-logistic-warehouse/7.0-port-stock-orderpoint-creator-mdh into lp:stock-logistic-warehouse

[Matthieu Dietrich @ camptocamp]

[IMP] 7.0 version of stock_orderpoint_creator

Port of the existing module stock_orderpoint_creator for 7.0.

Modified:
- view to be valid in 7.0,
- removed the redefinition of the field product_id, since the product's UOM is verified by a constraint now in procurement; it's still there but mandatory.

[lp:~camptocamp/stock-logistic-warehouse/7.0-port-stock-orderpoint-creator-mdh]

36. By Yannick Vaucher @ Camptocamp on 2014-06-23

remove unused import

37. By Yannick Vaucher @ Camptocamp on 2014-06-23

[PEP8] and cleaning

38. By Yannick Vaucher @ Camptocamp on 2014-06-23

Port wizard view to v 7

39. By Yannick Vaucher @ Camptocamp on 2014-06-23

improve __openerp__.py

40. By Yannick Vaucher @ Camptocamp on 2014-06-23

revert changes in rev 35 removing product_id overwrite and add some more comments

41. By Yannick Vaucher @ Camptocamp on 2014-06-23

add explanations on wizard view

42. By Yannick Vaucher @ Camptocamp on 2014-06-25

override constraint to get ride of it in template

Unmerged revisions

42. By Yannick Vaucher @ Camptocamp on 2014-06-25

override constraint to get ride of it in template

41. By Yannick Vaucher @ Camptocamp on 2014-06-23

add explanations on wizard view

40. By Yannick Vaucher @ Camptocamp on 2014-06-23

revert changes in rev 35 removing product_id overwrite and add some more comments

39. By Yannick Vaucher @ Camptocamp on 2014-06-23

improve __openerp__.py

38. By Yannick Vaucher @ Camptocamp on 2014-06-23

Port wizard view to v 7

37. By Yannick Vaucher @ Camptocamp on 2014-06-23

[PEP8] and cleaning

36. By Yannick Vaucher @ Camptocamp on 2014-06-23

remove unused import

35. By Matthieu Dietrich @ camptocamp on 2014-05-21

[IMP] 7.0 version for stock_orderpoint_creator

=== modified file 'stock_orderpoint_creator/__init__.py'
--- stock_orderpoint_creator/__init__.py	2012-05-24 08:50:35 +0000
+++ stock_orderpoint_creator/__init__.py	2014-06-25 10:47:49 +0000
@@ -18,7 +18,6 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
-from . import base_product_config_template
-from . import orderpoint_template
-import wizard
+from . import base_product_config_template  # noqa
+from . import orderpoint_template  # noqa
+import wizard  # noqa

=== modified file 'stock_orderpoint_creator/__openerp__.py'
--- stock_orderpoint_creator/__openerp__.py	2013-02-13 08:46:41 +0000
+++ stock_orderpoint_creator/__openerp__.py	2014-06-25 10:47:49 +0000
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    Author: Yannick Vaucher (Camptocamp)
-#    Copyright 2012 Camptocamp SA
+#    Author: Yannick Vaucher, Matthieu Dietrich (Camptocamp)
+#    Copyright 2012-2014 Camptocamp SA
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -19,25 +19,36 @@
 #
 ##############################################################################
 
-{'name': 'Configuration of order point in mass',
+{'name': 'Order point creator',
+ 'summary': 'Configuration of order point in mass',
  'version': '1.0',
  'author': 'Camptocamp',
- 'maintainer': 'Camptocamp',
  'category': 'Warehouse',
+ 'license': 'AGPL-3',
  'complexity': 'easy', #easy, normal, expert
+ 'website': "http://www.camptocamp.com",
  'depends': ['procurement'],
  'description': """
-Add a wizard to configure massively order points for multiple product""",
+Order point creator
+===================
+
+Add a wizard to configure massively order points for multiple product
+
+Contributors
+------------
+
+ * Yannick Vaucher <[e-mail]>
+ * Matthieu Dietrich <[e-mail]>
+
+""",
  'website': 'http://www.openerp.com',
- 'init_xml': [],
- 'update_xml': ["wizard/orderpoint_creator_view.xml", "security/ir.model.access.csv"],
- 'demo_xml': [],
+ 'demo': [],
+ 'data': ["wizard/orderpoint_creator_view.xml",
+          "security/ir.model.access.csv",
+          ],
  'test': [],
- 'installable': False,
- 'images': [],
+ 'installable': True,
  'auto_install': False,
- 'license': 'AGPL-3',
- 'active': False,
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'stock_orderpoint_creator/base_product_config_template.py'
--- stock_orderpoint_creator/base_product_config_template.py	2012-05-31 09:30:50 +0000
+++ stock_orderpoint_creator/base_product_config_template.py	2014-06-25 10:47:49 +0000
@@ -22,10 +22,10 @@
 """ Base template for product config """
 from openerp.osv.orm import browse_record, browse_record_list
 
+
 class BaseProductConfigTemplate():
     """ Abstract class for product config """
 
-
     def _get_model(self):
         """ Get the model for which this template is defined
 
@@ -33,42 +33,41 @@
                is represented by this template
         """
         model = self._inherit
-        model_obj = self.pool.get(model)
+        model_obj = self.pool[model]
         return model_obj
 
-    def _get_ids_2_clean(self, cursor, uid, template_br,
+    def _get_ids_2_clean(self, cr, uid, template_br,
                          product_ids, context=None):
         """ hook to select model specific objects to clean
         return must return a list of id"""
         return []
 
-    def _disable_old_instances(self, cursor, uid, template_br_list,
+    def _disable_old_instances(self, cr, uid, template_br_list,
                                product_ids, context=None):
         """ Clean old instance by setting those inactives """
         model_obj = self._get_model()
         for template in template_br_list:
-            ids2clean = self._get_ids_2_clean(cursor, uid, template,
+            ids2clean = self._get_ids_2_clean(cr, uid, template,
                                               product_ids, context=context)
             if self._clean_mode == 'deactivate':
-                model_obj.write(cursor, uid, ids2clean,
+                model_obj.write(cr, uid, ids2clean,
                                 {'active': False}, context=context)
             elif self._clean_mode == 'unlink':
-                model_obj.unlink(cursor, uid, ids2clean, context=context)
-
-
-    def create_instances(self, cursor, uid, template_br,
+                model_obj.unlink(cr, uid, ids2clean, context=context)
+
+    def create_instances(self, cr, uid, template_br,
                          product_ids, context=None):
         """ Create instances of model using template inherited model """
         if not isinstance(product_ids, list):
             product_ids = [product_ids]
 
-        # data = self.copy_data(cursor, uid, template_br.id, context=context)
-        # copy data will not work in all case and may retrieve erronus value
+        # not using self.copy_data(cr, uid, template_br.id, context=context)
+        # as copy data will not work in all case and may retrieve erronus value
 
         model_obj = self._get_model()
 
         data = {}
-        #May rais error on function fields in future
+        #May raise error on function fields in future
         for key in model_obj._columns.keys():
             tmp = template_br[key]
             if isinstance(tmp, browse_record):
@@ -79,7 +78,4 @@
 
         for product_id in product_ids:
             data['product_id'] = product_id
-            model_obj.create(cursor, uid, data, context=context)
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+            model_obj.create(cr, uid, data, context=context)

=== modified file 'stock_orderpoint_creator/orderpoint_template.py'
--- stock_orderpoint_creator/orderpoint_template.py	2012-05-24 14:07:16 +0000
+++ stock_orderpoint_creator/orderpoint_template.py	2014-06-25 10:47:49 +0000
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    Author: Yannick Vaucher (Camptocamp)
-#    Copyright 2012 Camptocamp SA
+#    Author: Yannick Vaucher, Matthieu Dietrich (Camptocamp)
+#    Copyright 2012-2014 Camptocamp SA
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -24,29 +24,49 @@
 from openerp.osv.orm import Model, fields
 from base_product_config_template import BaseProductConfigTemplate
 
+
 class OrderpointTemplate(BaseProductConfigTemplate, Model):
-    """ Template for orderpoints """
+    """ Template for orderpoints
+
+    Here we use same model as stock.warhouse.orderpoint but set product_id
+    as non mandatory as we cannot remove it. This field will be ignored.
+
+    This has the advantage to ensure orderpoint and orderpoint template have
+    same fields.
+
+    _table is redifined to separate templates from orderpoints
+    """
     _name = 'stock.warehouse.orderpoint.template'
 
     _inherit = 'stock.warehouse.orderpoint'
     _table = 'stock_warehouse_orderpoint_template'
     _clean_mode = 'deactivate'
 
-
     _columns = {
-        'product_id': fields.many2one('product.product',
-                                      'Product',
-                                      required=False,
-                                      ondelete='cascade',
-                                      domain=[('type','=','product')]),
-    }
+        'product_id': fields.many2one(
+            'product.product',
+            'Product',
+            required=False,
+            ondelete='cascade',
+            domain=[('type','=','product')]),
+     }
 
-    def _get_ids_2_clean(self, cursor, uid, template_br, product_ids, context=None):
+    def _get_ids_2_clean(self, cr, uid, template_br, product_ids,
+                         context=None):
         """ hook to select model specific objects to clean
         return must return a list of id"""
         model_obj = self._get_model()
-        ids_to_del = model_obj.search(cursor, uid,
-                                      [('product_id', 'in', product_ids)])
+        ids_to_del = model_obj.search(cr, uid,
+                                      [('product_id', 'in', product_ids)],
+                                      context=context)
         return ids_to_del
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+    def _check_product_uom(self, cr, uid, ids, context=None):
+        '''
+        Overwrite constraint _check_product_uom
+        '''
+        return True
+
+    _constraints = [
+        (_check_product_uom, 'Overriding constraint', ['product_id', 'product_uom']),
+    ]

=== modified file 'stock_orderpoint_creator/wizard/__init__.py'
--- stock_orderpoint_creator/wizard/__init__.py	2012-05-23 15:45:56 +0000
+++ stock_orderpoint_creator/wizard/__init__.py	2014-06-25 10:47:49 +0000
@@ -18,5 +18,4 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
-from . import orderpoint_creator
+from . import orderpoint_creator  # noqa

=== modified file 'stock_orderpoint_creator/wizard/orderpoint_creator.py'
--- stock_orderpoint_creator/wizard/orderpoint_creator.py	2012-05-24 14:07:16 +0000
+++ stock_orderpoint_creator/wizard/orderpoint_creator.py	2014-06-25 10:47:49 +0000
@@ -26,44 +26,44 @@
 
 _template_register = ['orderpoint_template_id']
 
+
 class OrderpointCreator(TransientModel):
     _name = 'stock.warehouse.orderpoint.creator'
     _description = 'Orderpoint Creator'
 
-    _columns = {'orderpoint_template_id': fields.many2many(
-                        'stock.warehouse.orderpoint.template',
-                        rel='order_point_creator_rel',
-                        string='Stock rule template')
+    _columns = {
+        'orderpoint_template_id': fields.many2many(
+            'stock.warehouse.orderpoint.template',
+            rel='order_point_creator_rel',
+            string='Stock rule template')
     }
 
-
     def _get_template_register(self):
         """return a list of the field names which defines a template
         This is a hook to allow expending the list of template"""
         return _template_register
 
-
-    def action_configure(self, cursor, uid, wiz_id, context=None):
+    def action_configure(self, cr, uid, wiz_id, context=None):
         """ action to retrieve wizard data and launch creation of items """
 
-        product_ids = context['active_ids']
+        product_ids = context.get('active_ids')
+        assert product_ids
+
         if isinstance(wiz_id, list):
             wiz_id = wiz_id[0]
-        current = self.browse(cursor, uid, wiz_id, context=context)
-        for template_field in  self._get_template_register():
-            template_br_list = current[template_field]
+        this = self.browse(cr, uid, wiz_id, context=context)
+        for template_field in self._get_template_register():
+            template_br_list = this[template_field]
             if template_br_list:
                 if isinstance(template_br_list, browse_record):
                     template_br_list = [template_br_list]
                 template_model = template_br_list[0]._model._name
                 template_obj = self.pool.get(template_model)
-                template_obj._disable_old_instances(cursor, uid, template_br_list,
-                                                    product_ids, context=context)
+                template_obj._disable_old_instances(cr, uid, template_br_list,
+                                                    product_ids,
+                                                    context=context)
                 for template_br in template_br_list:
-                    template_obj.create_instances(cursor, uid, template_br,
-                                              product_ids, context=context)
+                    template_obj.create_instances(cr, uid, template_br,
+                                                  product_ids, context=context)
 
         return {}
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'stock_orderpoint_creator/wizard/orderpoint_creator_view.xml'
--- stock_orderpoint_creator/wizard/orderpoint_creator_view.xml	2012-05-24 14:07:16 +0000
+++ stock_orderpoint_creator/wizard/orderpoint_creator_view.xml	2014-06-25 10:47:49 +0000
@@ -1,31 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
-
-        <record id="orderpoint_creator_view" model="ir.ui.view">
-            <field name="name">stock.warehouse.orderpoint.creator</field>
-            <field name="model">stock.warehouse.orderpoint.creator</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form>
-                    <group string="templates" colspan="4">
-                        <field name="orderpoint_template_id" colspan="4"/>
-                    </group>
-                    <group colspan="2" col="4">
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                        <button name="action_configure" string="Apply" type="object" icon="gtk-execute"/>
-                    </group>
-                </form>
-            </field>
-        </record>
-
-        <act_window name="Product warehouse config"
-            res_model="stock.warehouse.orderpoint.creator"
-            src_model="product.product"
-            view_mode="form"
-            target="new"
-            key2="client_action_multi"
-            id="act_create_product_conf"/>
-
-    </data>
+  <data>
+
+    <record id="orderpoint_creator_view" model="ir.ui.view">
+      <field name="name">stock.warehouse.orderpoint.creator</field>
+      <field name="model">stock.warehouse.orderpoint.creator</field>
+      <field name="arch" type="xml">
+        <form string="Product warehouse config" version="7.0">
+          <label string="This wizard will apply the following orderpoint to selected product(s)"/>
+          <group string="Templates" colspan="4">
+            <field name="orderpoint_template_id" colspan="4"/>
+          </group>
+          <footer>
+            <button name="action_configure" string="Apply" type="object" class="oe_highlight" icon="gtk-execute"/>
+            or
+            <button string="Cancel" class="oe_link" special="cancel"/>
+          </footer>
+        </form>
+      </field>
+    </record>
+
+    <act_window name="Product warehouse config"
+        res_model="stock.warehouse.orderpoint.creator"
+        src_model="product.product"
+        view_mode="form"
+        target="new"
+        key2="client_action_multi"
+        id="act_create_product_conf"/>
+
+  </data>
 </openerp>