diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py index a0f5dceaf6d..db0218bf79c 100644 --- a/addons/account/account_invoice.py +++ b/addons/account/account_invoice.py @@ -273,7 +273,7 @@ class account_invoice(osv.osv): help="Remaining amount due."), 'payment_ids': fields.function(_compute_lines, relation='account.move.line', type="many2many", string='Payments'), 'move_name': fields.char('Journal Entry', size=64, readonly=True, states={'draft':[('readonly',False)]}), - 'user_id': fields.many2one('res.users', 'Salesman', readonly=True, states={'draft':[('readonly',False)]}), + 'user_id': fields.many2one('res.users', 'Salesperson', readonly=True, states={'draft':[('readonly',False)]}), 'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position', readonly=True, states={'draft':[('readonly',False)]}) } _defaults = { diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 72d5da23ef4..d88d5276f7e 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -360,7 +360,7 @@ string="Reference" filter_domain="['|', ('number','ilike',self),('origin','ilike',self)]"/> - + diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py index 2fbe641dba3..31b13f8bf26 100644 --- a/addons/account/report/account_invoice_report.py +++ b/addons/account/report/account_invoice_report.py @@ -45,7 +45,7 @@ class account_invoice_report(osv.osv): 'journal_id': fields.many2one('account.journal', 'Journal', readonly=True), 'partner_id': fields.many2one('res.partner', 'Partner', 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 Without Tax', readonly=True), 'price_average': fields.float('Average Price', readonly=True, group_operator="avg"), 'currency_rate': fields.float('Currency Rate', readonly=True), diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml index 76748f41f1b..c464d1cfc46 100644 --- a/addons/account/report/account_invoice_report_view.xml +++ b/addons/account/report/account_invoice_report_view.xml @@ -107,7 +107,7 @@ - + diff --git a/addons/account_voucher/report/account_voucher_sales_receipt.py b/addons/account_voucher/report/account_voucher_sales_receipt.py index b31dedc8aa1..53aa5cd4a0d 100644 --- a/addons/account_voucher/report/account_voucher_sales_receipt.py +++ b/addons/account_voucher/report/account_voucher_sales_receipt.py @@ -37,7 +37,7 @@ class sale_receipt_report(osv.osv): 'journal_id': fields.many2one('account.journal', 'Journal', readonly=True), 'partner_id': fields.many2one('res.partner', 'Partner', 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 Without Tax', readonly=True), 'price_total_tax': fields.float('Total With Tax', readonly=True), 'nbr':fields.integer('# of Voucher Lines', readonly=True), diff --git a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml index 454bcefd5dd..ba1bad2a6bd 100644 --- a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml +++ b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml @@ -91,7 +91,7 @@ - + diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 710e8f84a36..7994c9849c1 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -168,7 +168,7 @@ class crm_lead(crm_case, osv.osv): 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True), 'date_closed': fields.datetime('Closed', readonly=True), 'stage_id': fields.many2one('crm.case.stage', 'Stage', domain="[('section_ids', '=', section_id)]"), - 'user_id': fields.many2one('res.users', 'Salesman'), + 'user_id': fields.many2one('res.users', 'Salesperson'), 'referred': fields.char('Referred By', size=64), 'date_open': fields.datetime('Opened', readonly=True), 'day_open': fields.function(_compute_day, string='Days to Open', \ diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index a8cb6f732bd..86386278e86 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -371,7 +371,7 @@ - + @@ -610,7 +610,7 @@ - + diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml index 456afd884ea..d153eed4714 100644 --- a/addons/crm/report/crm_lead_report_view.xml +++ b/addons/crm/report/crm_lead_report_view.xml @@ -119,7 +119,7 @@ domain="[('section_id.user_id','=',uid)]" help="My Sales Team(s)" /> - + @@ -140,7 +140,7 @@ - - + @@ -99,7 +99,7 @@ - - + @@ -121,7 +121,7 @@ - - + @@ -129,7 +129,7 @@ - - + @@ -99,7 +99,7 @@ - - diff --git a/addons/crm_partner_assign/report/crm_partner_report_view.xml b/addons/crm_partner_assign/report/crm_partner_report_view.xml index 1cae2a82822..d652848f0fe 100644 --- a/addons/crm_partner_assign/report/crm_partner_report_view.xml +++ b/addons/crm_partner_assign/report/crm_partner_report_view.xml @@ -17,7 +17,7 @@ - diff --git a/addons/crm_partner_assign/res_partner_view.xml b/addons/crm_partner_assign/res_partner_view.xml index 4bd768179a3..c7a60083e36 100644 --- a/addons/crm_partner_assign/res_partner_view.xml +++ b/addons/crm_partner_assign/res_partner_view.xml @@ -176,7 +176,7 @@ search - + diff --git a/addons/edi/static/src/xml/edi_sale_purchase.xml b/addons/edi/static/src/xml/edi_sale_purchase.xml index 4e0fdd7fc4e..698b322606f 100644 --- a/addons/edi/static/src/xml/edi_sale_purchase.xml +++ b/addons/edi/static/src/xml/edi_sale_purchase.xml @@ -39,7 +39,7 @@ Your Reference Date - Salesman + Salesperson Payment terms diff --git a/addons/hr_recruitment/hr_recruitment_demo.yml b/addons/hr_recruitment/hr_recruitment_demo.yml index 9160c2fb1d2..59508b83c28 100644 --- a/addons/hr_recruitment/hr_recruitment_demo.yml +++ b/addons/hr_recruitment/hr_recruitment_demo.yml @@ -7,7 +7,7 @@ partner_mobile: '9963214587' job_id: hr.job_developer stage_id: stage_job1 - name: 'Salesman' + name: 'Salesperson' partner_phone: '1236547890' - diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml index b65386ca9c9..be5006b337f 100644 --- a/addons/membership/membership_view.xml +++ b/addons/membership/membership_view.xml @@ -173,7 +173,7 @@ - + diff --git a/addons/membership/report/report_membership.py b/addons/membership/report/report_membership.py index 631acab46b1..9090c752686 100644 --- a/addons/membership/report/report_membership.py +++ b/addons/membership/report/report_membership.py @@ -59,7 +59,7 @@ class report_membership(osv.osv): 'associate_member_id': fields.many2one('res.partner', 'Associate Member', readonly=True), 'membership_id': fields.many2one('product.product', 'Membership Product', readonly=True), 'membership_state': fields.selection(STATE, 'Current Membership State', readonly=True), - 'user_id': fields.many2one('res.users', 'Salesman', readonly=True), + 'user_id': fields.many2one('res.users', 'Salesperson', readonly=True), 'company_id': fields.many2one('res.company', 'Company', readonly=True) } diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml index b0ac01ac89f..6b3f6a9eb71 100644 --- a/addons/membership/report/report_membership_view.xml +++ b/addons/membership/report/report_membership_view.xml @@ -56,7 +56,7 @@ - diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml index c5954ddb74e..4fa5c067284 100644 --- a/addons/point_of_sale/point_of_sale_view.xml +++ b/addons/point_of_sale/point_of_sale_view.xml @@ -148,7 +148,7 @@ - + diff --git a/addons/point_of_sale/report/pos_order_report.py b/addons/point_of_sale/report/pos_order_report.py index 2a66923a39b..27086e08b26 100644 --- a/addons/point_of_sale/report/pos_order_report.py +++ b/addons/point_of_sale/report/pos_order_report.py @@ -37,7 +37,7 @@ class pos_order_report(osv.osv): 'product_id':fields.many2one('product.product', 'Product', readonly=True), 'state': fields.selection([('draft', 'New'), ('paid', 'Closed'), ('done', 'Synchronized'), ('invoiced', 'Invoiced'), ('cancel', 'Cancelled')], 'Status'), - '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), 'total_discount':fields.float('Total Discount', readonly=True), 'average_price': fields.float('Average Price', readonly=True,group_operator="avg"), diff --git a/addons/point_of_sale/report/pos_order_report_view.xml b/addons/point_of_sale/report/pos_order_report_view.xml index c5024100a13..a1631ab0203 100644 --- a/addons/point_of_sale/report/pos_order_report_view.xml +++ b/addons/point_of_sale/report/pos_order_report_view.xml @@ -70,7 +70,7 @@ - + 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 @@ - +