Merge lp:~unifield-team/unifield-wm/bklg-73 into lp:unifield-wm

[Quentin THEURET @Amaris]

[lp:~unifield-team/unifield-wm/bklg-73]

2494. By Quentin THEURET @Amaris on 2015-08-06

Merge latest trunk

2495. By Quentin THEURET @Amaris on 2015-08-06

BKLG-73 [IMP]
  * For the Sourcing Groups, it would be better if these could be stocked as master data (Supply Config>Orders?) so all types can be seen, and one can be selected or created. - In addition, as well as the code, it would be good to have a Field for a Free text description in the master data record.
  * For the PO produced, a new field "Sourcing Group" can be added in Notes tab. This sourcing group selected in OST is automatically added as value when PO is produced. However this value is not shown on PO print out or other exports.
  * After PO (with sourcing group) has been generated, only other OST lines with same sourcing group (and supplier - and according to supplier order creation mode) can be added automatically to this PO. However user can manually add (from scratch) new lines to this PO.

2496. By Quentin THEURET @Amaris on 2015-08-06

BKLG-73 [IMP] POs with different sourcing groups can be merged, default system merging message will be changed to say 'any sourcing group will be lost'.

Unmerged revisions

2496. By Quentin THEURET @Amaris on 2015-08-06

BKLG-73 [IMP] POs with different sourcing groups can be merged, default system merging message will be changed to say 'any sourcing group will be lost'.

2495. By Quentin THEURET @Amaris on 2015-08-06

BKLG-73 [IMP]
  * For the Sourcing Groups, it would be better if these could be stocked as master data (Supply Config>Orders?) so all types can be seen, and one can be selected or created. - In addition, as well as the code, it would be good to have a Field for a Free text description in the master data record.
  * For the PO produced, a new field "Sourcing Group" can be added in Notes tab. This sourcing group selected in OST is automatically added as value when PO is produced. However this value is not shown on PO print out or other exports.
  * After PO (with sourcing group) has been generated, only other OST lines with same sourcing group (and supplier - and according to supplier order creation mode) can be added automatically to this PO. However user can manually add (from scratch) new lines to this PO.

2494. By Quentin THEURET @Amaris on 2015-08-06

Merge latest trunk

2493. By Quentin THEURET @Amaris on 2015-05-21

BKLG-73 [IMP] Sourcing: Split the PO creation into different PO according to group in OST

2492. By Quentin THEURET @Amaris on 2015-05-21

BKLG-73 [IMP] Sourcing tool: Add a new field to group all lines to the same supplier on different POs

=== modified file 'msf_doc_import/view/purchase_order_import_line_view.xml'
--- msf_doc_import/view/purchase_order_import_line_view.xml	2014-01-16 10:06:42 +0000
+++ msf_doc_import/view/purchase_order_import_line_view.xml	2015-08-06 15:15:58 +0000
@@ -23,6 +23,8 @@
                     <field name="import_in_progress" readonly="1" invisible="0" />
                 </xpath>
                 <xpath expr="/form/notebook/page[@string='Notes']/field[@name='project_ref']" position="after">
+                    <separator colspan="4" string="Sourcing group" />
+                    <field name="related_sourcing_id" readonly="True" />
                     <separator colspan="4" string="Import filenames" />
                     <field name="import_filenames" mode="tree" readonly="1" nolabel="1" colspan="4">
                         <tree string="Imported filenames">

=== modified file 'purchase_override/purchase.py'
--- purchase_override/purchase.py	2015-08-03 11:48:43 +0000
+++ purchase_override/purchase.py	2015-08-06 15:15:58 +0000
@@ -162,6 +162,9 @@
         if not context.get('keepOrigin', False):
             default.update({'origin': False})
 
+        if not default.get('related_sourcing_id', False):
+            default['related_sourcing_id'] = False
+
         return super(purchase_order, self).copy(cr, uid, p_id, default, context=context)
 
     # @@@purchase.purchase_order._invoiced

=== modified file 'purchase_override/purchase_view.xml'
--- purchase_override/purchase_view.xml	2015-04-09 12:56:14 +0000
+++ purchase_override/purchase_view.xml	2015-08-06 15:15:58 +0000
@@ -379,6 +379,7 @@
                         <html colspan="4">
                             <p>All information of the PO template will be written in the new PO,</p>
                             <p>except the Delivery Requested date which will be the earliest date of all POs.</p>
