From 7c6ebb98f5e0cf38521c96a1884c1ab233397aba Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Mon, 11 Jun 2012 15:29:14 +0530
Subject: [FIX]stock: added a group , class on button, improve a menu tip,label
 name,added a tree view on one2many field

bzr revid: mma@tinyerp.com-20120611095914-631eo6yw8bz9aknx
---
 addons/procurement/procurement_view.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'addons/procurement/procurement_view.xml')

diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 09bf0c6c24f..1652da39458 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -280,7 +280,15 @@
                 <group name="misc" position="after">
                     <group colspan="4" attrs="{'invisible':[('type','=','service')]}" groups="stock.group_stock_manager">
                         <separator string="Minimum Stock Rules" colspan="4"/>
-                        <field name="orderpoint_ids" nolabel="1" colspan="4" context="{'default_product_id': active_id}"/>
+                        <field colspan="4" name="orderpoint_ids" nolabel="1" context="{'default_product_id': active_id}" widget="one2many_list"
+                                mode="tree,form">
+                                <tree string="Reordering Rules">
+                                    <field name="name"/>
+                                    <field name="warehouse_id"/>
+                                    <field name="product_min_qty"/>
+                                    <field name="product_max_qty"/>
+                                </tree>
+                            </field>
                     </group>
                 </group>
             </field>
-- 
cgit v1.2.3


From f0f18853c2f4995a35b8d0654eb909e01dcb7f8c Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 14 Jun 2012 14:16:17 +0530
Subject: [IMP] procurement: improved color of button based on business flow

bzr revid: tpa@tinyerp.com-20120614084617-w15bm7f0xoiknf8c
---
 addons/procurement/procurement_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/procurement/procurement_view.xml')

diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index d94ac882cda..6ea883929a1 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -48,9 +48,9 @@
             <field name="arch" type="xml">
                 <form string="Procurement" version="7.0">
                     <header>
-                        <button name="button_confirm" states="draft" string="Confirm"/>
-                        <button name="button_check" states="confirmed" string="Run Procurement"/>
-                        <button name="button_restart" states="exception" string="Retry"/>
+                        <button name="button_confirm" states="draft" string="Confirm" class="oe_form_button_active_flow"/>
+                        <button name="button_check" states="confirmed" string="Run Procurement" class="oe_form_button_active_flow"/>
+                        <button name="button_restart" states="exception" string="Retry" class="oe_form_button_active_flow"/>
                         <button name="button_cancel" states="draft,exception,waiting" string="Cancel"/>
                         <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed" />
                     </header>
-- 
cgit v1.2.3


From 07021533c5904e347a6f784387104989cf51fd10 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 15 Jun 2012 14:35:22 +0530
Subject: [IMP]mrp: fix the form tag issue

bzr revid: mma@tinyerp.com-20120615090522-8twzo6vov7ew3gfx
---
 addons/procurement/procurement_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/procurement/procurement_view.xml')

diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index ece6c0388f9..3fa58411e6b 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -282,7 +282,7 @@
                     <group colspan="4" attrs="{'invisible':[('type','=','service')]}" groups="stock.group_stock_manager">
                         <separator string="Minimum Stock Rules" colspan="4"/>
                         <field colspan="4" name="orderpoint_ids" nolabel="1" context="{'default_product_id': active_id}" widget="one2many_list"
-                                mode="tree,form">
+                                mode="tree">
                                 <tree string="Reordering Rules">
                                     <field name="name"/>
                                     <field name="warehouse_id"/>
-- 
cgit v1.2.3


From e80980330b63f1c25ab7a582164975c4402bff09 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Wed, 20 Jun 2012 15:42:05 +0530
Subject: [USA] replaced red button class oe_form_button_active_flow to
 oe_highlight

bzr revid: rma@tinyerp.com-20120620101205-uf0ibqbq4uzu17iq
---
 addons/procurement/procurement_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/procurement/procurement_view.xml')

diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 4663cf20438..2cc15194707 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -48,9 +48,9 @@
             <field name="arch" type="xml">
                 <form string="Procurement" version="7.0">
                     <header>
-                        <button name="button_confirm" states="draft" string="Confirm" class="oe_form_button_active_flow"/>
-                        <button name="button_check" states="confirmed" string="Run Procurement" class="oe_form_button_active_flow"/>
-                        <button name="button_restart" states="exception" string="Retry" class="oe_form_button_active_flow"/>
+                        <button name="button_confirm" states="draft" string="Confirm" class="oe_highlight"/>
+                        <button name="button_check" states="confirmed" string="Run Procurement" class="oe_highlight"/>
+                        <button name="button_restart" states="exception" string="Retry" class="oe_highlight"/>
                         <button name="button_cancel" states="draft,exception,waiting" string="Cancel"/>
                         <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed" />
                     </header>
-- 
cgit v1.2.3


From 3dc9af4c1efa95b56172f1fad77d97a9439999fd Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 27 Jun 2012 11:19:41 +0200
Subject: [IMP] mrp, procurement: clean up views

bzr revid: rco@openerp.com-20120627091941-j80e2cid54bpv4ym
---
 addons/procurement/procurement_view.xml | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

(limited to 'addons/procurement/procurement_view.xml')

diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 5456f382da9..74c5721965f 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -280,20 +280,17 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                <group name="misc" position="after">
-                    <group colspan="4" attrs="{'invisible':[('type','=','service')]}" groups="stock.group_stock_manager">
-                        <separator string="Minimum Stock Rules" colspan="4"/>
-                        <field colspan="4" name="orderpoint_ids" nolabel="1" context="{'default_product_id': active_id}" widget="one2many_list"
-                                mode="tree">
-                                <tree string="Reordering Rules">
-                                    <field name="name"/>
-                                    <field name="warehouse_id"/>
-                                    <field name="product_min_qty"/>
-                                    <field name="product_max_qty"/>
-                                </tree>
-                            </field>
-                    </group>
-                </group>
+                <page string="Procurement &amp; Locations" position="inside">
+                    <separator string="Minimum Stock Rules"/>
+                        <field name="orderpoint_ids" widget="one2many_list" mode="tree" context="{'default_product_id': active_id}">
+                            <tree string="Reordering Rules">
+                                <field name="name"/>
+                                <field name="warehouse_id"/>
+                                <field name="product_min_qty"/>
+                                <field name="product_max_qty"/>
+                            </tree>
+                        </field>
+                </page>
             </field>
         </record>
 
-- 
cgit v1.2.3


From 27a1ac68d4443dfd08f8b15141716a8c98098faa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 3 Jul 2012 14:41:11 +0200
Subject: [REF] ThreadView widget renamed to mail_thread. Also added some
 footers where they were not used.

bzr revid: tde@openerp.com-20120703124111-smgj0kw3ct32552y
---
 addons/procurement/procurement_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/procurement/procurement_view.xml')

diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index fde8b4ea2fe..3b0404d376b 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -94,7 +94,7 @@
                     </notebook>
                     </sheet>
                     <footer>
-                        <field name="message_ids" widget="ThreadView"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </footer>
                 </form>
             </field>
-- 
cgit v1.2.3