From 3f7920b5389afa265b6c7896908c53eb5d22ac2a Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 16 May 2012 12:44:07 +0530
Subject: [PATCH 01/18] [IMP] sale : Added dependency, menutips, groups and
 highlighted the buttons.

bzr revid: mdi@tinyerp.com-20120516071407-d1yckbo3tkk9h0hc
---
 addons/sale/__openerp__.py | 2 +-
 addons/sale/sale_view.xml  | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index c121739166a..40459eb3f40 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -66,7 +66,7 @@ Dashboard for Sales Manager that includes:
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'images': ['images/deliveries_to_invoice.jpeg','images/sale_dashboard.jpeg','images/Sale_order_line_to_invoice.jpeg','images/sale_order.jpeg','images/sales_analysis.jpeg'],
-    'depends': ['stock', 'procurement', 'board', 'account_voucher'],
+    'depends': ['stock', 'procurement', 'board', 'account_voucher', 'share'],
     'init_xml': [],
     'update_xml': [
         'wizard/sale_make_invoice_advance.xml',
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index c6dab2fa6c4..bd44e1900d9 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -102,13 +102,13 @@
                     <button name="ship_corrected" states="shipping_except" string="Ignore Exception" icon="gtk-apply"/>
                     <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
                     <button name="%(report_sale_order)d" string="Print Order" type="action" icon="gtk-print" states="waiting_date,manual,progress,done,shipping_except,invoice_except"/>
-                    <button name="manual_invoice" states="manual" string="Create Final Invoice" icon="gtk-go-forward" type="object"/>
+                    <button name="manual_invoice" states="manual" string="Create Final Invoice" icon="gtk-go-forward" type="object" class="oe_form_button_hi"/>
                     <button name="ship_cancel" states="shipping_except" string="Cancel Order" icon="gtk-cancel"/>
                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
                     <button name="cancel" states="draft" string="Cancel Order" icon="gtk-cancel"/>
                     <button name="invoice_cancel" states="invoice_except" string="Cancel Order" icon="gtk-cancel"/>
-                    <button name="%(report_sale_order)d" string="Print Quotation" type="action" icon="gtk-print" states="draft"/>
-                    <button name="order_confirm" states="draft" string="Confirm Order" icon="gtk-apply"/>
+                    <button name="%(report_sale_order)d" string="Print Quotation" type="action" icon="gtk-print" states="draft" class="oe_form_button_hi"/>
+                    <button name="order_confirm" states="draft" string="Confirm Order" icon="gtk-apply" class="oe_form_button_hi"/>
                     <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" icon="gtk-execute" states="draft,manual"/>
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,progress,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
@@ -340,6 +340,7 @@
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="context">{"search_default_draft":1}</field>
             <field name="search_view_id" ref="view_sales_order_filter"/>
+            <field name="help">Create a quotation and send it to your customer. Once confirmed, it is converted to a sale order. From that point on, you can control how the sale order is invoiced, and how products are delivered.</field>
         </record>
 
         <menuitem id="menu_sale_quotations"

From ef8951fd20f7351c556072eebfeb4190440348a6 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 16 May 2012 12:48:53 +0530
Subject: [PATCH 02/18] [IMP] product : Added groups and remove
 widget=selection.

bzr revid: mdi@tinyerp.com-20120516071853-gh5miirewbreu0dn
---
 addons/product/product_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 3c353e031f2..b60733f3f1f 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -407,7 +407,7 @@
                         <group col="2"  colspan="2">
                             <separator string="Unit of Measure Properties" colspan="4"/>
                             <field name="name" select="1"/>
-                            <field name="category_id" select="1" widget="selection"/>
+                            <field name="category_id" select="1"/>
                             <field name="active"/>
                         </group>
                         <group col="4"  colspan="4">
@@ -460,7 +460,7 @@
             <field name="view_mode">tree,form</field>
             <field name="help">Create and manage the units of measure categories you want to be used in your system. If several units of measure are in the same category, they can be converted to each other. For example, in the unit of measure category "Time", you will have the following UoM: Hours, Days.</field>
         </record>
-        <menuitem action="product_uom_categ_form_action" id="menu_product_uom_categ_form_action" parent="base.menu_base_config" sequence="25" groups="product.group_uom"/>
+        <menuitem action="product_uom_categ_form_action" id="menu_product_uom_categ_form_action" parent="base.menu_base_config" sequence="25" groups="base.group_no_one"/>
 
         <record id="product_ul_form_view" model="ir.ui.view">
             <field name="name">product.ul.form.view</field>

From a49b88b3e79b910a81ddfbaca0ab7725ac3808f1 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 16 May 2012 14:22:31 +0530
Subject: [PATCH 03/18] [IMP] account_voucher : Restricted some fields and
 added buttons and states in the status bar.

bzr revid: mdi@tinyerp.com-20120516085231-qe6tf0tg2k81z6u9
---
 .../voucher_payment_receipt_view.xml          | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index b422c0dbe73..0b16a25f7d9 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -292,8 +292,18 @@
             <field name="model">account.voucher</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Customer Payment">
-                    <group col="6" colspan="4">
+                <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel" invisible="context.get('line_type', False)"/>
+                    <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile and cancel this record ?"/>
+                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)"/>
+                    <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward" invisible="context.get('line_type', False)"/>
+                <div class="oe_right">
+                    <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}' nolabel="1"/>
+                </div>
+                </div>
+                <sheet string="Customer Payment" layout="auto">
+                    <group col="6" colspan="4" class="oe_form_header">
                         <field name="partner_id" domain="[('customer','=',True)]" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
                         <field name="currency_id" invisible="1"/>
                         <field name="amount"
