Amit Bhavsar (Open ERP) has proposed merging 
lp:~openerp-dev/openobject-addons/trunk-usability-products_usability-amb into 
lp:~openerp-dev/openobject-addons/trunk-usability.

Requested reviews:
  Amit (Open ERP) (apa-tiny)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-usability-products_usability-amb/+merge/63111
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-usability-products_usability-amb/+merge/63111
Your team OpenERP R&D Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-usability.
=== modified file 'product/product_view.xml'
--- product/product_view.xml	2011-05-26 08:59:36 +0000
+++ product/product_view.xml	2011-06-01 12:46:00 +0000
@@ -19,7 +19,7 @@
                    <field name="name"/>
                    <field name="categ_id" widget="selection" operator="child_of" groups="base.group_extended"/>
                    <newline/>
-                   <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                   <group expand="0" string="Context..." groups="base.group_extended">
                        <field name="pricelist_id" widget="selection" context="{'pricelist': self}" />
                    </group>
                    <newline/>

=== modified file 'stock/product.py'
--- stock/product.py	2011-04-08 13:32:12 +0000
+++ stock/product.py	2011-06-01 12:46:00 +0000
@@ -334,6 +334,7 @@
         'track_incoming': fields.boolean('Track Incoming Lots', help="Forces to specify a Production Lot for all moves containing this product and coming from a Supplier Location"),
         'track_outgoing': fields.boolean('Track Outgoing Lots', help="Forces to specify a Production Lot for all moves containing this product and going to a Customer Location"),
         'location_id': fields.dummy(string='Stock Location', relation='stock.location', type='many2one'),
+        'warehouse_id': fields.dummy(string='Stock on Warehouse', relation='stock.location', type='many2one'),
         'valuation':fields.selection([('manual_periodic', 'Periodical (manual)'),
                                         ('real_time','Real Time (automated)'),], 'Inventory Valuation',
                                         help="If real-time valuation is enabled for a product, the system will automatically write journal entries corresponding to stock moves." \

=== modified file 'stock/product_view.xml'
--- stock/product_view.xml	2011-03-22 12:48:12 +0000
+++ stock/product_view.xml	2011-06-01 12:46:00 +0000
@@ -11,6 +11,8 @@
                    <field name="pricelist_id" position="before">
                        <field name="location_id" context="{'location': self}"/>
                        <separator orientation="vertical"/>
+					   <field name="warehouse_id" context="{'location': self}"/>
+					   <separator orientation="vertical"/>
                    </field>
             </field>
         </record>

_______________________________________________
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

Reply via email to