From 5c7fe37d35ab928d5c135a59bd92c4abe8940b1d Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Sat, 11 Sep 2010 13:12:18 +0530
Subject: [PATCH] [IMP] point_of_sale: View improvements. Default values added
 in Make Payment wizard.

bzr revid: uco@tinyerp.com-20100911074218-492cdnqig4ef3p2d
---
 addons/point_of_sale/pos_view.xml                         | 2 +-
 addons/point_of_sale/report/report_cash_register_view.xml | 2 +-
 addons/point_of_sale/statement_view.xml                   | 6 +++---
 addons/point_of_sale/wizard/pos_payment.py                | 4 ++++
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index 265a61f458e..8541391fa45 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -46,7 +46,7 @@
                                 <field name="amount_total"/>
                             </group>
 
-                            <separator colspan="4" string="Actions"/>
+                            <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" />
diff --git a/addons/point_of_sale/report/report_cash_register_view.xml b/addons/point_of_sale/report/report_cash_register_view.xml
index e975a1c6d79..32333a5be47 100644
--- a/addons/point_of_sale/report/report_cash_register_view.xml
+++ b/addons/point_of_sale/report/report_cash_register_view.xml
@@ -76,7 +76,7 @@
         </record>
 
         <record id="action_report_cash_register_all" model="ir.actions.act_window">
-	        <field name="name">Cash Register Analysis</field>
+	        <field name="name">Register Analysis</field>
 	        <field name="res_model">report.cash.register</field>
 	        <field name="view_type">form</field>
 	        <field name="view_mode">tree,form</field>
diff --git a/addons/point_of_sale/statement_view.xml b/addons/point_of_sale/statement_view.xml
index cd0c3b8c57d..c4928c7cb38 100644
--- a/addons/point_of_sale/statement_view.xml
+++ b/addons/point_of_sale/statement_view.xml
@@ -79,7 +79,7 @@
         </record>
 
         <menuitem
-            name="All Registers"
+            name="Registers"
             parent="menu_cash_register"
             action="action_new_bank_statement_all_tree"
             id="menu_all_menu_all_register"
@@ -89,13 +89,13 @@
         <menuitem name="Register management" parent="point_of_sale.menu_point_root"
             id="menu_point_open_config" sequence="1"/>
         <menuitem
-            name="Open my Cash Registers" parent="menu_point_open_config"
+            name="Open Registers" parent="menu_point_open_config"
             string="Open my Cash Register"
             action="action_pos_open_statement"
             id="menu_open_statement" sequence="1" />
 
         <menuitem
-            name="Close my Cash Register" parent="menu_point_open_config"
+            name="Close Registers" parent="menu_point_open_config"
             string="Close my Cash Register"
             action="action_pos_close_statement"
             id="menu_close_statement" sequence="2" />
diff --git a/addons/point_of_sale/wizard/pos_payment.py b/addons/point_of_sale/wizard/pos_payment.py
index 68cbbfe19c7..8d7e515928e 100644
--- a/addons/point_of_sale/wizard/pos_payment.py
+++ b/addons/point_of_sale/wizard/pos_payment.py
@@ -79,6 +79,10 @@ class pos_make_payment(osv.osv_memory):
                 res.update({'payment_date':current_date})
             if 'payment_name'  in fields:
                 res.update({'payment_name':'Payment'})
+            if 'partner_id' in fields:
+                res.update({'partner_id': order.partner_id.id or False})
+            if 'pricelist_id' in fields:
+                res.update({'pricelist_id': order.pricelist_id.id or False})
         return res
 
     def view_init(self, cr, uid, fields_list, context=None):