Merge lp:~unifield-team/unifield-server/us-2367 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_cross_docking/cross_docking_view.xml'
--- bin/addons/msf_cross_docking/cross_docking_view.xml	2016-11-04 12:57:37 +0000
+++ bin/addons/msf_cross_docking/cross_docking_view.xml	2017-05-24 07:13:20 +0000
@@ -56,7 +56,7 @@
             <field name="arch" type="xml">
                 <data>
                     <xpath expr="/form/notebook/page[@string='General Information']/field[@name='move_lines']" position="attributes" >
-                        <attribute name="default_get">{'purchase_id': purchase_id, 'reason_type_id': reason_type_id, 'warehouse_id': warehouse_id, 'address_in_id': address_id, 'date_expected': min_date} </attribute>
+                        <attribute name="default_get">{'purchase_id': purchase_id, 'reason_type_id': reason_type_id, 'warehouse_id': warehouse_id, 'address_in_id': address_id, 'date_expected': min_date, 'ext_cu': ext_cu} </attribute>
                     </xpath>
                 </data>
             </field>

=== modified file 'bin/addons/msf_doc_import/wizard/wiz_common_import.py'
--- bin/addons/msf_doc_import/wizard/wiz_common_import.py	2017-04-12 08:42:16 +0000
+++ bin/addons/msf_doc_import/wizard/wiz_common_import.py	2017-05-24 07:13:20 +0000
@@ -697,6 +697,8 @@
 
         if picking.partner_id and picking.type == 'in':
             location_id = picking.partner_id.property_stock_supplier.id
+        elif picking.ext_cu and picking.type == 'in':
+            location_id = picking.ext_cu.id
         elif picking.type == 'in':
             location_id = get_ref(cr, uid, 'stock', 'stock_location_suppliers')[1]
         else:
@@ -721,7 +723,9 @@
                       'reason_type_id': picking.reason_type_id.id,
                       'location_id': location_id,
                       'location_dest_id': location_dest_id,
-                      'name': p_data['name'],}
+                      'name': p_data['name'],
+                      'is_ext_cu': True if picking.ext_cu else False,
+                      }
 
             values.update(self.onchange_product_id(cr, uid, False, p_data['id'], location_id, location_dest_id, picking.address_id and picking.address_id.id or False, picking.type, False).get('value', {}))
 

=== modified file 'bin/addons/msf_printed_documents/report/report_reception.py'
--- bin/addons/msf_printed_documents/report/report_reception.py	2017-04-19 12:52:45 +0000
+++ bin/addons/msf_printed_documents/report/report_reception.py	2017-05-24 07:13:20 +0000
@@ -163,12 +163,16 @@
             return False
 
     def getPartnerName(self,o):
+<<<<<<< TREE
         if o.purchase_id:
             return o.purchase_id and o.purchase_id.partner_id and o.purchase_id.partner_id.name or False
         elif o.partner_id:
             return o.partner_id.name
         else:
             return False
+=======
+        return o.purchase_id and o.purchase_id.partner_id and o.purchase_id.partner_id.name or (o.ext_cu and o.ext_cu.name)
+>>>>>>> MERGE-SOURCE
 
     def getPartnerAddress(self,o):
         if o.purchase_id:

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2017-05-22 16:04:34 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2017-05-24 07:13:20 +0000
@@ -98181,6 +98181,7 @@
 msgid "Article must be used only in a properly designed programme, need a more detailed description."
 msgstr "L'article doit être uniquement utilisé dans un programme correctement construit, à besoin d'une description plus détaillée."
 
+<<<<<<< TREE
 #. module: sync_client
 #: view:sync.client.update_received:0
 msgid "Updates Received"
@@ -98556,3 +98557,15 @@
 #, python-format
 msgid "%s_template.xls"
 msgstr "modèle_%s.xls"
+=======
+#. module: stock_override
+#: code:addons/stock_override/stock.py:386
+#, python-format
+msgid "You are changing an External Consumption Unit, please check that source location of your stock moves are still consistent"
+msgstr "Vous avez changé d'unité de consommation externe, merci de vérifier que vos mouvements de stock sont toujours cohérents"
+
+#. module: stock_override
+#: field:stock.location,filter_partner_id2:0
+msgid "Filter location by partner"
+msgstr "Filtrer l'emplacement de stock par partenaire"
+>>>>>>> MERGE-SOURCE

