[MERGE] stock: mutiplr usability and stock move groupby fix

Merge lp:~openerp-dev/openobject-addons/trunk-addons13-warehouse-apa-warehouse-kbh

bzr revid: jam@tinyerp.com-20121004102931-71eiwsr8beuatvvz
This commit is contained in:
Jigar Amin
2012-10-04 15:59:31 +05:30
3 changed files with 4 additions and 3 deletions
+1
View File
@@ -1037,6 +1037,7 @@
<record model="ir.actions.act_window" id="product_open_bom">
<field name="context">{'default_product_id': active_id, 'search_default_product_id': active_id}</field>
<field name="name">Bill of Materials</field>
<field name="domain">[('bom_id','=',False)]</field>
<field name="res_model">mrp.bom</field>
</record>
+2 -2
View File
@@ -135,7 +135,7 @@
<field name="uom_po_id"/>
</group>
</group>
<separator string="Notes for Suppliers"/>
<separator string="Description for Suppliers"/>
<field name="description_purchase" placeholder="This note will be displayed on requests for quotation..."/>
</page>
<page string="Inventory" groups="base.group_user">
@@ -197,7 +197,7 @@
<field name="name"/>
</form>
</field>
<separator string="Notes on Quotations"/>
<separator string="Description for Quotations"/>
<field name="description_sale" placeholder="note to be displayed on quotations..."/>
</page>
</notebook>
+1 -1
View File
@@ -1119,7 +1119,7 @@
<field name="model">stock.move</field>
<field eval="8" name="priority"/>
<field name="arch" type="xml">
<tree colors="grey:state == 'cancel';red:(state not in ('cancel','done')) and date > current_date" string="Moves" editable="top">
<tree colors="grey:state == 'cancel';red:(state not in ('cancel','done')) and date > current_date" string="Moves">
<field name="name"/>
<field name="picking_id" string="Reference"/>
<field name="origin"/>