Merge lp:~jfb-tempo-consulting/unifield-server/us-2270 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_outgoing/msf_outgoing.py'
--- bin/addons/msf_outgoing/msf_outgoing.py	2018-07-17 12:45:33 +0000
+++ bin/addons/msf_outgoing/msf_outgoing.py	2018-08-07 08:48:35 +0000
@@ -303,7 +303,7 @@
                 'shipment_actual_date': fields.datetime(string='Actual Ship Date', readonly=True,),
                 'transport_type': fields.selection(TRANSPORT_TYPE,
                                                    string="Transport Type", readonly=False),
-                'address_id': fields.many2one('res.partner.address', 'Address', help="Address of customer"),
+                'address_id': fields.many2one('res.partner.address', 'Address', help="Address of customer", required=1),
                 'sequence_id': fields.many2one('ir.sequence', 'Shipment Sequence', help="This field contains the information related to the numbering of the shipment.", ondelete='cascade'),
                 # cargo manifest things
                 'cargo_manifest_reference': fields.char(string='Cargo Manifest Reference', size=1024,),
@@ -556,6 +556,12 @@
             )
 
         for shipment in self.browse(cr, uid, ids, context=context):
+            if not shipment.address_id.id:
+                raise osv.except_osv(
+                    _('Processing Error'),
+                    _('Please fill the Address field on %s') % (shipment.name),
+                )
+
             # search for an existing shipment saved as draft ... :
             wiz_ids = self.pool.get('shipment.processor').search(cr, uid, [('shipment_id', '=', shipment.id), ('draft', '=', True)], context=context)
             if wiz_ids:
@@ -1823,25 +1829,80 @@
 
         if not partner_id:
             v.update({'address_id': False})
-        else:
+            address_id = False
+        elif address_id:
             d.update({'address_id': [('partner_id', '=', partner_id)]})
 
-
+        addr = False
         if address_id:
             addr = self.pool.get('res.partner.address').browse(cr, uid, address_id, context=context)
 
-        if not address_id or addr.partner_id.id != partner_id:
+        if partner_id and (not address_id or (addr and addr.partner_id.id != partner_id)):
             addr = self.pool.get('res.partner').address_get(cr, uid, partner_id, ['delivery', 'default'])
             if not addr.get('delivery'):
                 addr = addr.get('default')
             else:
                 addr = addr.get('delivery')
 
+            address_id = addr
+
             v.update({'address_id': addr})
 