=== modified file 'bin/addons/stock/stock.py'
--- bin/addons/stock/stock.py	2017-05-22 16:04:34 +0000
+++ bin/addons/stock/stock.py	2017-05-24 07:13:20 +0000
@@ -1849,6 +1849,10 @@
         """
         if context is None:
             context = {}
+
+        if context.get('ext_cu', False):
+            return context['ext_cu']
+
         if context.get('move_line', []):
             try:
                 return context['move_line'][0][2]['location_id']

=== modified file 'bin/addons/stock_override/stock.py'
--- bin/addons/stock_override/stock.py	2016-11-09 10:00:04 +0000
+++ bin/addons/stock_override/stock.py	2017-05-24 07:13:20 +0000
@@ -320,6 +320,7 @@
         'from_yml_test': fields.boolean('Only used to pass addons unit test', readonly=True, help='Never set this field to true !'),
         'address_id': fields.many2one('res.partner.address', 'Delivery address', help="Address of partner", readonly=False, states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}, domain="[('partner_id', '=', partner_id)]"),
         'partner_id2': fields.many2one('res.partner', 'Partner', required=False),
+        'ext_cu': fields.many2one('stock.location', string='Ext. C.U.'),
         'partner_type': fields.related(
             'partner_id',
             'partner_type',
@@ -376,6 +377,18 @@
                  'company_id2': lambda s,c,u,ids,ctx=None: s.pool.get('res.users').browse(c,u,u).company_id.partner_id.id,
                  }
 
+
+    def on_change_ext_cu(self, cr, uid, ids, ext_cu, context=None):
+        if self.pool.get('stock.move').search_exist(cr, uid, [('picking_id', 'in', ids)], context=context):
+            return {
+                'warning': {
+                    'title': _('Warning'),
+                    'message': _('You are changing an External Consumption Unit, please check that source location of your stock moves are still consistent'),
+                }
+            }
+        return {}
+
+
     def copy_data(self, cr, uid, id, default=None, context=None):
         if default is None:
             default = {}
@@ -1335,6 +1348,14 @@
 
         return False
 
+    def _default_is_ext_cu(self, cr, uid, context=None):
+        if not context:
+            context = {}
+        if context.get('ext_cu', False):
+            return True
+        return False
+
+
     def _get_inactive_product(self, cr, uid, ids, field_name, args, context=None):
         '''
         Fill the error message if the product of the line is inactive
@@ -1418,6 +1439,7 @@
         'from_dpo': fields.function(_get_from_dpo, fnct_search=_search_from_dpo, type='boolean', method=True, store=False, string='From DPO ?'),
         'sync_dpo': fields.boolean(string='Sync. DPO'),
         'from_wkf_line': fields.related('picking_id', 'from_wkf', type='boolean', string='Internal use: from wkf'),
+        'is_ext_cu': fields.boolean(string='Ext. CU'),
         'fake_state': fields.related('state', type='char', store=False, string="Internal use"),
         'processed_stock_move': fields.boolean(string='Processed Stock Move'),
         'inactive_product': fields.function(_get_inactive_product, method=True, type='boolean', string='Product is inactive', store=False, multi='inactive'),
@@ -1442,6 +1464,7 @@
         'inactive_product': False,
         'inactive_error': lambda *a: '',
         'has_to_be_resourced': False,
+        'is_ext_cu': _default_is_ext_cu,
     }
 
     @check_rw_warning
@@ -2065,7 +2088,7 @@
         kwargs['move'] is the current move
         '''
         move = kwargs['move']
-        return move.location_id.usage == 'supplier'
+        return move.location_id.usage == 'supplier' or (move.location_id.usage == 'customer' and move.location_id.location_category == 'consumption_unit')
 
     def _hook_cancel_assign_batch(self, cr, uid, ids, context=None):
         '''
@@ -2575,6 +2598,25 @@
             return [('id', 'in', ids)]
         return []
 
+    def _search_filter_partner_ext_cu(self, cr, uid, ids, fields, arg, context=None):
+        if not arg or not arg[0][2] or not isinstance(arg[0][2], list) or not len(arg[0][2]) == 2:
+            return []
+        if context is None:
+            context = {}
+
+        partner_id2 = arg[0][2][0]
+        ext_cu = arg[0][2][1]
+
+        domain = []
+        if not partner_id2 and not ext_cu:
+            domain = []
+        elif partner_id2:
+            domain = [('usage', '=', 'supplier')]
+        else: # ext_cu
+            domain = [('usage', '=', 'customer'), ('location_category', '=', 'consumption_unit')]
+
+        return domain
+
 
     _columns = {
         'chained_location_type': fields.selection([('none', 'None'), ('customer', 'Customer'), ('fixed', 'Fixed Location'), ('nomenclature', 'Nomenclature')],
@@ -2586,6 +2628,7 @@
                                                   "\n* Fixed Location: The chained location is taken from the next field: Chained Location if Fixed." \
                                                   "\n* Nomenclature: The chained location is taken from the options field: Chained Location is according to the nomenclature level of product."\
                                                   ),
+        'filter_partner_ext_cu': fields.function(_fake_get, method=True, type='boolean', string='Filter location by partner', fnct_search=_search_filter_partner_ext_cu),
         'chained_options_ids': fields.one2many('stock.location.chained.options', 'location_id', string='Chained options'),
         'optional_loc': fields.boolean(string='Is an optional location ?'),
         'stock_real': fields.function(_product_value, method=True, type='float', string='Real Stock', multi="stock"),

=== modified file 'bin/addons/stock_override/stock_view.xml'
--- bin/addons/stock_override/stock_view.xml	2017-05-10 12:47:14 +0000
+++ bin/addons/stock_override/stock_view.xml	2017-05-24 07:13:20 +0000
@@ -561,11 +561,13 @@
                             </script>
                         </html>
                     </group>
+                    <field name="sale_id" invisible="1" />
                     <group colspan="4" col="6">
                         <group colspan="4" col="4">
                             <field name="name" readonly="1"/>
                             <field name="origin" attrs="{'readonly': [('state', 'not in', ['draft', 'auto', 'assigned', 'confirmed'])]}"/>
-                            <field name="partner_id2" on_change="on_change_partner(partner_id2, address_id)" required="0" attrs="{'readonly': [('state', 'not in', ['draft', 'waiting', 'confirmed', 'assigned'])]}"/>
+                            <field name="partner_id2" on_change="on_change_partner(partner_id2, address_id)" required="0" attrs="{'readonly': ['|', ('state', 'not in', ['draft', 'waiting', 'confirmed', 'assigned']), ('ext_cu', '!=', False)]}"/>
+                            <field name="ext_cu" on_change="on_change_ext_cu(ext_cu)" attrs="{'readonly': ['|', '|', ('partner_id2', '!=', False), ('sale_id', '!=', False), ('purchase_id', '!=', False)]}" domain="[('location_category', '=', 'consumption_unit')]" />
                             <field name="address_id" invisible="1" />
                             <field name="backorder_id" readonly="1"/>
                             <field name="reason_type_id" widget="selection"
@@ -637,6 +639,7 @@
                                     <group colspan="2" col="4">
                                         <separator colspan="4" string="Move Information"/>
                                         <field name="from_wkf_line" invisible="1" />
+                                        <field name="is_ext_cu" invisible="1" />
                                         <field name="name" invisible="1" colspan="4"/>
                                         <field name="product_id"
                                         	context="{'location': location_id, 'prodlot_id': prodlot_id, 'compute_child': True, 'available_for_restriction': 'picking', 'search_default_not_restricted': 1}"
@@ -666,9 +669,9 @@
                                     <group colspan="2" col="2">
                                         <separator string="Locations" colspan="2"/>
                                         <field name="location_id"
-                                        	domain="[('usage', '!=', 'view'), ('usage', '=', 'supplier'), ('id', '!=', location_dest_id)]"
+                                        	domain="[('filter_partner_ext_cu', 'in', [parent.partner_id2, parent.ext_cu]), ('usage', '!=', 'view'), ('id', '!=', location_dest_id), '|', '&amp;', ('usage', '=', 'customer'), ('location_category', '=', 'consumption_unit'), ('usage', '=', 'supplier')]"
                                         	context="{'specific_rules_tree_view': True, 'prodlot_id': prodlot_id, 'product_id': product_id, 'compute_child': False}"
-                                        	attrs="{'readonly': [('from_wkf_line', '=', True)]}"
+                                        	attrs="{'readonly': ['|', ('from_wkf_line', '=', True), ('is_ext_cu', '=', True)]}"
                                         	 />
             							<field name="product_type" invisible="1"/>
                                         <field name="location_dest_id"