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

[jftempo]

=== modified file 'bin/addons/msf_outgoing/msf_outgoing.py'
--- bin/addons/msf_outgoing/msf_outgoing.py	2016-03-02 15:57:47 +0000
+++ bin/addons/msf_outgoing/msf_outgoing.py	2016-03-14 10:05:23 +0000
@@ -26,6 +26,7 @@
 
 from order_types.stock import check_cp_rw
 from msf_order_date import TRANSPORT_TYPE
+from msf_partner import PARTNER_TYPE
 
 from dateutil.relativedelta import relativedelta
 import decimal_precision as dp
@@ -245,6 +246,33 @@
 ''' % (args[0][1], args[0][2]))
         return [('id', 'in', [x[0] for x in cr.fetchall()])]
 
+    def _get_is_company(self, cr, uid, ids, field_name, args, context=None):
+        """
+        Return True if the partner_id2 of the shipment is the same partner
+        as the partner linked to res.company of the res.users
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls this method
+        :param ids: List of ID of shipment to update
+        :param field_name: List of names of fields to update
+        :param args: Extra parametrer
+        :param context: Context of the call
+        :return: A dictionary with shipment ID as keys and True or False a values
+        """
+        user_obj = self.pool.get('res.users')
+
+        if context is None:
+            context = {}
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        res = {}
+        cmp_partner_id = user_obj.browse(cr, uid, uid, context=context).company_id.partner_id.id
+        for ship in self.browse(cr, uid, ids, context=context):
+            res[ship.id] = ship.partner_id2.id == cmp_partner_id
+
+        return res
+
     _columns = {'name': fields.char(string='Reference', size=1024),
                 'date': fields.datetime(string='Creation Date'),
                 'shipment_expected_date': fields.datetime(string='Expected Ship Date'),
@@ -290,6 +318,7 @@
                 # functions
                 'partner_id': fields.related('address_id', 'partner_id', type='many2one', relation='res.partner', string='Customer', store=True),
                 'partner_id2': fields.many2one('res.partner', string='Customer', required=False),
+                'partner_type': fields.related('partner_id', 'partner_type', type='selection', selection=PARTNER_TYPE, readonly=True),
                 'total_amount': fields.function(_vals_get, method=True, type='float', string='Total Amount', multi='get_vals',),
                 'currency_id': fields.function(_vals_get, method=True, type='many2one', relation='res.currency', string='Currency', multi='get_vals',),
                 'num_of_packs': fields.function(_vals_get, method=True, fnct_search=_packs_search, type='integer', string='Number of Packs', multi='get_vals_X',),  # old_multi ship_vals
@@ -315,7 +344,16 @@
                     string='Associated Packing List',
                 ),
                 'in_ref': fields.char(string='IN Reference', size=1024),
-                }
+                'is_company': fields.function(
+                    _get_is_company,
+                    method=True,
+                    type='boolean',
+                    string='Is Company ?',
+                    store={
+                        'shipment': (lambda self, cr, uid, ids, c={}: ids, ['partner_id2'], 10),
+                    }
+                ),
+            }
 
     def _get_sequence(self, cr, uid, context=None):
         ir_id = self.pool.get('ir.model.data')._get_id(cr, uid, 'msf_outgoing', 'seq_shipment')

=== modified file 'bin/addons/msf_outgoing/msf_outgoing_view.xml'
--- bin/addons/msf_outgoing/msf_outgoing_view.xml	2016-01-14 15:38:57 +0000
+++ bin/addons/msf_outgoing/msf_outgoing_view.xml	2016-03-14 10:05:23 +0000
@@ -1222,7 +1222,8 @@
 							<field name="address_id" context="{'contact_display':'partner'}"
 								   domain="[('partner_id', '=', partner_id2)]"
 								   attrs="{'readonly': ['|', ('partner_id2', '=', False), ('state', 'in', ('done', 'cancel', 'delivered'))]}" />
-							<field name="in_ref" readonly="True" />
+                            <field name="in_ref" readonly="True" />
+                            <field name="partner_type" invisible="True" readonly="True" />
 						</group>
 					</group>
 
@@ -1286,13 +1287,17 @@
 							</field>
 							<group col="12" colspan="4">
 								<field name="state" readonly="1"/>
+								<field name="is_company" invisible="1" />
                                 <button name="return_packs" states="draft" string="Return Packs to Stock..." type="object" icon="gtk-undo" context="{'from_button': True}" />
                                 <button name="create_shipment" states="draft" string="Create Shipment..." type="object" icon="gtk-add" context="{'from_button': True}" />
 								<button name="action_cancel" states="packed" string="Cancel Shipment" type="object" icon="gtk-cancel" />
 								<button name="ship" states="packed" string="Ship" type="object" icon="gtk-redo" />
                                 <button name="return_packs_from_shipment" states="shipped" string="Return Packs from Shipment..." type="object" icon="gtk-undo" context="{'from_button': True}" />
                                 <button name="validate" states="shipped" string="Validate" type="object" icon="gtk-apply" context="{'from_button': True}" />
-								<button name="set_delivered" icon="gtk-apply" type="object" string="Validate Delivery" attrs="{'invisible': [('state', '!=', 'done')]}"
+                                <button name="set_delivered" icon="gtk-apply" type="object" string="Validate Delivery"
+                                        attrs="{'invisible': ['|', '&amp;', ('is_company', '=', False), ('partner_type', 'in', ['internal', 'intermission', 'section']), ('state', '!=', 'done')]}" />
+                                <button name="set_delivered" icon="gtk-apply" type="object" string="Validate Delivery"
+                                        attrs="{'invisible': ['|', '|', ('is_company', '=', True), ('partner_type', 'not in', ['internal', 'intermission', 'section']), ('state', '!=', 'done')]}"
 								confirm="Synchronization engine should confirm the delivery at the project reception, are you sure?"/>
 							</group>
 						</page>

=== modified file 'bin/addons/stock_override/stock.py'
--- bin/addons/stock_override/stock.py	2016-02-19 14:17:49 +0000
+++ bin/addons/stock_override/stock.py	2016-03-14 10:05:23 +0000
@@ -36,6 +36,8 @@
 from order_types.stock import check_cp_rw
 from order_types.stock import check_rw_warning
 
+from msf_partner import PARTNER_TYPE
+
 
 #----------------------------------------------------------
 # Procurement Order
@@ -269,6 +271,32 @@
 
         return res
 
+    def _get_is_company(self, cr, uid, ids, field_name, args, context=None):
+        """
+        Return True if the partner_id2 of the stock.picking is the same partner
+        as the partner linked to res.company of the res.users
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls this method
+        :param ids: List of ID of stock.picking to update
+        :param field_name: List of names of fields to update
+        :param args: Extra parametrer
+        :param context: Context of the call
+        :return: A dictionary with stock.picking ID as keys and True or False a values
+        """
+        user_obj = self.pool.get('res.users')
+
+        if context is None:
+            context = {}
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        res = {}
+        cmp_partner_id = user_obj.browse(cr, uid, uid, context=context).company_id.partner_id.id
+        for pick in self.browse(cr, uid, ids, context=context):
+            res[pick.id] = pick.partner_id2.id == cmp_partner_id
+
+        return res
 
     _columns = {
         'state': fields.selection([
@@ -291,6 +319,13 @@
         '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),
+        'partner_type': fields.related(
+            'partner_id',
+            'partner_type',
+            type='selection',
+            selection=PARTNER_TYPE,
+            readonly=True,
+        ),
         'from_wkf': fields.boolean('From wkf'),
         'from_wkf_sourcing': fields.boolean('From wkf sourcing'),
         'update_version_from_in_stock_picking': fields.integer(string='Update version following IN processing'),
@@ -319,6 +354,15 @@
             store=False,
         ),
         'company_id2': fields.many2one('res.partner', string='Company', required=True),
+        'is_company': fields.function(
+            _get_is_company,
+            method=True,
+            type='boolean',
+            string='Is Company ?',
+            store={
+                'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['partner_id2'], 10),
+            }
+        )
     }
 
     _defaults = {'from_yml_test': lambda *a: False,

=== modified file 'bin/addons/stock_override/stock_view.xml'
--- bin/addons/stock_override/stock_view.xml	2016-02-09 14:13:56 +0000
+++ bin/addons/stock_override/stock_view.xml	2016-03-14 10:05:23 +0000
@@ -831,8 +831,9 @@
                 <form string="Delivery Orders">
                     <group col="6" colspan="4">
                         <group colspan="4" col="4">
+                            <field name="partner_type" invisible="True" readonly="True" />
                             <field name="name" readonly="1"/>
-                            <field name="origin" readonly="1"/>
+                            <field name="origin" readonly="1" />
                             <field name="partner_id2"
                                 on_change="on_change_partner(partner_id2, address_id)"
                                 required="1"
@@ -995,7 +996,30 @@
                                 <field name="state" invisible="True"/>
                                 <field name="delivered" invisible="True"/>
                                 <field name="state_hidden"/>
-                                <button name="set_delivered" icon="gtk-apply" type="object" string="Confirm Delivery" attrs="{'invisible': ['|', '|', '|', ('type', '!=', 'out'), ('subtype', '!=', 'standard'), ('state', '!=', 'done'), ('delivered', '=', True)]}"/>
+                                <field name="is_company" invisible="1" />
+                                <button name="set_delivered"
+                                        icon="gtk-apply"
+                                        type="object"
+                                        string="Confirm Delivery"
+                                        attrs="{'invisible': ['|', '|', '|', '|', '|',
+                                                              ('type', '!=', 'out'), ('subtype', '!=', 'standard'),
+                                                              ('state', '!=', 'done'), ('delivered', '=', True),
+                                                              ('partner_type', 'not in', ['internal', 'intermission', 'section']),
+                                                              ('is_company', '=', True),
+                                                              ]}"
+                                        confirm="Synchronization engine should confirm the delivery at the project reception, are you sure?"
+                                />
+                                <button name="set_delivered"
+                                        icon="gtk-apply"
+                                        type="object"
+                                        string="Confirm Delivery"
+                                        attrs="{'invisible': ['|', '|', '|', '|',
+                                                              ('type', '!=', 'out'), ('subtype', '!=', 'standard'),
+                                                              ('state', '!=', 'done'), ('delivered', '=', True),
+                                                              '&amp;',
+                                                              ('partner_type', 'in', ['internal', 'intermission', 'section']),
+                                                              ('is_company', '=', False),
+                                                              ]}"/>
                                 <field name="cross_docking_ok" invisible="1"/>
                                 <!--<button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>-->
                                 <button name="call_cancel_wizard" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel" type="object"  context="{'from_button': True}" />