+                            <p>Any sourcing group will be lost.</p>
                         </html>
                         <newline />
                         <group colspan="4" col="4" attrs="{'invisible': [('unmatched_categ', '=', False)]}">

=== modified file 'sale_override/sale.py'
--- sale_override/sale.py	2015-08-06 08:49:25 +0000
+++ sale_override/sale.py	2015-08-06 15:15:58 +0000
@@ -1827,6 +1827,7 @@
             'company_id': order.company_id.id,
             'supplier': line.supplier and line.supplier.id or False,
             'po_cft': line.po_cft or False,
+            'related_sourcing_id': line.related_sourcing_id and line.related_sourcing_id.id or False,
             'date_planned': rts_date,
             'from_yml_test': order.from_yml_test,
             'so_back_update_dest_po_id_procurement_order': line.so_back_update_dest_po_id_sale_order_line.id,

=== modified file 'sourcing/__init__.py'
--- sourcing/__init__.py	2014-03-10 09:56:10 +0000
+++ sourcing/__init__.py	2015-08-06 15:15:58 +0000
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 
+import related_sourcing
 import sale_order_line
 import wizard
 

=== modified file 'sourcing/__openerp__.py'
--- sourcing/__openerp__.py	2014-03-14 08:17:52 +0000
+++ sourcing/__openerp__.py	2015-08-06 15:15:58 +0000
@@ -50,6 +50,7 @@
         ],
     'update_xml': [
         'sourcing_view.xml',
+        'related_sourcing_view.xml',
         'wizard/multiple_sourcing_view.xml',
     ],
     'installable': True,

