Merge lp:~openerp-dev/openobject-addons/trunk-bug-1122461-cha into lp:openobject-addons

[Ajay Chauhan(OpenERP)]

Hello,

  I have solved bug: https://bugs.launchpad.net/openobject-addons/+bug/1122461
The issue is that is is possible to edit packs even when stock move hase been done.

Thanks,
Ajay Chauhan(CHA)

Unmerged revisions

8687. By Ajay Chauhan(OpenERP) on 2013-04-19

[FIX] stock: solve issue that packaging edition can be done when product is recieved

=== modified file 'stock/stock.py'
--- stock/stock.py	2013-04-15 10:23:49 +0000
+++ stock/stock.py	2013-04-19 12:55:30 +0000
@@ -1588,7 +1588,7 @@
         return True
 
     _columns = {
-        'name': fields.char('Description', required=True, select=True),
+        'name': fields.char('Description', required=True, select=True, states={'done': [('readonly', True)]}),
         'priority': fields.selection([('0', 'Not urgent'), ('1', 'Urgent')], 'Priority'),
         'create_date': fields.datetime('Creation Date', readonly=True, select=True),
         'date': fields.datetime('Date', required=True, select=True, help="Move date: scheduled date until move is done, then date of actual move processing", states={'done': [('readonly', True)]}),
@@ -1640,11 +1640,11 @@
         'price_currency_id': fields.many2one('res.currency', 'Currency for average price', help="Technical field used to record the currency chosen by the user during a picking confirmation (when average price costing method is used)"),
         'company_id': fields.many2one('res.company', 'Company', required=True, select=True),
         'backorder_id': fields.related('picking_id','backorder_id',type='many2one', relation="stock.picking", string="Back Order of", select=True),
-        'origin': fields.related('picking_id','origin',type='char', size=64, relation="stock.picking", string="Source", store=True),
+        'origin': fields.related('picking_id','origin',type='char', size=64, relation="stock.picking", string="Source", store=True, states={'done': [('readonly', True)]}),
 
         # used for colors in tree views:
         'scrapped': fields.related('location_dest_id','scrap_location',type='boolean',relation='stock.location',string='Scrapped', readonly=True),
-        'type': fields.related('picking_id', 'type', type='selection', selection=[('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal')], string='Shipping Type'),
+        'type': fields.related('picking_id', 'type', type='selection', selection=[('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal')], string='Shipping Type', states={'done': [('readonly', True)]}),
     }
 
     def _check_location(self, cr, uid, ids, context=None):
 
=== modified file 'stock/stock_view.xml'
--- stock/stock_view.xml	2013-03-21 09:37:16 +0000
+++ stock/stock_view.xml	2013-04-19 12:55:30 +0000
@@ -1151,12 +1151,12 @@
                     <field name="tracking_id" groups="stock.group_tracking_lot"/>
                     <button name="setlast_tracking" string="Put in current pack" type="object"
                         groups="product.group_stock_packaging"
-                        icon="terp-accessories-archiver" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
-                        states="draft,assigned,confirmed,done"/>
+                        icon="terp-accessories-archiver"
+                        states="draft,assigned,confirmed"/>
                     <button name="%(split_into)d" string="Put in a new pack" type="action"
                         groups="product.group_stock_packaging"
                         icon="terp-accessories-archiver+"
-                        states="draft,assigned,confirmed,done"/>
+                        states="draft,assigned,confirmed"/>
                     <field name="location_id" groups="stock.group_locations"/>
                     <field name="location_dest_id" groups="stock.group_locations"/>
                     <field name="date" groups="base.group_no_one"/>