@@ -329,8 +339,8 @@
                                     <field name="date_original" readonly="1"/>
                                     <field name="date_due" readonly="1"/>
                                     <field name="amount_original" readonly="1"/>
-                                    <field name="amount_unreconciled" readonly="1"/>
-                                    <field name="reconcile" on_change="onchange_reconcile(reconcile, amount, amount_unreconciled, context)"/>
+                                    <field name="amount_unreconciled" readonly="1" groups="account.group_account_user"/>
+                                    <field name="reconcile" on_change="onchange_reconcile(reconcile, amount, amount_unreconciled, context)" groups="account.group_account_user"/>
                                     <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)" string="Allocation"/>
                                 </tree>
                             </field>
@@ -376,7 +386,7 @@
                                 </group>
                             </group>
                         </page>
-                        <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
+                        <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}" groups="account.group_account_user">
                             <group col="6" colspan="4">
                                 <field name="period_id"/>
                                 <field name="audit"/>
@@ -401,13 +411,7 @@
                             </field>
                         </page>
                     </notebook>
-                    <group col="10" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
-                        <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel" invisible="context.get('line_type', False)"/>
-                        <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile and cancel this record ?"/>
-                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)"/>
-                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward" invisible="context.get('line_type', False)"/>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>

From c16bdda89c05f724862ea96dfb4e3915dbc649ea Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 16 May 2012 15:39:32 +0530
Subject: [PATCH 04/18] [IMP] product : Added technical feature group to
 Products by Categories.

bzr revid: mdi@tinyerp.com-20120516100932-k45bqq267zull0oz
---
 addons/product/product_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index b60733f3f1f..df51fac5941 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -351,7 +351,7 @@
             action="product_category_action"
             id="product.menu_products_category"
             parent="base.menu_product"
-            sequence="0"/>
+            sequence="0" groups="base.group_no_one"/>
         <record id="product_category_action_form" model="ir.actions.act_window">
             <field name="name">Product Categories</field>
             <field name="type">ir.actions.act_window</field>

From 773ec467e4749864da85e29d676b67b782b6607c Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 16 May 2012 16:34:32 +0530
Subject: [PATCH 05/18] [IMP] stock : Added groups to some fields.

bzr revid: mdi@tinyerp.com-20120516110432-4cktm9zj692lafrx
---
 addons/stock/stock_view.xml                        | 6 +++---
 addons/stock/wizard/stock_partial_picking_view.xml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 907d8146a7c..965d23f07d8 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -729,7 +729,7 @@
                         <group colspan="2" col="2">
                             <field name="date"/>
                             <field name="min_date" readonly="1"/>
-                            <field name="stock_journal_id" widget="selection"/>
+                            <field name="stock_journal_id" widget="selection" groups="account.group_account_user"/>
                         </group>
                     </group>
                     <notebook colspan="4">
@@ -762,7 +762,7 @@
                                         groups="product.group_stock_packaging"
                                         icon="terp-stock_effects-object-colorize"
                                         states="draft,assigned,confirmed"/>
