openerp-wms-expert team mailing list archive

[Numérigraphe <informatique@xxxxxxxxxxxxxxxx>]

You have been requested to review the proposed merge of lp:~numerigraphe/openobject-addons/trunk-delivery-shipping-unit into lp:openobject-addons.

For more details, see:
https://code.launchpad.net/~numerigraphe/openobject-addons/trunk-delivery-shipping-unit/+merge/87784

The module delivery lets users key in the number of boxes for a delivery.
This branch extends this to other types of shipping units using an additional type field.
Note that this uses the same types of shipping unit as the packaging of a single stock move, but applied to the whole packing instead.

-- 
https://code.launchpad.net/~numerigraphe/openobject-addons/trunk-delivery-shipping-unit/+merge/87784
Your team OpenERP WMS Expert is requested to review the proposed merge of lp:~numerigraphe/openobject-addons/trunk-delivery-shipping-unit into lp:openobject-addons.

=== modified file 'delivery/delivery_view.xml'
--- delivery/delivery_view.xml	2011-12-19 16:54:40 +0000
+++ delivery/delivery_view.xml	2012-01-06 17:20:31 +0000
@@ -193,6 +193,7 @@
                     <field name="carrier_id"/>
                     <field name="carrier_tracking_ref" groups="base.group_extended"/>
                     <field name="number_of_packages" groups="base.group_extended"/>
+                    <field name="ul_id" groups="base.group_extended"/>
                     <field name="weight"/>
                     <field name="weight_net"/>
                 </field>

=== modified file 'delivery/i18n/delivery.pot'
--- delivery/i18n/delivery.pot	2011-12-22 18:55:39 +0000
+++ delivery/i18n/delivery.pot	2012-01-06 17:20:31 +0000
@@ -299,7 +299,7 @@
 
 #. module: delivery
 #: field:stock.picking,number_of_packages:0
-msgid "Number of Packages"
+msgid "Number of Shipping Units"
 msgstr ""
 
 #. module: delivery

=== modified file 'delivery/stock.py'
--- delivery/stock.py	2011-12-21 18:11:49 +0000
+++ delivery/stock.py	2012-01-06 17:20:31 +0000
@@ -65,7 +65,9 @@
                  'stock.move': (_get_picking_line, ['product_id','product_qty','product_uom','product_uos_qty'], 20),
                  }),
         'carrier_tracking_ref': fields.char('Carrier Tracking Ref', size=32),
-        'number_of_packages': fields.integer('Number of Packages'),
+        # XXX This should be renamed nb_uls
+        'number_of_packages': fields.integer('Number of Shipping Units'),
+        'ul_id' : fields.many2one('product.ul', 'Type of Shipping Unit', required=True),
         }
 
     def _prepare_shipping_invoice_line(self, cr, uid, picking, invoice, context=None):