Amit Patel (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons18-warehouse-apa into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons18-warehouse-apa/+merge/130949
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons18-warehouse-apa/+merge/130949
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-addons18-warehouse-apa.
=== modified file 'procurement/procurement.py'
--- procurement/procurement.py 2012-10-10 20:38:18 +0000
+++ procurement/procurement.py 2012-10-23 08:42:43 +0000
@@ -561,10 +561,10 @@
'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True),
'product_min_qty': fields.float('Minimum Quantity', required=True,
help="When the virtual stock goes below the Min Quantity specified for this field, OpenERP generates "\
- "a procurement to bring the virtual stock to the Max Quantity."),
+ "a procurement to bring the Forecasted Quantity to the Max Quantity."),
'product_max_qty': fields.float('Maximum Quantity', required=True,
help="When the virtual stock goes below the Min Quantity, OpenERP generates "\
- "a procurement to bring the virtual stock to the Quantity specified as Max Quantity."),
+ "a procurement to bring the Forecasted Quantity to the Quantity specified as Max Quantity."),
'qty_multiple': fields.integer('Qty Multiple', required=True,
help="The procurement quantity will be rounded up to this multiple."),
'procurement_id': fields.many2one('procurement.order', 'Latest procurement', ondelete="set null"),
=== modified file 'stock/stock.py'
--- stock/stock.py 2012-10-03 04:42:56 +0000
+++ stock/stock.py 2012-10-23 08:42:43 +0000
@@ -629,7 +629,7 @@
'name': fields.char('Reference', size=64, select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
'origin': fields.char('Source', size=64, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="Reference of the document", select=True),
'backorder_id': fields.many2one('stock.picking', 'Back Order of', states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="If this shipment was split, then this field links to the shipment which contains the already processed part.", select=True),
- 'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal')], 'Shipping Type', required=True, select=True, readonly=True, help="Shipping type specify, goods coming in or going out."),
+ 'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal')], 'Shipping Type', required=True, select=True, help="Shipping type specify, goods coming in or going out."),
'note': fields.text('Notes', states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
'stock_journal_id': fields.many2one('stock.journal','Stock Journal', select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
'location_id': fields.many2one('stock.location', 'Location', states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="Keep empty if you produce at the location where the finished products are needed." \
=== modified file 'stock/stock_view.xml'
--- stock/stock_view.xml 2012-10-22 17:35:20 +0000
+++ stock/stock_view.xml 2012-10-23 08:42:43 +0000
@@ -540,7 +540,7 @@
</group>
<group string="Chained Locations">
<field name="chained_location_type"/>
- <field name="chained_location_id" attrs="{'required':[('chained_location_type','=','fixed')]}"/>
+ <field name="chained_location_id" attrs="{'required':[('chained_location_type','=','fixed')],'invisible':[('chained_location_type','in',['none','customer'])]}"/>
<field name="chained_auto_packing"/>
<field name="chained_delay"/>
<field name="chained_journal_id"/>
@@ -551,9 +551,9 @@
<field name="posx"/>
<field name="posy"/>
<field name="posz"/>
- </group><group string="Accounting Information">
- <field name="valuation_in_account_id" attrs="{'readonly':[('usage','not in',('inventory','production'))]}"/>
- <field name="valuation_out_account_id" attrs="{'readonly':[('usage','not in',('inventory','production'))]}"/>
+ </group><group string="Accounting Information" attrs="{'invisible':[('usage','not in',('inventory','production'))]}">
+ <field name="valuation_in_account_id"/>
+ <field name="valuation_out_account_id"/>
</group>
</group>
<separator string="Additional Information"/>
@@ -782,7 +782,7 @@
<group>
<group>
<field name="move_type"/>
- <field name="type" groups="base.group_no_one"/>
+ <field name="type" invisible="1"/>
<field name="auto_picking" groups="base.group_user"/>
</group>
<group>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