-                                    <field name="location_dest_id"/>
+                                    <field name="location_dest_id" groups="stock.group_locations"/>
                                     <field name="date_expected" string="Date Expected"/>
                                     <field name="state"/>
                                 </tree>
@@ -782,7 +782,7 @@
                                         <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]" colspan="4"/>
                                     </group>
 
-                                    <group colspan="2" col="2">
+                                    <group colspan="2" col="2" groups="stock.group_locations">
                                         <separator string="Locations" colspan="2" />
                                         <field name="location_id" domain="[('usage','&lt;&gt;','view')]"/>
                                         <field name="location_dest_id" domain="[('usage','=','internal')]"/>
diff --git a/addons/stock/wizard/stock_partial_picking_view.xml b/addons/stock/wizard/stock_partial_picking_view.xml
index c57c6c400e4..4bed2b7d529 100644
--- a/addons/stock/wizard/stock_partial_picking_view.xml
+++ b/addons/stock/wizard/stock_partial_picking_view.xml
@@ -24,7 +24,7 @@
                             <field name="quantity" />
                             <field name="product_uom" />
                             <field name="tracking" invisible="1"/>
-                            <field name="prodlot_id" domain="[('product_id', '=', product_id)]" invisible="context.get('hide_tracking',False)" attrs="{'required':[('tracking','=',True)]}"/>
+                            <field name="prodlot_id" domain="[('product_id', '=', product_id)]" invisible="context.get('hide_tracking',False)" attrs="{'required':[('tracking','=',True)]}" groups="stock.group_production_lot"/>
                             <!-- Removed as this feature is not logic: price must be updated upon reception of invoice -->
                             <field name="update_cost" invisible="1"/>
                             <field name="cost"  invisible="1"/>

From a8de539a2cdfe0accbccb3dbacdc1d470066aad1 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Fri, 18 May 2012 15:36:04 +0530
Subject: [PATCH 06/18] [IMP] stock : Added groups to stock journal.

bzr revid: mdi@tinyerp.com-20120518100604-jn29z8khf3o06tfh
---
 addons/stock/stock_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 965d23f07d8..c3c05fa26ba 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -911,7 +911,7 @@
                     <field name="min_date"/>
                     <field name="backorder_id"/>
                     <field name="invoice_state"/>
-                    <field name="stock_journal_id" widget="selection"/>
+                    <field name="stock_journal_id" widget="selection" groups="account.group_account_user"/>
                     <field name="state"/>
                     <button name="action_process" states="assigned" string="Process" type="object" icon="gtk-go-forward"/>
                 </tree>

From 7e66d4f3a349d41bf13e14cf63432b9acd154f4e Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Fri, 18 May 2012 15:40:32 +0530
Subject: [PATCH 07/18] [IMP] account_voucher : Added groups to journal items.

bzr revid: mdi@tinyerp.com-20120518101032-nd304pu1re8633n0
---
 addons/account_voucher/voucher_payment_receipt_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 0b16a25f7d9..84afcd95765 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -334,7 +334,7 @@
                                         on_change="onchange_move_line_id(move_line_id)"
                                         domain="[('account_id.type','in',('receivable','payable')), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
                                         required="1"
-                                        />
+                                        groups="account.group_account_user"/>
                                     <field name="account_id"  groups="base.group_no_one" domain="[('type','=','receivable')]"/>
                                     <field name="date_original" readonly="1"/>
                                     <field name="date_due" readonly="1"/>
@@ -386,7 +386,7 @@
                                 </group>
                             </group>
                         </page>
-                        <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}" groups="account.group_account_user">
+                        <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
                             <group col="6" colspan="4">
                                 <field name="period_id"/>
                                 <field name="audit"/>

From 09e4a6e95c1dbf32d9ee489517c27eac8afd0a5e Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Fri, 18 May 2012 17:09:37 +0530
Subject: [PATCH 08/18] [IMP] sale : Opens sales order form when quotation is
 confirmed.

bzr revid: mdi@tinyerp.com-20120518113937-ut4kghjs0pvd3378
---
 addons/sale/sale.py       | 20 ++++++++++++++++++++
 addons/sale/sale_view.xml |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 5144cb91402..2da8fd16a99 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -642,6 +642,26 @@ class sale_order(osv.osv):
             self.cancel_send_note(cr, uid, [sale.id], context=None)
         self.write(cr, uid, ids, {'state': 'cancel'})
         return True
