← Back to team overview

openerp-community-reviewer team mailing list archive

[Merge] lp:~akretion-team/carriers-deliveries/7.0-add-description-field-dbl into lp:carriers-deliveries

 

David BEAL has proposed merging lp:~akretion-team/carriers-deliveries/7.0-add-description-field-dbl into lp:carriers-deliveries.

Requested reviews:
  Yannick Vaucher @ Camptocamp (yvaucher-c2c)

For more details, see:
https://code.launchpad.net/~akretion-team/carriers-deliveries/7.0-add-description-field-dbl/+merge/209728

add description field to carrier option
-- 
https://code.launchpad.net/~akretion-team/carriers-deliveries/7.0-add-description-field-dbl/+merge/209728
Your team Stock and Logistic Core Editors is subscribed to branch lp:carriers-deliveries.
=== modified file 'base_delivery_carrier_label/delivery.py'
--- base_delivery_carrier_label/delivery.py	2013-11-27 06:54:16 +0000
+++ base_delivery_carrier_label/delivery.py	2014-03-06 17:00:55 +0000
@@ -27,9 +27,19 @@
     _description = 'Delivery carrier template option'
 
     _columns = {
-        'partner_id': fields.many2one('res.partner', 'Partner Carrier'),
-        'name': fields.char('Name', size=64),
-        'code': fields.char('Code', size=64),
+        'partner_id': fields.many2one(
+            'res.partner',
+            'Partner Carrier'),
+        'name': fields.char(
+            'Name',
+            size=64),
+        'code': fields.char(
+            'Code',
+            size=64),
+        'description': fields.char(
+            'Description',
+            help="Allow to define a more complete description "
+                 "than in the name field."),
     }
 
 

=== modified file 'base_delivery_carrier_label/delivery_view.xml'
--- base_delivery_carrier_label/delivery_view.xml	2013-11-26 16:51:04 +0000
+++ base_delivery_carrier_label/delivery_view.xml	2014-03-06 17:00:55 +0000
@@ -11,6 +11,8 @@
           <field name="partner_id" />
           <field name="code"/>
           <field name="name"/>
+          <newline/>
+          <field name="description" colspan="4"/>
         </form>
       </field>
     </record>
@@ -35,6 +37,7 @@
         <form string="delivery_carrier_option">
           <field name="state"/>
           <field name="tmpl_option_id"/>
+          <field name="description" colspan="4" readonly="True"/>
         </form>
       </field>
     </record>


Follow ups