From b23f7057e1ddb30cb976e89c7475089e606a0ff0 Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Fri, 17 Sep 2010 16:46:27 +0530
Subject: [PATCH] [IMP] point_of_sale: Sale order form view improved accoding
 to checklist guidelines.

bzr revid: uco@tinyerp.com-20100917111627-zdqpc2l1zstinmnh
---
 addons/point_of_sale/pos_view.xml       | 50 ++++++++++++-------------
 addons/point_of_sale/statement_view.xml |  2 +-
 2 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index 23e8ef95cf2..a12a71f4703 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -12,11 +12,14 @@
             <field name="arch" type="xml">
                 <form string="Sales Order POS">
                     <group col="6" colspan="4">
+                        <field name="name"/>
+                        <field name="date_order"/>
+                        <field name="shop_id" widget="selection"/>
                         <field name="partner_id" on_change="onchange_partner_pricelist(partner_id)"/>
                         <field name="contract_number" groups="base.group_extended"/>
                     </group>
                     <notebook colspan="4">
-                      <page string="Sale Order ">
+                        <page string="Sale Order">
                             <field name="lines" colspan="4" nolabel="1">
                                 <tree string="Order lines" editable="bottom">
                                     <field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,qty,parent.partner_id)" width="275" />
@@ -38,7 +41,6 @@
                                     <field name="notice"/>
                                     <field name="serial_number"/>
                                 </form>
-
                             </field>
                             <group colspan="4" col="7">
                                 <field name="amount_tax"/>
@@ -55,28 +57,7 @@
                                     attrs="{'invisible':[('state','!=','paid'),('state','!=','invoiced')]}" context="{'return':'return'}" />
                             </group>
                         </page>
-
-                        <page string="Order and Payment">
-                            <group colspan="2" col="2" name="Type">
-                                <separator string="Order Information" colspan="4"/>
-                                <field name="name"/>
-                                <field name="shop_id" widget="selection"/>
-                                <field name="user_salesman_id" />
-                                <field name="company_id" groups="base.group_multi_company"/>
-                                <field name="price_type" />
-                                <field name="user_id" string="Salesman" groups="base.group_extended"/>
-                            </group>
-                            <group colspan="2" col="2" name="Type">
-                                <separator string="Dates" colspan="4"/>
-                                <field name="date_order"/>
-                                <field name="date_validation" />
-                                <field name="date_payment" groups="base.group_extended"/>
-                            </group>
-                            <group colspan="4">
-                                <field name="sale_journal" domain="[('type','=','sale')]" widget="selection" invisible="1"/>
-                                <field name="pricelist_id" domain="[('type','=','sale')]" widget="selection" invisible="1"/>
-                            </group>
-
+                        <page string="Payment">
                             <field name="statement_ids" colspan="4" nolabel="1">
                                 <tree editable="bottom" string="Statement lines">
                                     <field name="amount"/>
@@ -90,11 +71,28 @@
                                 </form>
                             </field>
                         </page>
+                        <page string="Extra Info">
+                            <group colspan="2" col="2" name="Type">
+                                <separator string="Other Information" colspan="4"/>
+                                <field name="user_salesman_id" />
+                                <field name="company_id" groups="base.group_multi_company"/>
+                                <field name="price_type" />
+                                <field name="user_id" string="Salesman" groups="base.group_extended"/>
+                            </group>
+                            <group colspan="2" col="2" name="Type">
+                                <separator string="Dates" colspan="4"/>
+                                <field name="date_validation" />
+                                <field name="date_payment" groups="base.group_extended"/>
+                            </group>
+                            <group colspan="4">
+                                <field name="sale_journal" domain="[('type','=','sale')]" widget="selection" invisible="1"/>
+                                <field name="pricelist_id" domain="[('type','=','sale')]" widget="selection" invisible="1"/>
+                            </group>
+                        </page>
                         <page string="Notes" >
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
                     </notebook>
-
                 </form>
             </field>
         </record>
@@ -111,7 +109,7 @@
             <field name="model">pos.order</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="POS Orders" colors="blue:state in ('draft');gray:state in ('done','cancel');black:state not in('done','cancel')">
+                <tree string="POS Orders" colors="blue:state == 'draft';gray:state in ('done','cancel');black:state not in('done','cancel')">
                     <field name="name"/>
                     <field name="partner_id"/>
                     <field name="date_order"/>
diff --git a/addons/point_of_sale/statement_view.xml b/addons/point_of_sale/statement_view.xml
index 20adeacb052..6977e32b9f6 100644
--- a/addons/point_of_sale/statement_view.xml
+++ b/addons/point_of_sale/statement_view.xml
@@ -119,7 +119,7 @@
         <record model="ir.actions.act_window.view" id="act_cash_statement_all_register1">
             <field name="sequence" eval="0"/>
             <field name="view_mode">tree</field>
-            <field name="view_id" ref="account.view_bank_statement_tree"/>
+            <field name="view_id" ref="account.view_cash_statement_tree"/>
             <field name="act_window_id" ref="action_new_bank_statement_all_tree"/>
         </record>
         <record model="ir.actions.act_window.view" id="act_cash_statement_all_register">