=== modified file 'sourcing/procurement_order.py'
--- sourcing/procurement_order.py	2015-03-19 09:43:56 +0000
+++ sourcing/procurement_order.py	2015-08-06 15:15:58 +0000
@@ -68,6 +68,10 @@
     _columns = {
         'supplier': fields.many2one('res.partner', 'Supplier'),
         'po_cft': fields.selection(_SELECTION_PO_CFT, string="PO/CFT"),
+        'related_sourcing_id': fields.many2one(
+            'related.sourcing',
+            string='Group',
+        ),
         'unique_rule_type': fields.char(
             size=128,
             string='Unique Replenishment rule type',
@@ -86,6 +90,9 @@
         if not default_values.get('from_splitted_po_line'):
             default_values['from_splitted_po_line'] = False
 
+        if not default_values.get('related_sourcing_id'):
+            default_values['related_sourcing_id'] = False
+
         return super(procurement_order, self).copy_data(cr, uid, copy_id, default_values, context=context)
 
     def po_line_values_hook(self, cr, uid, ids, context=None, *args, **kwargs):
@@ -206,6 +213,13 @@
         else:
             purchase_domain.append(('order_type', '!=', 'direct'))
 
+        if procurement.related_sourcing_id:
+            purchase_domain.append(('related_sourcing_id', '=', procurement.related_sourcing_id.id))
+            values['related_sourcing_id'] = procurement.related_sourcing_id.id
+        else:
+            purchase_domain.append(('related_sourcing_id', '=', False))
+            values['related_sourcing_id'] = False
+
         if procurement.tender_line_id and procurement.tender_line_id.purchase_order_line_id:
             purchase_domain.append(('pricelist_id', '=', procurement.tender_line_id.purchase_order_line_id.order_id.pricelist_id.id))
         elif procurement.rfq_id:

=== modified file 'sourcing/purchase_order.py'
--- sourcing/purchase_order.py	2014-10-02 20:13:13 +0000
+++ sourcing/purchase_order.py	2015-08-06 15:15:58 +0000
@@ -51,6 +51,11 @@
             string='PO from replenishment rules',
             readonly=True,
         ),
+        'related_sourcing_id': fields.many2one(
+            'related.sourcing',
+            string='Sourcing group',
+            readonly=True,
+        ),
     }
 
     _defaults = {

=== added file 'sourcing/related_sourcing.py'
--- sourcing/related_sourcing.py	1970-01-01 00:00:00 +0000
+++ sourcing/related_sourcing.py	2015-08-06 15:15:58 +0000
@@ -0,0 +1,68 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2014 TeMPO Consulting, MSF
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields
+from osv import osv
+
+import string
+
+
+class related_sourcing(osv.osv):
+    """
+    This object is used to link sourcing lines on a same PO to the same
+    supplier. If most sourcing lines are sourced to the same supplier but
+    have different related.sourcing, one PO per related.sourcing will be
+    created with all lines linked to this related.sourcing.
+    """
+    _name = 'related.sourcing'
+    _description = 'Sourcing group'
+
+    _columns = {
+        'name': fields.char(
+            size=128,
+            string='Name',
+            required=True,
+        ),
+        'description': fields.text(
+            string='Description',
+        ),
+    }
+
+    def create(self, cr, uid, vals, context=None):
+        """
+        Format the name value
+        """
+        vals['name'] = filter(str.isalnum, vals.get('name', '')).upper()
+        return super(related_sourcing, self).\
+            create(cr, uid, vals, context=context)
+
+    def write(self, cr, uid, ids, vals, context=None):
+        """
+        Format the name value
+        """
+        vals['name'] = filter(str.isalnum, vals.get('name', '')).upper()
+        return super(related_sourcing, self).\
+            write(cr, uid, ids, vals, context=context)
+
+related_sourcing()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'sourcing/related_sourcing_view.xml'
--- sourcing/related_sourcing_view.xml	1970-01-01 00:00:00 +0000
+++ sourcing/related_sourcing_view.xml	2015-08-06 15:15:58 +0000
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="related_sourcing_tree_view" model="ir.ui.view">
+            <field name="name">related.sourcing.tree.view</field>
+            <field name="model">related.sourcing</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Sourcing groups" editable="top">
+                    <field name="name" />
+                    <field name="description" />
+                </tree>
+            </field>
+        </record>
+
+        <record id="related_sourcing_action" model="ir.actions.act_window">
+            <field name="name">Sourcing groups</field>
+            <field name="res_model">related.sourcing</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <menuitem
+            id="related_sourcing_menu"
+            action="related_sourcing_action"
+            parent="base.menu_sale_config_sales" />
+
+    </data>
+</openerp>

=== modified file 'sourcing/sale_order_line.py'
--- sourcing/sale_order_line.py	2015-07-24 12:22:31 +0000
+++ sourcing/sale_order_line.py	2015-08-06 15:15:58 +0000
@@ -419,6 +419,10 @@
             'res.partner',
             'Supplier',
         ),
+        'related_sourcing_id': fields.many2one(
+            'related.sourcing',
+            string='Group',
+        ),
         'location_id': fields.many2one(
             'stock.location',
             string='Location',

=== modified file 'sourcing/sourcing_view.xml'
--- sourcing/sourcing_view.xml	2014-09-29 12:38:06 +0000
+++ sourcing/sourcing_view.xml	2015-08-06 15:15:58 +0000
@@ -98,6 +98,8 @@
 					<field name="po_cft"
 					    on_change="onChangePoCft(po_cft, order_id, supplier)" 
                         attrs="{'readonly': ['|', ('type', '=', 'make_to_stock'), ('state', '!=', 'draft')], 'required': [('type', '=', 'make_to_order')]}" />
+                    <field name="related_sourcing_id"
+                        attrs="{'readonly': ['|', '|', ('type', '=', 'make_to_stock'), ('state', '!=', 'draft'), ('po_cft', 'not in', ['po', 'dpo'])]}" />
                     <field name="location_id" 
                         widget="selection"
                         on_change="onChangeLocation(location_id, product_id, rts, order_id)"
@@ -191,7 +193,30 @@
 		    target="new"
             key2="client_action_multi"
             empty_ids="1"
-		    id="action_compute_schedulers_sourcing"/>
+            id="action_compute_schedulers_sourcing"/>
+
+        <!-- Related sourcing group -->
+        <record id="related_sourcing_search_view" model="ir.ui.view">
+            <field name="name">related.sourcing.search.view</field>
+            <field name="model">related.sourcing</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <search string="Related sourcing group">
+                    <field name="name" />
+                </search>
+            </field>
+        </record>
+
+        <record id="related_sourcing_form_view" model="ir.ui.view">
+            <field name="name">related.sourcing.form.view</field>
+            <field name="model">related.sourcing</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Related sourcing group">
+                    <field name="name" />
+                </form>
+            </field>
+        </record>
 
 	</data>
 </openerp>

=== modified file 'sourcing/wizard/multiple_sourcing.py'
--- sourcing/wizard/multiple_sourcing.py	2015-03-02 20:31:25 +0000
+++ sourcing/wizard/multiple_sourcing.py	2015-08-06 15:15:58 +0000
@@ -49,6 +49,10 @@
             _SELECTION_PO_CFT,
             string='PO/CFT',
         ),