+    
+    def action_button_confirm(self, cr, uid, ids, context=None):
+        wf_service = netsvc.LocalService('workflow')
+        for id in ids:
+            wf_service.trg_validate(uid, 'sale.order', id, 'order_confirm', cr)
+
+        result = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'sale', 'view_order_form')
+        view_id = result and result[1] or False,
+
+        return {
+            'name': _('Sales Order'),
+            'view_type': 'form',
+            'view_mode': 'form',
+            'view_id': view_id,
+            'res_model': 'sale.order',
+            'type': 'ir.actions.act_window',
+            'nodestroy': True,
+            'target': 'current',
+            'res_id': ids and ids[0] or False,
+        }
 
     def action_wait(self, cr, uid, ids, context=None):
         for o in self.browse(cr, uid, ids):
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index bd44e1900d9..4afaf840ad4 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -108,7 +108,7 @@
                     <button name="cancel" states="draft" string="Cancel Order" icon="gtk-cancel"/>
                     <button name="invoice_cancel" states="invoice_except" string="Cancel Order" icon="gtk-cancel"/>
                     <button name="%(report_sale_order)d" string="Print Quotation" type="action" icon="gtk-print" states="draft" class="oe_form_button_hi"/>
-                    <button name="order_confirm" states="draft" string="Confirm Order" icon="gtk-apply" class="oe_form_button_hi"/>
+                    <button name="action_button_confirm" states="draft" string="Confirm Order" icon="gtk-apply" class="oe_form_button_hi" type="object"/>
                     <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" icon="gtk-execute" states="draft,manual"/>
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,progress,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>

From b592c73a3b4465766ab8d0245cd90cb9a8845cd4 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 21 May 2012 10:29:43 +0530
Subject: [PATCH 09/18] [IMP] delivery : Improved the view inheritance error.

bzr revid: mdi@tinyerp.com-20120521045943-dgmgvhvdyzat3rkh
---
 addons/delivery/delivery_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 11defc97dd9..10485dd39da 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -263,7 +263,7 @@
             <field name="model">sale.order</field>
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
-                    <xpath expr="//button[@name='order_confirm']" position="after">
+                    <xpath expr="//button[@name='action_button_confirm']" position="after">
                          <button name="%(action_delivery_cost)d" states="draft" string="Delivery Costs" type="action" icon="gtk-add" context="{'order_id':active_id}"/>
                     </xpath>
             </field>

From 3c48f2d86a0f2a8e8a1ac0b73622c3eee1cfa6a7 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 24 May 2012 16:32:35 +0530
Subject: [PATCH 10/18] [IMP] account, sale : Improved usability issue related
 'invoice' and 'sale order' view .

bzr revid: mdi@tinyerp.com-20120524110235-ype5uw281m9cppk5
---
 addons/account/account_invoice_view.xml | 14 +++++++-------
 addons/sale/sale_view.xml               | 10 +++++-----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 5a9e808bf2d..04eff68525a 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -37,7 +37,7 @@
                     <field name="name"/>
                     <field name="account_id" groups="account.group_account_user"/>
                     <field name="quantity"/>
-                    <field name="uos_id"/>
+                    <field name="uos_id" groups="product.group_uom"/>
                     <field name="price_unit"/>
                     <field name="discount"/>
                     <field name="price_subtotal"/>
@@ -56,10 +56,10 @@
                     <label string="Quantity" for="quantity" align="1.0"/>
                     <group colspan="1" col="2">
                         <field name="quantity" nolabel="1"/>
-                        <field name="uos_id" on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)" nolabel="1"/>
+                        <field name="uos_id" on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)" nolabel="1" groups="product.group_uom"/>
                     </group>
                     <field name="price_unit"/>
-                    <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)"/>
+                    <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)" groups="account.group_account_user"/>
                     <field name="discount"/>
                     <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                     <field name="company_id" groups="base.group_multi_company" readonly="1"/>
@@ -255,10 +255,10 @@
             <field name="arch" type="xml">
                 <form string="Invoice">
                     <group colspan="4" col="8">
