openerp-community-reviewer team mailing list archive

["David BEAL \(ak\)" <david.beal@xxxxxxxxxxxx>]

David BEAL (ak) has proposed merging lp:~akretion-team/carriers-deliveries/7-split-default-option-state-from-deliv-meth-dbl into lp:carriers-deliveries.

Requested reviews:
  Stock and Logistic Core Editors (stock-logistic-core-editors)

For more details, see:
https://code.launchpad.net/~akretion-team/carriers-deliveries/7-split-default-option-state-from-deliv-meth-dbl/+merge/223212

remove 'default_option' from field state in delivery.carrier.option and replace with boolean field

-- 
https://code.launchpad.net/~akretion-team/carriers-deliveries/7-split-default-option-state-from-deliv-meth-dbl/+merge/223212
Your team Stock and Logistic Core Editors is requested to review the proposed merge of lp:~akretion-team/carriers-deliveries/7-split-default-option-state-from-deliv-meth-dbl into lp:carriers-deliveries.

=== modified file 'base_delivery_carrier_label/delivery.py'
--- base_delivery_carrier_label/delivery.py	2014-03-31 08:09:39 +0000
+++ base_delivery_carrier_label/delivery.py	2014-06-16 09:45:05 +0000
@@ -32,12 +32,15 @@
             'Partner Carrier'),
         'name': fields.char(
             'Name',
+            readonly=True,
             size=64),
         'code': fields.char(
             'Code',
+            readonly=True,
             size=64),
         'description': fields.char(
             'Description',
+            readonly=True,
             help="Allow to define a more complete description "
                  "than in the name field."),
     }
@@ -57,19 +60,30 @@
     _columns = {
         'state': fields.selection(
             (('mandatory', 'Mandatory'),
-             ('default_option', 'Optional by Default'),
              ('option', 'Optional'),
              ),
             string='Option Configuration',
             help="Ensure you add and define correctly all your options or those won't "
                  "be available for the packager\n"
                  "- Mandatory: This option will be copied on carrier and cannot be removed\n"
-                 "- Optional by Default: This option will be copied but can be removed\n"
-                 "- Optional: This option can be added later by the user on the Delivery Order."),
+                 "- Optional: This option can be added by the user on the Delivery Order."),
+        'by_default': fields.boolean(
+            'Applied by Default',
+            help="By check, user can choose to apply this option "
+            "to each pickings\n using this delivery method"),
         'tmpl_option_id': fields.many2one(
             'delivery.carrier.template.option',
             string='Option', required=True, ondelete="cascade"),
         'carrier_id': fields.many2one('delivery.carrier', 'Carrier'),
+        'readonly_flag': fields.boolean(
+            'Readonly Flag',
+            help="When True, help to prevent the user to modify some fields "
+                 "option (if attribute is defined in the view)"),
+    }
+
+    _defaults = {
+        'readonly_flag': False,
+        'by_default': False,
     }
 
 

=== modified file 'base_delivery_carrier_label/delivery_view.xml'
--- base_delivery_carrier_label/delivery_view.xml	2014-03-12 17:15:06 +0000
+++ base_delivery_carrier_label/delivery_view.xml	2014-06-16 09:45:05 +0000
@@ -35,8 +35,10 @@
       <field name="model">delivery.carrier.option</field>
       <field name="arch" type="xml">
         <form string="delivery_carrier_option">
-          <field name="state"/>
-          <field name="tmpl_option_id"/>
+          <field name="readonly_flag" attrs="{'invisible': True}"/>
+          <field name="state" attrs="{'readonly': [('readonly_flag','=',True)]}"/>
+          <field name="by_default" attrs="{'invisible': [('state', '=', 'mandatory')]}"/>
+          <field name="tmpl_option_id" attrs="{'readonly': [('readonly_flag','=',True)]}"/>
           <newline/>
           <field name="description" colspan="4" readonly="True"/>
         </form>
@@ -57,7 +59,6 @@
     </record>
 
     <!-- INHERITED VIEW FOR THE OBJECT : delivery.carrier -->
-
     <record id="view_delivery_carrier_form" model="ir.ui.view">
       <field name="name">delivery_base.delivery.carrier.view_form</field>
       <field name="model">delivery.carrier</field>