+        'related_sourcing_id': fields.many2one(
+            'related.sourcing',
+            string='Group',
+        ),
         'location_id': fields.many2one(
             'stock.location',
             string='Location',
@@ -92,6 +96,7 @@
         res['po_cft'] = False
         loc = -1 # first location flag
         supplier = -1 # first location flag
+        group = None
         for line in self.pool.get('sale.order.line').browse(cr, uid, active_ids, context=context):
             if line.state == 'draft' and line.sale_order_state == 'validated':
                 res['line_ids'].append(line.id)
@@ -111,9 +116,20 @@
                         supplier = temp
                     elif supplier != temp:
                         supplier = False
+
+                if not line.related_sourcing_id:
+                    group = False
+                else:
+                    temp = line.related_sourcing_id.id
+                    if group is None:
+                        group = temp
+                    elif group != temp:
+                        group = False
+
             else:
                 # UTP-1021: Calculate the location to set into the wizard view if all lines are sourced from the same location
                 supplier = False # if source from stock, always set False to partner
+                group = False
                 temploc = line.location_id.id
                 if loc == -1: # first location
                     loc = temploc
@@ -125,6 +141,8 @@
             res['location_id'] = loc
         if supplier != -1:
             res['supplier_id'] = supplier
+        if group is not None:
+            res['related_sourcing_id'] = group
 
         if not res['line_ids']:
             raise osv.except_osv(_('Error'), _('No non-sourced lines are selected. Please select non-sourced lines'))
@@ -160,6 +178,7 @@
                         line_obj.write(cr, uid, [line.id], {'type': wiz.type,
                                                             'po_cft': wiz.po_cft,
                                                             'supplier': wiz.supplier_id and wiz.supplier_id.id or False,
+                                                            'related_sourcing_id': wiz.related_sourcing_id and wiz.related_sourcing_id.id or False,
                                                             'location_id': wiz.location_id.id and wiz.location_id.id or False},
                                                              context=context)
                     except osv.except_osv, e:

=== modified file 'sourcing/wizard/multiple_sourcing_view.xml'
--- sourcing/wizard/multiple_sourcing_view.xml	2015-03-02 20:31:25 +0000
+++ sourcing/wizard/multiple_sourcing_view.xml	2015-08-06 15:15:58 +0000
@@ -28,12 +28,14 @@
                                on_change="change_supplier(supplier_id)"
                         />
 
-
-                   <field name="location_id"  domain="[('usage', '=', 'internal'), ('quarantine_location', '=', False), 
-                                                      ('scrap_location', '=', False), ('destruction_location', '=', False), 
-                                                      ('output_ok', '=', False), ('input_ok', '=', False)]" 
-                                                      attrs="{'readonly': [('type', '!=', 'make_to_stock')]}" 
-                              on_change="change_location(location_id, line_ids)" />
+                        <field name="location_id"
+                               domain="[('usage', '=', 'internal'), ('quarantine_location', '=', False), 
+                                        ('scrap_location', '=', False), ('destruction_location', '=', False), 
+                                        ('output_ok', '=', False), ('input_ok', '=', False)]" 
+                               attrs="{'readonly': [('type', '!=', 'make_to_stock')]}" 
+                               on_change="change_location(location_id, line_ids)" />
+                        <field name="related_sourcing_id"
+                            attrs="{'readonly': ['|', ('type', '!=', 'make_to_order'), ('po_cft', 'not in', ['po', 'dpo'])]}" />
 
                     </group>
                     <separator colspan="4" string="Actions" />