-                    <field name="journal_id" groups="base.group_user" on_change="onchange_journal_id(journal_id, context)" widget="selection"/>
+                    <field name="journal_id" groups="account.group_account_user" on_change="onchange_journal_id(journal_id, context)" widget="selection"/>
                     <field name="number"/>
                     <field name="type" invisible="1"/>
-                    <field name="currency_id" width="50"/>
+                    <field name="currency_id" width="50" groups="base.group_multi_company"/>
                     <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
                     <newline/>
                     <field string="Customer" name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" groups="base.group_user" context="{'search_default_customer': 1}" options='{"quick_create": false}' domain="[('customer', '=', True)]"/>
@@ -295,10 +295,10 @@
                                 <field name="amount_untaxed"/>
                                 <label string="" colspan="2"/>
                                 <field name="amount_tax"/>
-                                <field name="reconciled"/>
+                                <field name="reconciled" groups="base.group_no_one"/>
                                 <field name="amount_total"/>
                                 <field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
-                                <field name="residual"/>
+                                <field name="residual" groups="account.group_account_user"/>
                                 <group col="8" colspan="4" groups="base.group_user">
                                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="base.group_no_one"/>
                                     <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index f639f55c018..63c2d9ade90 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -120,11 +120,10 @@
                             <field name="name"/>
                             <field name="date_order"/>
                             <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection" groups="stock.group_locations"/>
-                            <field name="client_order_ref"/>
                         </group>
                         <group col="2" colspan="2">
-                            <field name="invoiced"/>
-                            <field name="shipped"/>
+                            <field name="invoiced" invisible="True"/>
+                            <field name="shipped" invisible="True"/>
                         </group>
                     </group>
                     <notebook colspan="5">
@@ -148,7 +147,7 @@
 
                                             <field
                                                 context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
-                                                name="product_uom_qty"
+                                                name="product_uom_qty" string="Quantity"
                                                 on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, True, context)"/>
                                             <group colspan="1">
                                                 <field name="product_uom" nolabel="1" groups="product.group_uom"
@@ -196,7 +195,7 @@
                                 </form>
                                 <tree string="Sales Order Lines">
                                     <field colspan="4" name="name"/>
-                                    <field name="product_uom_qty" string="Qty(Unit of Measure)"/>
+                                    <field name="product_uom_qty" string="Quantity"/>
                                     <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
                                     <field groups="product.group_uos" name="product_uos_qty" string="Qty(UoS)"/>
                                     <field groups="product.group_uos" name="product_uos" string="UoS"/>
@@ -234,6 +233,7 @@
                                 <separator string="References" colspan="2"/>
                                 <field name="user_id"/>
                                 <field groups="base.group_no_one" name="origin"/>
+                                <field name="client_order_ref"/>
                             </group>
                             <group name="sale_pay" colspan="2" col="2">
                                 <separator string="Conditions" colspan="2"/>

From 3bf5385ff19c7c416012e827dee1d39c988510a7 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 24 May 2012 19:01:14 +0530
Subject: [PATCH 11/18] [IMP] sale : Highlighted buttons.

bzr revid: mdi@tinyerp.com-20120524133114-2k5sqwg9l3zybn04
---
 addons/sale/sale_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 4c7e6def386..66c289aa524 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -99,7 +99,7 @@
                 <form layout="manual">
                 <div class="oe_form_topbar">
                     <button name="action_button_confirm" states="draft" string="Confirm Order" class="oe_form_button_hi" type="object"/>
-                    <button name="manual_invoice" states="manual" string="Create Final Invoice" type="object"/>
+                    <button name="manual_invoice" states="manual" string="Create Final Invoice" type="object" class="oe_form_button_hi"/>
                     <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice"/>
                     <button name="invoice_corrected" states="invoice_except" string="Ignore Exception"/>
                     <button name="ship_recreate" states="shipping_except" string="Recreate Packing"/>
@@ -108,7 +108,7 @@
                     <button name="ship_cancel" states="shipping_except" string="Cancel Order"/>
                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
                     <button name="invoice_cancel" states="invoice_except" string="Cancel Order"/>
-                    <button name="%(report_sale_order)d" string="Print Quotation" type="action" states="draft"/>
+                    <button name="%(report_sale_order)d" string="Print Quotation" type="action" states="draft" class="oe_form_button_hi"/>
                     <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" states="draft,manual"/>
                     <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object"/>
                     <button name="cancel" states="draft" string="Cancel Order"/>

