-
+
diff --git a/addons/point_of_sale/wizard/pos_payment_report_user.py b/addons/point_of_sale/wizard/pos_payment_report_user.py
index 05d06f4df29..bdb2790dc87 100644
--- a/addons/point_of_sale/wizard/pos_payment_report_user.py
+++ b/addons/point_of_sale/wizard/pos_payment_report_user.py
@@ -46,7 +46,7 @@ class pos_payment_report_user(osv.osv_memory):
}
_columns = {
- 'user_id': fields.many2many('res.users', 'res_user_sale', 'user_id', 'sale_id', 'Salesman')
+ 'user_id': fields.many2many('res.users', 'res_user_sale', 'user_id', 'sale_id', 'Salesperson')
}
pos_payment_report_user()
diff --git a/addons/point_of_sale/wizard/pos_sales_user.py b/addons/point_of_sale/wizard/pos_sales_user.py
index e17aff8bdca..22ffa66d2ad 100644
--- a/addons/point_of_sale/wizard/pos_sales_user.py
+++ b/addons/point_of_sale/wizard/pos_sales_user.py
@@ -30,7 +30,7 @@ class pos_sale_user(osv.osv_memory):
_columns = {
'date_start': fields.date('Date Start', required=True),
'date_end': fields.date('Date End', required=True),
- 'user_id': fields.many2many('res.users', 'sale_user_rel', 'user_id', 'uid', 'Salesman'),
+ 'user_id': fields.many2many('res.users', 'sale_user_rel', 'user_id', 'uid', 'Salesperson'),
}
def print_report(self, cr, uid, ids, context=None):
diff --git a/addons/point_of_sale/wizard/pos_sales_user_today.py b/addons/point_of_sale/wizard/pos_sales_user_today.py
index 94d84647a7c..f48dd29b01b 100644
--- a/addons/point_of_sale/wizard/pos_sales_user_today.py
+++ b/addons/point_of_sale/wizard/pos_sales_user_today.py
@@ -27,7 +27,7 @@ class pos_sales_user_today(osv.osv_memory):
_description = 'Sales User Today'
_columns = {
- 'user_id': fields.many2many('res.users', 'sale_user_rel_today', 'user_id', 'uid', 'Salesman'),
+ 'user_id': fields.many2many('res.users', 'sale_user_rel_today', 'user_id', 'uid', 'Salesperson'),
}
def print_report(self, cr, uid, ids, context=None):
diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml
index 4b66102c2f0..31f823888d6 100644
--- a/addons/sale/report/sale_order.rml
+++ b/addons/sale/report/sale_order.rml
@@ -204,7 +204,7 @@
[[ o.state <> 'draft' and removeParentNode('para') ]] Quotation Date
- Salesman
+ Salesperson
|
Payment Term
diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py
index 42e090d54e5..96e83012287 100644
--- a/addons/sale/report/sale_report.py
+++ b/addons/sale/report/sale_report.py
@@ -44,7 +44,7 @@ class sale_report(osv.osv):
'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
'shop_id': fields.many2one('sale.shop', 'Shop', readonly=True),
'company_id': fields.many2one('res.company', 'Company', readonly=True),
- 'user_id': fields.many2one('res.users', 'Salesman', readonly=True),
+ 'user_id': fields.many2one('res.users', 'Salesperson', readonly=True),
'price_total': fields.float('Total Price', readonly=True),
'delay': fields.float('Commitment Delay', digits=(16,2), readonly=True),
'categ_id': fields.many2one('product.category','Category of Product', readonly=True),
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 7cb0df63a79..15066d8d92c 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -95,7 +95,7 @@
-
+
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 6a3539fc10f..177ce02b1e0 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -215,7 +215,7 @@ class sale_order(osv.osv):
'date_order': fields.date('Date', required=True, readonly=True, select=True, states={'draft': [('readonly', False)]}),
'create_date': fields.datetime('Creation Date', readonly=True, select=True, help="Date on which sales order is created."),
'date_confirm': fields.date('Confirmation Date', readonly=True, select=True, help="Date on which sales order is confirmed."),
- 'user_id': fields.many2one('res.users', 'Salesman', states={'draft': [('readonly', False)]}, select=True),
+ 'user_id': fields.many2one('res.users', 'Salesperson', states={'draft': [('readonly', False)]}, select=True),
'partner_id': fields.many2one('res.partner', 'Customer', readonly=True, states={'draft': [('readonly', False)]}, required=True, change_default=True, select=True),
'partner_invoice_id': fields.many2one('res.partner', 'Invoice Address', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="Invoice address for current sales order."),
'partner_shipping_id': fields.many2one('res.partner', 'Shipping Address', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="Shipping address for current sales order."),
@@ -1032,7 +1032,7 @@ class sale_order_line(osv.osv):
\n* The \'Done\' state is set when the sales order line has been picked. \
\n* The \'Cancelled\' state is set when a user cancel the sales order related.'),
'order_partner_id': fields.related('order_id', 'partner_id', type='many2one', relation='res.partner', store=True, string='Customer'),
- 'salesman_id':fields.related('order_id', 'user_id', type='many2one', relation='res.users', store=True, string='Salesman'),
+ 'salesman_id':fields.related('order_id', 'user_id', type='many2one', relation='res.users', store=True, string='Salesperson'),
'company_id': fields.related('order_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
}
_order = 'sequence, id'
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index c5b3323b0d6..977b273b1a8 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -278,7 +278,7 @@
-
+
@@ -433,7 +433,7 @@
-
+
|