-
-        return {'value': v,
-                'domain': d}
+        if address_id:
+            error = self.on_change_address_id(cr, uid, ids, address_id, context=context)
+            if error:
+                error['value'] = {'address_id': False}
+                error['domain'] = d
+                return error
+
+        warning = {
+            'title': _('Warning'),
+            'message': _('The field you are modifying may impact the shipment mechanism, please check the correct process.'),
+        }
+
+        return {'value': v, 'domain': d, 'warning': warning}
+
+    def on_change_shipper_name(self, cr, uid, ids, shipper_name):
+        return {
+            'value': {'shipper_name': shipper_name},
+            'warning': {
+                'title': _('Warning'),
+                'message': _('The field you are modifying may impact the shipment mechanism, please check the correct process.'),
+            }
+        }
+
+    def on_change_consignee_name(self, cr, uid, ids, consignee_name, context=None):
+        if context is None:
+            context = {}
+
+        message = _('The field you are modifying may impact the shipment mechanism, please check the correct process.')
+        if ids and self.search_exist(cr, uid, [('id', '!=', ids[0]), ('consignee_name', '=', consignee_name),
+                                               ('state', '=', 'draft')], context=context):
+            consignee_name = self.read(cr, uid, ids[0], ['consignee_name'], context=context)['consignee_name']
+            message = _('Another Draft Shipment exists with this Consignee.')
+
+        return {
+            'value': {'consignee_name': consignee_name},
+            'warning': {
+                'title': _('Warning'),
+                'message': message,
+            }
+        }
+
+    def on_change_address_id(self, cr, uid, ids, address_id, context=None):
+        other_ids = self.search(cr, uid, [('id', 'not in', ids), ('state', '=', 'draft'), ('address_id', '=', address_id)], context=context)
+        if other_ids:
+            other = []
+            for ship in self.read(cr, uid, other_ids, ['name']):
+                other.append(ship['name'])
+            return {
+                'value': {'address_id': False},
+                'warning': {
+                    'title': _('Warning'),
+                    'message': _('You can only have one draft shipment for a given address, please check %s') % (', '.join(other))
+                }
+            }
+        return {}
 
     _columns = {
         'pack_family_memory_ids': fields.one2many('pack.family.memory', 'shipment_id', string='Memory Families'),
@@ -2978,8 +3039,12 @@
                             shipment_ids = []
 
                 # only one 'draft' shipment should be available
-                assert len(shipment_ids) in (0, 1), 'Only one draft shipment should be available for a given address at a time - %s' % len(shipment_ids)
-
+                if len(shipment_ids) > 1:
+                    other = shipment_obj.read(cr, uid, shipment_ids, ['name'], context=context)
+                    raise osv.except_osv(
+                        _('Error'),
+                        _('You can only have one draft shipment for a given address, please check %s') % ', '.join(x['name'] for x in other),
+                    )
                 # get rts of corresponding sale order
                 sale_id = self.read(cr, uid, [new_packing_id], ['sale_id'], context=context)
                 sale_id = sale_id[0]['sale_id']

=== modified file 'bin/addons/msf_outgoing/msf_outgoing_view.xml'
--- bin/addons/msf_outgoing/msf_outgoing_view.xml	2018-03-23 10:28:59 +0000
+++ bin/addons/msf_outgoing/msf_outgoing_view.xml	2018-08-07 08:48:35 +0000
@@ -1243,7 +1243,9 @@
 								attrs="{'readonly': [('state', 'not in', ['draft', 'waiting', 'confirmed', 'assigned'])]}" />
 							<field name="address_id" context="{'contact_display':'partner'}"
 								   domain="[('partner_id', '=', partner_id2)]"
-								   attrs="{'readonly': ['|', ('partner_id2', '=', False), ('state', 'in', ('done', 'cancel', 'delivered'))]}" />
+								   attrs="{'readonly': ['|', ('partner_id2', '=', False), ('state', 'in', ('done', 'cancel', 'delivered'))]}"
+                                   on_change="on_change_address_id(address_id)"
+                                   />
                             <field name="in_ref" readonly="True" />
                             <field name="partner_type" invisible="True" readonly="True" />
 						</group>
@@ -1340,7 +1342,7 @@
 						<page string="Transport Information">
                             <group col="2" colspan="1" attrs="{'readonly': [('state', 'in', ('done', 'cancel', 'delivered'))]}">
 								<separator string="Shipper" colspan="2" />
-                                <field name="shipper_name" />
+                                <field name="shipper_name" on_change="on_change_shipper_name(shipper_name)" />
                                 <field name="shipper_contact" />
 								<field name="shipper_address" />
 								<field name="shipper_phone" />
@@ -1360,7 +1362,7 @@
 							</group>
                             <group col="2" colspan="1" attrs="{'readonly': [('state', 'in', ('done', 'cancel', 'delivered'))]}">
 								<separator string="Consignee" colspan="2" />
-                                <field name="consignee_name" />
+                                <field name="consignee_name" on_change="on_change_consignee_name(consignee_name)" />
                                 <field name="consignee_contact" />
 								<field name="consignee_address" />
 								<field name="consignee_phone" />

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2018-07-25 16:06:03 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2018-08-07 08:48:35 +0000
@@ -82659,6 +82659,12 @@
 msgstr "Erreur de traitement"
 
 #. module: msf_outgoing
+#: code:addons/msf_outgoing/msf_outgoing.py:562
+#, python-format
+msgid "Please fill the Address field on %s"
+msgstr "Veuillez remplir le champ Adresse sur %s"
+
+#. module: msf_outgoing
 #: model:process.transition,name:msf_outgoing.process_transition_draft_pick_draft_done
 #: model:process.transition,name:msf_outgoing.process_transition_draft_ship_draft_done
 #: model:process.transition,note:msf_outgoing.process_transition_draft_pick_draft_done
@@ -101379,6 +101385,7 @@
 #, python-format
 msgid "You can't change a payment method used at least in one employee"
 msgstr "Vous ne pouvez pas modifier une méthode de paiement utilisée sur au moins un employé"
+<<<<<<< TREE
 
 #. module: msf_doc_import
 #: code:addons/msf_doc_import/check_line.py:238
@@ -101386,3 +101393,25 @@
 #, python-format
 msgid "The Location \"%s\" on line level is not the same as the Location \"%s\" on header level."
 msgstr "La Zone \"%s\" au niveau de la ligne n'est pas la même que la Zone \"%s\" au niveau de l'entête."
+=======
+
+#. module: msf_outgoing
+#: code:addons/msf_outgoing/msf_outgoing.py:1865
+#, python-format
+msgid "Another Draft Shipment exists with this Consignee."
+msgstr "Une autre Expédition en Brouillon existe avec ce Destinataire"
+
+#. module: msf_outgoing
+#: code:addons/msf_outgoing/msf_outgoing.py:1843
+#: code:addons/msf_outgoing/msf_outgoing.py:1853
+#: code:addons/msf_outgoing/msf_outgoing.py:1861
+#, python-format
+msgid "The field you are modifying may impact the shipment mechanism, please check the correct process."
+msgstr "Le champ que vous modifiez pourrait avoir un impact sur le mécanisme d'expédition, veuillez vérifier le bon processus."
+
+#. module: msf_outgoing
+#: code:addons/msf_outgoing/msf_outgoing.py:1896
+#, python-format
+msgid "You can only have one draft shipment for a given address, please check %s"
+msgstr "Vous ne pouvez avoir qu'une seule Expédition en brouillon pour la même adresse, veuillez vérifier %s "
+>>>>>>> MERGE-SOURCE