From 56b2728770123c6893bb2607b081aba231610b71 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 28 May 2012 10:52:19 +0530
Subject: [PATCH 12/18] [IMP] sale : Improved the menutips.

bzr revid: mdi@tinyerp.com-20120528052219-xz3vb343wst38wqo
---
 addons/sale/sale_view.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 1d7c00ad3cd..ff5413b10c4 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -347,7 +347,13 @@
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="context">{"search_default_draft":1}</field>
             <field name="search_view_id" ref="view_sales_order_filter"/>
-            <field name="help">Create a quotation and send it to your customer. Once confirmed, it is converted to a sale order. From that point on, you can control how the sale order is invoiced, and how products are delivered.</field>
+            <field name="help">
+                Click here to create a new quotation.
+                &lt;p&gt;
+                The Quotation is the first step of the sale flow. Manage your sales from the quotation to the invoice.
+                &lt;p&gt;
+                You will be able to sale product (manage deliveries) as well as service (create projects).
+            </field>
         </record>
 
         <menuitem id="menu_sale_quotations"

From edaae5ad0a1d54f0b9544cd15e0f921d7bd6396d Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 29 May 2012 12:07:34 +0530
Subject: [PATCH 13/18] [IMP] sale : Improved the menutips.

bzr revid: mdi@tinyerp.com-20120529063734-02i3kilq02chjry5
---
 addons/sale/sale_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index ff5413b10c4..3b632a8b112 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -350,7 +350,7 @@
             <field name="help">
                 Click here to create a new quotation.
                 &lt;p&gt;
-                The Quotation is the first step of the sale flow. Manage your sales from the quotation to the invoice.
+                The "Quotation" is the first step of the Sale flow. Manage your sales from the quotation to the invoice.
                 &lt;p&gt;
                 You will be able to sale product (manage deliveries) as well as service (create projects).
             </field>

From b75b33a3edae1134b815e4dffb179a332079e29e Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 29 May 2012 12:17:20 +0530
Subject: [PATCH 14/18] [IMP] sale : Removed the highlighted buttons.

bzr revid: mdi@tinyerp.com-20120529064720-gkhixap4fo4f2eqd
---
 addons/sale/sale_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 3b632a8b112..75c13087dc6 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -98,8 +98,8 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="action_button_confirm" states="draft" string="Confirm Order" class="oe_form_button_hi" type="object"/>
-                    <button name="manual_invoice" states="manual" string="Create Final Invoice" type="object" class="oe_form_button_hi"/>
+                    <button name="action_button_confirm" states="draft" string="Confirm Order" type="object"/>
+                    <button name="manual_invoice" states="manual" string="Create Final Invoice" type="object"/>
                     <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice"/>
                     <button name="invoice_corrected" states="invoice_except" string="Ignore Exception"/>
                     <button name="ship_recreate" states="shipping_except" string="Recreate Packing"/>
@@ -108,7 +108,7 @@
                     <button name="ship_cancel" states="shipping_except" string="Cancel Order"/>
                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
                     <button name="invoice_cancel" states="invoice_except" string="Cancel Order"/>
-                    <button name="%(report_sale_order)d" string="Print Quotation" type="action" states="draft" class="oe_form_button_hi"/>
+                    <button name="%(report_sale_order)d" string="Print Quotation" type="action" states="draft"/>
                     <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" states="draft,manual"/>
                     <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object"/>
                     <button name="cancel" states="draft" string="Cancel Order"/>

From 95b6ff5e8ae8e4c09468eb57855ad2f29d6d73d9 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 29 May 2012 12:19:42 +0530
Subject: [PATCH 15/18] [IMP] sale : Removed the dependency.

