From fa4beb9fa1c3b61e1e2bc6b299892855ece622d9 Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Fri, 17 Sep 2010 11:51:25 +0530
Subject: [PATCH] [IMP] point_of_sale,mrp,auction: Improvements according to
 checklist guidelines.

bzr revid: uco@tinyerp.com-20100917062125-b97bn6da94g9fd0n
---
 addons/auction/auction_view.xml                |  5 +++--
 .../mrp/report/mrp_production_order_view.xml   | 18 ++++++++++--------
 addons/point_of_sale/pos_view.xml              |  2 +-
 .../point_of_sale/wizard/pos_box_entries.xml   | 12 +++++++-----
 addons/point_of_sale/wizard/pos_box_out.xml    | 14 ++++++++------
 .../wizard/pos_close_statement.xml             | 14 +++++++++-----
 .../wizard/pos_open_statement.xml              | 14 +++++++++-----
 addons/point_of_sale/wizard/pos_payment.xml    | 11 ++++++-----
 8 files changed, 53 insertions(+), 37 deletions(-)

diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index 648d8f271e8..f91f77429ca 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -388,8 +388,9 @@
                      string="Sold"  help="Buy object"
                      domain="[('state','=','sold')]"/>
                  <separator orientation="vertical"/>
-                 <field name="name" string="Object Name"/>
-                 <field name="lot_type"/>
+                 <field name="name"/>
+                 <field name="ach_uid"/>
+                 <field name="bord_vnd_id"/>
                  <field name="state"/>
                  <newline/>
                  <group expand="0" string="Group By..." colspan="16">
diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml
index a9cbed0cb6e..9cbe4c038d4 100644
--- a/addons/mrp/report/mrp_production_order_view.xml
+++ b/addons/mrp/report/mrp_production_order_view.xml
@@ -48,17 +48,17 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group col="16" colspan="6">
-	                    <filter icon="terp-go-year" string="  365 Days  "
-	                    	    domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_start','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
+	                    <filter icon="terp-go-year" string="This Year"
+	                    	    domain="[('year','=',time.strftime('%%Y'))]"
 	                    	    help="Production performed in last 365 Days"/>
-	                    <filter icon="terp-go-month" string="   30 Days   "
+	                    <filter icon="terp-go-month" string="This Month"
 	                    		name="month"
-	                    		domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_start','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
+	                    		domain="[('month','=',time.strftime('%%m'))]"
 	                    		help="Production performed in last 30 days"/>
 		                <filter icon="terp-go-week"
-	                            string="    7 Days    "
+	                            string="Month -1"
 	                            separator="1"
-	                            domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_start','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+	                            domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_start','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
 	                            help="Production during last 7 days"/>
                       <separator orientation="vertical"/>
                         <filter string="Current" icon="terp-check" domain="[('state','in',('open','draft'))]"/>
@@ -79,10 +79,12 @@
                     	<separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     	<separator orientation="vertical"/>
-                    	<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}"/>
-                    	<separator orientation="vertical"/>
+                    	<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                    	<separator orientation="vertical" groups="base.group_multi_company"/>
                         <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
+                    	<separator orientation="vertical"/>
                     	<filter string="Month" name="terp-go-month" icon="terp-go-month" context="{'group_by':'month'}"/>
+                    	<separator orientation="vertical"/>
                     	<filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                    </group>
                     <newline/>
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index 8541391fa45..b86f62b591e 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -49,7 +49,7 @@
                             <separator colspan="4"/>
                             <group colspan="4" col="6">
                                 <field name="state" />
-                                <button name="%(action_pos_payment)d" string="Ma_ke Payment" icon="gtk-ok" type="action" states="draft,advance" />
+                                <button name="%(action_pos_payment)d" string="Ma_ke Payment" icon="terp-dolar" type="action" states="draft,advance" />
                                 <button name="%(action_report_pos_receipt)d" string="_Reprint" icon="gtk-print" type="action" states="paid,done,invoiced"/>
                                 <button name="set_to_draft" string="Set to draft" states="paid" icon="gtk-execute" type="object" />
                                 <button name="%(action_view_pos_return)d" string="Return Picking" type="action" icon="gtk-ok" states="paid"
diff --git a/addons/point_of_sale/wizard/pos_box_entries.xml b/addons/point_of_sale/wizard/pos_box_entries.xml
index e4986ec75ad..33cfefb87dd 100644
--- a/addons/point_of_sale/wizard/pos_box_entries.xml
+++ b/addons/point_of_sale/wizard/pos_box_entries.xml
@@ -14,11 +14,13 @@
 			    	<field name="journal_id"/>
 			    	<field name="product_id"/>
 			    	<field name="amount"/>
-			    	<group colspan="4" col="2">
-				 		<button icon='gtk-cancel' special="cancel"
-                			string="Close" />
-                		<button name="get_in" string="Put Money"
-                			colspan="1" type="object" icon="gtk-ok" />
+			    	<separator colspan="4"/>
+			    	<group colspan="4" col="4">
+			    	    <group col="2" colspan="2"/>
+				 		<button icon="gtk-stop" special="cancel"
+                			string="_Cancel" />
+                		<button name="get_in" string="_Put Money"
+                			colspan="1" type="object" icon="terp-dolar_ok!" />
           			</group>
                 </form>
             </field>
