From bacc4e1ffb798583b13f9d7dd5fee1addf612416 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Wed, 5 May 2010 11:58:24 +0200
Subject: [PATCH] [IMP] point_of_sale: improved field name: user_salesman_id
 instead of user_saleman (typo + missing _id for a m2o)

bzr revid: qdp-launchpad@tinyerp.com-20100505095824-o0r4s5osih51pqrw
---
 addons/point_of_sale/__init__.py            |  2 --
 addons/point_of_sale/pos.py                 | 10 +++++-----
 addons/point_of_sale/pos_demo.xml           |  6 +++---
 addons/point_of_sale/pos_view.xml           |  2 +-
 addons/point_of_sale/report/pos_receipt.rml |  2 +-
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/addons/point_of_sale/__init__.py b/addons/point_of_sale/__init__.py
index ddd7dc3c01f..0baf4639019 100644
--- a/addons/point_of_sale/__init__.py
+++ b/addons/point_of_sale/__init__.py
@@ -27,7 +27,5 @@ import stock
 import wizard
 import report
 
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index 7c872bda845..0f83cefa852 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -287,7 +287,7 @@ class pos_order(osv.osv):
         'date_payment': fields.function(_get_date_payment2, method=True, string='Payment Date', type='date',  store=True),
         'date_validity': fields.date('Validity Date', required=True),
         'user_id': fields.many2one('res.users', 'Connected Salesman', readonly=True),
-        'user_saleman': fields.many2one('res.users', 'Salesman', required=True),
+        'user_salesman_id': fields.many2one('res.users', 'Salesman', required=True),
         'sale_manager': fields.many2one('res.users', 'Salesman Manager'),
         'amount_tax': fields.function(_amount_all, method=True, string='Taxes',digits_compute=dp.get_precision('Point Of Sale'), multi='all'),
         'amount_total': fields.function(_amount_total, method=True, string='Total'),
@@ -703,7 +703,7 @@ class pos_order(osv.osv):
         inv_ids = []
 
         for order in self.browse(cr, uid, ids, context):
-            curr_c = order.user_saleman.company_id
+            curr_c = order.user_salesman_id.company_id
             if order.invoice_id:
                 inv_ids.append(order.invoice_id.id)
                 continue
@@ -980,8 +980,8 @@ class pos_order(osv.osv):
                     create_contract_nb = True
                     break
             if create_contract_nb:
-                seq = sequence_obj.get(cr, uid, 'pos.user_%s' % pos.user_saleman.login)
-                vals['contract_number'] ='%s-%s' % (pos.user_saleman.login, seq)
+                seq = sequence_obj.get(cr, uid, 'pos.user_%s' % pos.user_salesman_id.login)
+                vals['contract_number'] ='%s-%s' % (pos.user_salesman_id.login, seq)
         self.write(cr, uid, ids, vals)
 
     def action_paid(self, cr, uid, ids, context=None):
@@ -1328,4 +1328,4 @@ class product_product(osv.osv):
         'disc_controle': lambda *a: True,
 }
 product_product()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/pos_demo.xml b/addons/point_of_sale/pos_demo.xml
index f3573abc791..b75f4362578 100644
--- a/addons/point_of_sale/pos_demo.xml
+++ b/addons/point_of_sale/pos_demo.xml
@@ -57,7 +57,7 @@
 			<field name="shop_id" ref="sale.shop"/>
 			<field eval="&quot;&quot;&quot;2009-05-29&quot;&quot;&quot;" name="date_order"/>
 			<field name="partner_id" ref="base.res_partner_5"/>
-			<field name="user_saleman" ref="base.user_root"/>
+			<field name="user_salesman_id" ref="base.user_root"/>
 			<field name="sale_manager" ref="base.user_root"/>
 			<field eval="&quot;&quot;&quot;POS/001&quot;&quot;&quot;" name="name"/>
 			<field name="company_id" ref="res_company_tinyshop0"/>
@@ -93,7 +93,7 @@
       <field name="shop_id" ref="sale.shop"/>
 			<field eval="&quot;&quot;&quot;2009-05-29&quot;&quot;&quot;" name="date_order"/>
 			<field name="partner_id" ref="base.res_partner_3"/>
-			<field name="user_saleman" ref="res_users_sofia0"/>
+			<field name="user_salesman_id" ref="res_users_sofia0"/>
 			<field name="sale_manager" ref="base.user_root"/>
 			<field eval="&quot;&quot;&quot;POS/002&quot;&quot;&quot;" name="name"/>
 			<field name="company_id" ref="res_company_shop0"/>
@@ -135,7 +135,7 @@
 			<field eval="&quot;&quot;&quot;2009-11-29&quot;&quot;&quot;" name="date_validity"/>
 			<field eval="&quot;&quot;&quot;2009-05-29&quot;&quot;&quot;" name="date_order"/>
 			<field name="partner_id" ref="base.res_partner_3"/>
-			<field name="user_saleman" ref="res_users_sofia0"/>
+			<field name="user_salesman_id" ref="res_users_sofia0"/>
 			<field name="sale_manager" ref="base.user_root"/>
 			<field eval="&quot;&quot;&quot;POS/0012&quot;&quot;&quot;" name="name"/>
 			<field name="company_id" ref="res_company_shop0"/>
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index e9829addbda..637d37fa0b8 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -11,7 +11,7 @@
                     <notebook >
                         <page string="Order lines">
                             <group colspan="4" col="6">
-                                <field name="user_saleman" />
+                                <field name="user_salesman_id" />
                                 <field name="partner_id" on_change="onchange_partner_pricelist(partner_id)"/>
                                 <field name="contract_number" select="1" groups="base.group_extended"/>
                             </group>
diff --git a/addons/point_of_sale/report/pos_receipt.rml b/addons/point_of_sale/report/pos_receipt.rml
index 807d9e497d6..d615fc74534 100644
--- a/addons/point_of_sale/report/pos_receipt.rml
+++ b/addons/point_of_sale/report/pos_receipt.rml
@@ -103,7 +103,7 @@
         <para style="terp_default_Centre_9">Tel : [[ address and address.phone ]]</para>
         <para style="terp_default_Centre_9">E-mail : [[ address and address.email ]]</para>
         <para style="terp_default_Centre_9">Shop : [[ o.shop_id.name ]]</para>
-        <para style="terp_default_Centre_9">Vendeur : [[ o.user_saleman.name ]]</para>
+        <para style="terp_default_Centre_9">Vendeur : [[ o.user_salesman_id.name ]]</para>
         <para style="terp_default_Centre_9">Date : [[ formatLang(o.date_order,date = True) ]]</para>
         <para style="P4">
             <font color="white"> </font>