bzr revid: mdi@tinyerp.com-20120529064942-bdlhv5rihhkr4ejz
---
 addons/sale/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index 8e7b9abb737..968d8d1cecd 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -65,7 +65,7 @@ Dashboard for Sales Manager that includes:
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'images': ['images/deliveries_to_invoice.jpeg','images/sale_dashboard.jpeg','images/Sale_order_line_to_invoice.jpeg','images/sale_order.jpeg','images/sales_analysis.jpeg'],
-    'depends': ['stock', 'procurement', 'board', 'account_voucher', 'share'],
+    'depends': ['stock', 'procurement', 'board', 'account_voucher'],
     'init_xml': [],
     'update_xml': [
         'wizard/sale_make_invoice_advance.xml',

From 5bcbacfe8abbee6ab31b0d578f3fb6ea771a2dd7 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 29 May 2012 12:38:01 +0530
Subject: [PATCH 16/18] [IMP] sale : Improved the code.

bzr revid: mdi@tinyerp.com-20120529070801-sd74itobcc8l7tnj
---
 addons/sale/sale.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 2be5ab2ecf5..56e5522e3a1 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -644,9 +644,9 @@ class sale_order(osv.osv):
         return True
     
     def action_button_confirm(self, cr, uid, ids, context=None):
+        assert len(ids) == 1, 'This option should only be used for a single id at a time'
         wf_service = netsvc.LocalService('workflow')
-        for id in ids:
-            wf_service.trg_validate(uid, 'sale.order', id, 'order_confirm', cr)
+        wf_service.trg_validate(uid, 'sale.order', ids[0], 'order_confirm', cr)
 
         result = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'sale', 'view_order_form')
         view_id = result and result[1] or False,

From 1bd9dc6a80572e1609f5177ff93d56c5915ff6e0 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 6 Jun 2012 12:32:07 +0200
Subject: [PATCH 17/18] [IMP] sale: improve English

bzr revid: rco@openerp.com-20120606103207-9cevalax5cut3pjw
---
 addons/sale/sale_view.xml   | 4 ++--
 addons/stock/stock_view.xml | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 7dbd888fd56..5abfefdb820 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -349,9 +349,9 @@
             <field name="help">
                 Click here to create a new quotation.
                 &lt;p&gt;
-                The "Quotation" is the first step of the Sale flow. Manage your sales from the quotation to the invoice.
+                The "Quotation" is the first step of the Sales flow.  Manage your sales from quotation to invoice.
                 &lt;p&gt;
-                You will be able to sale product (manage deliveries) as well as service (create projects).
+                You will be able to sell products (manage deliveries) as well as services (create projects).
             </field>
         </record>
 
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 92107e9cfbd..8e8b94914a4 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -934,16 +934,16 @@
                     <xpath expr="/form/header/button[@name='action_process']" position="replace">
                         <button name="action_process" states="assigned" string="Deliver" type="object" icon="gtk-go-forward"/>
                     </xpath>
-                    <xpath expr="/form/header/div[@class='oe_right']/field[@name='state']" position="replace">
+                    <xpath expr="/form/header/field[@name='state']" position="replace">
                         <field name="state" nolabel="1" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
                     </xpath>
                     <xpath expr="/form/sheet/group/group/field[@name='partner_id']" position="replace">
                         <field name="partner_id" on_change="onchange_partner_in(partner_id)"  colspan="4" string="Customer"/>
                     </xpath>
                     <xpath expr="/form/sheet" position="after">
-                        <div class="oe_form_bottom">
+                        <footer>
                             <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                        </div>
+                        </footer>
                     </xpath>
                 </data>
             </field>

From 3ab39823ddaef464c039944feaf5d2d19376952c Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 6 Jun 2012 16:24:50 +0530
Subject: [PATCH 18/18] [IMP] sale : Opens sales order form when quotation is
 confirmed.

bzr revid: mdi@tinyerp.com-20120606105450-aw1xjymqt9j4ee7o
---
 addons/sale/sale_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 5abfefdb820..777acd649a6 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -107,8 +107,8 @@
                         <button name="manual_invoice" states="manual" string="Create Final Invoice" type="object"/>
                         <button name="print_quotation" string="Send by Post" type="object" states="draft" class="oe_form_button_hi"/>
                         <button name="print_quotation" string="Send by Post" type="object" states="sent"/>
-                        <button name="order_confirm" states="draft" string="Confirm"/>
-                        <button name="order_confirm" states="sent" string="Confirm" class="oe_form_button_hi"/>
+                        <button name="action_button_confirm" states="draft" string="Confirm" type="object"/>
+                        <button name="action_button_confirm" states="sent" string="Confirm" class="oe_form_button_hi" type="object"/>
                         <button name="action_view_invoice" string="Open Invoice" type="object" 
                         attrs="{'invisible': ['|','|',('state', '!=','progress'), ('invoiced', '=', True),('order_policy','=','picking')]}"/>
                         <button name="action_view_delivery" string="Open Delivery Order" type="object"