Odoo Addons (MOVED TO GITHUB)

Merge lp:~dieck/openobject-addons/trunk-lp718609 into lp:openobject-addons

  1. trunk-lp718609
  2. Merge into trunk
Proposed by Marco Dieckhoff
Status: Merged
Merged at revision: 4658
Proposed branch: lp:~dieck/openobject-addons/trunk-lp718609
Merge into: lp:openobject-addons
Diff against target: 21 lines (+2/-2)
1 file modified
product/product_view.xml (+2/-2)
To merge this branch: bzr merge lp:~dieck/openobject-addons/trunk-lp718609
Reviewer Review Type Date Requested Status
Olivier Dony (Odoo) Approve
qdp (OpenERP) Pending
Francois Pietquin (OpenERP) Pending
Review via email: mp+59069@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Olivier Dony (Odoo) (odo-openerp) wrote :

Excellent work, thanks!

review: Approve
Revision history for this message
qdp (OpenERP) (qdp) wrote :

merged in trunk in revision 4658 revid:<email address hidden>

Thanks

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'product/product_view.xml'
2--- product/product_view.xml 2011-02-16 10:15:33 +0000
3+++ product/product_view.xml 2011-04-26 14:39:31 +0000
4@@ -13,7 +13,7 @@
5 <filter string="Stockable" icon="terp-accessories-archiver" domain="['|',('type','=','product'),('type','=','consu')]"/>
6 <separator orientation="vertical"/>
7 <filter string="To Sell" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/>
8- <filter string="To Purchase" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]" />
9+ <filter name="filter_to_purchase" string="To Purchase" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]" />
10 <separator orientation="vertical"/>
11 <field name="default_code"/>
12 <field name="name"/>
13@@ -204,7 +204,7 @@
14 <field name="type">ir.actions.act_window</field>
15 <field name="res_model">product.product</field>
16 <field name="view_type">form</field>
17- <field name="domain">[('purchase_ok','=',1)]</field>
18+ <field name="context">{"search_default_filter_to_purchase":1}</field>
19 <field name="view_id" ref="product_product_tree_view"/>
20 <field name="search_view_id" ref="product_search_form_view"/>
21 <field name="help">Products can be purchased and/or sold. They can be raw materials, stockable products, consumables or services. The Product form contains detailed information about your products related to procurement logistics, sales price, product category, suppliers and so on.</field>

Subscribers

People subscribed via source and target branches

to all changes: