Merge lp:~unifield-team/unifield-wm/uf1-0-5b1_sc_fix into lp:unifield-wm

[jftempo]

[lp:~unifield-team/unifield-wm/uf1-0-5b1_sc_fix]

2537. By Stephane Codazzi <email address hidden> on 2015-06-03

Merge US_317

2538. By Stephane Codazzi <email address hidden> on 2015-06-03

Merge US_317

Unmerged revisions

2538. By Stephane Codazzi <email address hidden> on 2015-06-03

Merge US_317

2537. By Stephane Codazzi <email address hidden> on 2015-06-03

Merge US_317

2536. By Stephane Codazzi <email address hidden> on 2015-06-03

Merge US_317

2535. By Stephane Codazzi <email address hidden> on 2015-06-03

Merge US_322

2534. By Stephane Codazzi <email address hidden> on 2015-06-03

Merge US_318

=== modified file 'msf_outgoing/msf_outgoing.py'
--- msf_outgoing/msf_outgoing.py	2015-05-29 10:28:13 +0000
+++ msf_outgoing/msf_outgoing.py	2015-06-03 14:22:12 +0000
@@ -4604,6 +4604,13 @@
                 }
         return {}
 
+    def _get_state(self, cr, uid, ids, fields, arg, context=None):
+        result = {}
+        objs = self.browse(cr, uid, ids, context=context)
+        for obj in objs:
+            result[obj.id] = obj.state
+        return result
+
     def _vals_get(self, cr, uid, ids, fields, arg, context=None):
         '''
         get functional values
@@ -4650,6 +4657,7 @@
         'weight' : fields.float(digits=(16, 2), string='Weight p.p [kg]'),
         # functions
         'move_lines': fields.function(_vals_get, method=True, type='one2many', relation='stock.move', string='Stock Moves', multi='get_vals',),
+        'fake_state': fields.function(_get_state, method=True, type='char', String='Fake state'),
         'state': fields.selection(selection=[
             ('draft', 'Draft'),
             ('assigned', 'Available'),

=== modified file 'msf_outgoing/msf_outgoing_view.xml'
--- msf_outgoing/msf_outgoing_view.xml	2015-06-02 15:04:05 +0000
+++ msf_outgoing/msf_outgoing_view.xml	2015-06-03 14:22:12 +0000
@@ -1212,7 +1212,7 @@
 							<field name="partner_id2" on_change="on_change_partner(partner_id2, address_id)"
                                                                 required="1"
 								attrs="{'readonly': [('state', 'not in', ['draft', 'waiting', 'confirmed', 'assigned'])]}" />
-							<field name="address_id" context="{'contact_display':'partner'}" />
+							<field name="address_id" context="{'contact_display':'partner'}" attrs="{'readonly': [('state', 'in', ('done', 'cancel', 'delivered'))]}" />
 							<field name="in_ref" readonly="True" />
 						</group>
 					</group>
@@ -1221,10 +1221,11 @@
 						<page string="Pack Families">
 							<field colspan="4" name="pack_family_memory_ids" nolabel="1" widget="one2many_list" readonly="True">
 								<tree string="Pack Families" colors="red: not_shipped">
+									<field name="fake_state" invisible="True" />
 									<field name="sale_order_id"/>
 									<field name="ppl_id" />
                                     <field name="description_ppl" />
-									<button name="change_description" string="Change description" icon="gtk-edit" type="object" />
+									<button name="change_description" string="Change description" icon="gtk-edit" type="object" attrs="{'invisible': [('fake_state', 'not in', ['draft', 'assigned'])]}" />
 									<field name="from_pack"/>
 									<field name="to_pack"/>
 									<field name="num_of_packs" />
@@ -1291,12 +1292,14 @@
 						    </field>
 						</page>
 						<page string="Document Information">
-							<field name="cargo_manifest_reference" />
-							<field name="date_of_departure" />
-							<field name="planned_date_of_arrival" />
-							<field name="transit_via" />
-							<field name="registration" />
-							<field name="driver_name" />
+							<group col="2" colspan="1" attrs="{'readonly': [('state', 'in', ('done', 'cancel', 'delivered'))]}">
+								<field name="cargo_manifest_reference" />
+								<field name="date_of_departure" />
+								<field name="planned_date_of_arrival" />
+								<field name="transit_via" />
+								<field name="registration" />
+								<field name="driver_name" />
+							</group>
 						</page>
 						<page string="Transport Information">
                             <group col="2" colspan="1" attrs="{'readonly': [('state', 'in', ('done', 'cancel', 'delivered'))]}">
@@ -1312,11 +1315,11 @@
                             <group col="2" colspan="1" attrs="{'readonly': [('state', 'in', ('done', 'cancel', 'delivered'))]}">
                                 <separator string="Carrier" colspan="2" />
                                 <field name="carrier_id" on_change="selected_carrier(carrier_id)" />
-                                <field name="carrier_name" attrs="{'readonly': [('carrier_id', '!=',  False)]}" />
-                                <field name="carrier_address" attrs="{'readonly': [('carrier_id', '!=',  False)]}" />
-                                <field name="carrier_phone" attrs="{'readonly': [('carrier_id', '!=',  False)]}" />
-                                <field name="carrier_email" attrs="{'readonly': [('carrier_id', '!=',  False)]}" />
-                                <field name="carrier_other" attrs="{'readonly': [('carrier_id', '!=',  False)]}" />
+                                <field name="carrier_name" attrs="{'readonly': ['|', ('carrier_id', '!=',  False), ('state', 'in', ('done', 'cancel', 'delivered'))]}" />
+                                <field name="carrier_address" attrs="{'readonly': ['|', ('carrier_id', '!=',  False), ('state', 'in', ('done', 'cancel', 'delivered'))]}" />
+                                <field name="carrier_phone" attrs="{'readonly': ['|', ('carrier_id', '!=',  False), ('state', 'in', ('done', 'cancel', 'delivered'))]}" />
+                                <field name="carrier_email" attrs="{'readonly': ['|', ('carrier_id', '!=',  False), ('state', 'in', ('done', 'cancel', 'delivered'))]}" />
+                                <field name="carrier_other" attrs="{'readonly': ['|', ('carrier_id', '!=',  False), ('state', 'in', ('done', 'cancel', 'delivered'))]}" />
 								<field name="carrier_date" />
 							</group>
                             <group col="2" colspan="1" attrs="{'readonly': [('state', 'in', ('done', 'cancel', 'delivered'))]}">