diff --git a/addons/point_of_sale/wizard/pos_box_out.xml b/addons/point_of_sale/wizard/pos_box_out.xml
index aa0402869ea..2bcbb27a561 100644
--- a/addons/point_of_sale/wizard/pos_box_out.xml
+++ b/addons/point_of_sale/wizard/pos_box_out.xml
@@ -14,12 +14,14 @@
 				    	<field name="journal_id"/>
 				    	<field name="product_id"/>
 				    	<field name="amount"/>
-				    	<group colspan="4" col="2">
-				 		<button icon='gtk-cancel' special="cancel"
-                			string="Close" />
-                		<button name="get_out" string="Take Money"
-                			colspan="1" type="object" icon="gtk-ok" />
-                			</group>
+				    	<separator colspan="4"/>
+				    	<group colspan="4" col="4">
+				    	    <group col="2" colspan="2"/>
+					 		<button icon="gtk-stop" special="cancel"
+	                			string="_Cancel" />
+	                		<button name="get_out" string="_Take Money"
+	                			colspan="1" type="object" icon="terp-dolar" />
+                	    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/point_of_sale/wizard/pos_close_statement.xml b/addons/point_of_sale/wizard/pos_close_statement.xml
index e46231fa993..91d254fb8f0 100644
--- a/addons/point_of_sale/wizard/pos_close_statement.xml
+++ b/addons/point_of_sale/wizard/pos_close_statement.xml
@@ -9,11 +9,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Close Statements">
-				     	<separator string="Are you sure you want to close the statements ?" colspan="4"/>
-                		<button icon='gtk-cancel' special="cancel"
-                			string="No" colspan="1" />
-                		<button name="close_statement" string="Yes"
-                			colspan="1" type="object" icon="gtk-ok"/>
+				    <label string="Are you sure you want to close the statements ?"/>
+                    <separator colspan="4"/>
+                    <group col="4" colspan="4">
+                        <group col="2" colspan="2"/>
+                        <button icon='gtk-stop' special="cancel"
+                            string="_No" />
+                        <button name="close_statement" string="_Yes"
+                             type="object" icon="gtk-ok"/>
+                   </group>
                 </form>
             </field>
         </record>
diff --git a/addons/point_of_sale/wizard/pos_open_statement.xml b/addons/point_of_sale/wizard/pos_open_statement.xml
index a8956575a36..3f44039af95 100644
--- a/addons/point_of_sale/wizard/pos_open_statement.xml
+++ b/addons/point_of_sale/wizard/pos_open_statement.xml
@@ -9,11 +9,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Open Statements">
-				     	<separator string="Are you sure you want to open the statements ?" colspan="4"/>
-                		<button icon='gtk-cancel' special="cancel"
-                			string="No" />
-                		<button name="open_statement" string="Yes"
-                			 type="object" icon="gtk-ok"/>
+                    <label string="Are you sure you want to open the statements ?"/>
+		     	    <separator colspan="4"/>
+		     	    <group col="4" colspan="4">
+			     	    <group col="2" colspan="2"/>
+	               		<button icon='gtk-stop' special="cancel"
+	               			string="_No" />
+	               		<button name="open_statement" string="_Yes"
+	               			 type="object" icon="gtk-ok"/>
+                   </group>
                 </form>
             </field>
         </record>
diff --git a/addons/point_of_sale/wizard/pos_payment.xml b/addons/point_of_sale/wizard/pos_payment.xml
index 141c29776fd..e3549bbfa15 100644
--- a/addons/point_of_sale/wizard/pos_payment.xml
+++ b/addons/point_of_sale/wizard/pos_payment.xml
@@ -12,7 +12,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 			<form string="Add payment :">
-				<group colspan="4" width="600" height="200">
+				<group colspan="4" width="600" height="220">
 				    <field name="journal"/>
 				    <field name="amount" />
 				    <field name="payment_date" />
@@ -29,10 +29,11 @@
 				    	<field name="partner_id" attrs="{'required':[('invoice_wanted', '=', True)]}"  colspan="2"/>
 				    	<field name="pricelist_id" attrs="{'required':[('invoice_wanted', '=', True)]}" colspan="2"/>
 				    </group>
-				    <newline/>
-				    <group col="2" colspan="4">
-	            		<button icon='gtk-cancel' special="cancel"  string="Cancel" />
-						<button name="check" string="Make Payment" colspan="1" type="object" icon="gtk-ok"/>
+				    <separator colspan="4"/>
+				    <group col="4" colspan="4">
+				        <group col="2" colspan="2"/>
+	            		<button icon='gtk-stop' special="cancel"  string="_Cancel" />
+						<button name="check" string="Ma_ke Payment" colspan="1" type="object" icon="terp-dolar"/>
 					</group>	
 				 </group>
 				</form>