pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] Supplier --> Vendor. American English

Browse Source
This commit is contained in:
Fabien Pinckaers
2015-07-09 16:10:09 -07:00
parent 7e0647a09f
commit 1fe10b5417
24 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/models/account.py
+4 -4
View File
@@ -25,7 +25,7 @@ class AccountAccountType(models.Model):
], required=True, default='other',
help="The 'Internal Type' is used for features available on "\
"different types of accounts: liquidity type is for cash or bank accounts"\
", payable/receivable is for supplier/customer accounts.")
", payable/receivable is for vendor/customer accounts.")
note = fields.Text(string='Description')
@@ -170,7 +170,7 @@ class AccountAccount(models.Model):
values = ['account.account,%s' % (account_id,) for account_id in self.ids]
partner_prop_acc = self.env['ir.property'].search([('value_reference', 'in', values)], limit=1)
if partner_prop_acc:
raise UserError(_('You cannot remove/deactivate an account which is set on a customer or supplier.'))
raise UserError(_('You cannot remove/deactivate an account which is set on a customer or vendor.'))
return super(AccountAccount, self).unlink()
@api.multi
@@ -199,8 +199,8 @@ class AccountJournal(models.Model):
('general', 'Miscellaneous'),
], required=True,
help="Select 'Sale' for customer invoices journals."\
" Select 'Purchase' for supplier bills journals."\
" Select 'Cash' or 'Bank' for journals that are used in customer or supplier payments."\
" Select 'Purchase' for vendor bills journals."\
" Select 'Cash' or 'Bank' for journals that are used in customer or vendor payments."\
" Select 'General' for miscellaneous operations journals."\
" Select 'Opening/Closing Situation' for entries generated for new fiscal years.")
type_control_ids = fields.Many2many('account.account.type', 'account_journal_type_rel', 'journal_id', 'type_id', string='Account Types Allowed (empty for no control)')
addons/account/models/account_invoice.py
+8 -8
View File
@@ -23,9 +23,9 @@ TYPE2JOURNAL = {
# mapping invoice type to refund type
TYPE2REFUND = {
'out_invoice': 'out_refund', # Customer Invoice
'in_invoice': 'in_refund', # Supplier Bill
'in_invoice': 'in_refund', # Vendor Bill
'out_refund': 'out_invoice', # Customer Refund
'in_refund': 'in_invoice', # Supplier Refund
'in_refund': 'in_invoice', # Vendor Refund
}
MAGIC_COLUMNS = ('id', 'create_uid', 'create_date', 'write_uid', 'write_date')
@@ -185,9 +185,9 @@ class AccountInvoice(models.Model):
readonly=True, states={'draft': [('readonly', False)]})
type = fields.Selection([
('out_invoice','Customer Invoice'),
('in_invoice','Supplier Bill'),
('in_invoice','Vendor Bill'),
('out_refund','Customer Refund'),
('in_refund','Supplier Refund'),
('in_refund','Vendor Refund'),
], readonly=True, index=True, change_default=True,
default=lambda self: self._context.get('type', 'out_invoice'),
track_visibility='always')
@@ -196,7 +196,7 @@ class AccountInvoice(models.Model):
move_name = fields.Char(string='Journal Entry', readonly=True,
default=False, copy=False,
help="Technical field holding the number given to the invoice, automatically set when the invoice is validated then stored to set the same number again if the invoice is cancelled, set to draft and re-validated.")
reference = fields.Char(string='Supplier Reference',
reference = fields.Char(string='Vendor Reference',
help="The partner reference of this invoice.", readonly=True, states={'draft': [('readonly', False)]})
reference_type = fields.Selection('_get_reference_type', string='Payment Reference',
required=True, readonly=True, states={'draft': [('readonly', False)]},
@@ -281,7 +281,7 @@ class AccountInvoice(models.Model):
reconciled = fields.Boolean(string='Paid/Reconciled', store=True, readonly=True, compute='_compute_residual',
help="It indicates that the invoice has been paid and the journal entry of the invoice has been reconciled with one or several journal entries of payment.")
partner_bank_id = fields.Many2one('res.partner.bank', string='Bank Account',
help='Bank Account Number to which the invoice will be paid. A Company bank account if this is a Customer Invoice or Supplier Refund, otherwise a Partner bank account number.',
help='Bank Account Number to which the invoice will be paid. A Company bank account if this is a Customer Invoice or Vendor Refund, otherwise a Partner bank account number.',
readonly=True, states={'draft': [('readonly', False)]})
residual = fields.Monetary(string='Amount Due',
@@ -802,9 +802,9 @@ class AccountInvoice(models.Model):
def name_get(self):
TYPES = {
'out_invoice': _('Invoice'),
'in_invoice': _('Supplier Bill'),
'in_invoice': _('Vendor Bill'),
'out_refund': _('Refund'),
'in_refund': _('Supplier Refund'),
'in_refund': _('Vendor Refund'),
}
result = []
for inv in self:
addons/account/models/account_move.py
+2 -2
View File
@@ -397,8 +397,8 @@ class AccountMoveLine(models.Model):
:param res_type: either 'partner' or 'account'
:param res_ids: ids of the partners/accounts to reconcile, use None to fetch data indiscriminately
of the id, use [] to prevent from fetching any data at all.
:param account_type: if a partner is both customer and supplier, you can use 'payable' to reconcile
the supplier-related journal entries and 'receivable' for the customer-related entries.
:param account_type: if a partner is both customer and vendor, you can use 'payable' to reconcile
the vendor-related journal entries and 'receivable' for the customer-related entries.
"""
if res_ids != None and len(res_ids) == 0:
# Note : this short-circuiting is better for performances, but also required
addons/account/models/account_payment.py
+4 -4
View File
@@ -35,7 +35,7 @@ class account_abstract_payment(models.AbstractModel):
payment_method_code = fields.Char(related='payment_method_id.code',
help="Technical field used to adapt the interface to the payment method selected.")
partner_type = fields.Selection([('customer', 'Customer'), ('supplier', 'Supplier')])
partner_type = fields.Selection([('customer', 'Customer'), ('supplier', 'Vendor')])
partner_id = fields.Many2one('res.partner', string='Partner')
amount = fields.Monetary(string='Payment Amount', required=True)
@@ -123,7 +123,7 @@ class account_register_payments(models.TransientModel):
if any(inv.partner_id != invoices[0].partner_id for inv in invoices):
raise UserError(_("In order to pay multiple invoices at once, they must belong to the same partner."))
if any(MAP_INVOICE_TYPE_PARTNER_TYPE[inv.type] != MAP_INVOICE_TYPE_PARTNER_TYPE[invoices[0].type] for inv in invoices):
raise UserError(_("You cannot mix customer and supplier invoices in a single payment."))
raise UserError(_("You cannot mix customer invoices and vendor bills in a single payment."))
if any(inv.currency_id != invoices[0].currency_id for inv in invoices):
raise UserError(_("In order to pay multiple invoices at once, they must use the same currency."))
@@ -461,9 +461,9 @@ class account_payment(models.Model):
name += _("Customer Refund")
elif self.partner_type == 'supplier':
if self.payment_type == 'inbound':
name += _("Supplier Refund")
name += _("Vendor Refund")
elif self.payment_type == 'outbound':
name += _("Supplier Payment")
name += _("Vendor Payment")
if invoice:
name += ': '
for inv in invoice:
addons/account/models/chart_template.py
+1 -1
View File
@@ -174,7 +174,7 @@ class AccountChartTemplate(models.Model):
return default_account
journals = [{'name': _('Customer Invoices'), 'type': 'sale', 'code': _('INV'), 'favorite': True},
{'name': _('Supplier Bills'), 'type': 'purchase', 'code': _('EXJ'), 'favorite': True},
{'name': _('Vendor Bills'), 'type': 'purchase', 'code': _('EXJ'), 'favorite': True},
{'name': _('Exchange Rate Journal'), 'type': 'general', 'code': _('EXCH'), 'favorite': False},
{'name': _('Miscellaneous Journal'), 'type': 'general', 'code': _('MISC'), 'favorite': False},]
if journals_dict != None:
addons/account/models/partner.py
+3 -3
View File
@@ -358,7 +358,7 @@ class ResPartner(models.Model):
credit = fields.Monetary(compute='_credit_debit_get', search=_credit_search,
string='Total Receivable', help="Total amount this customer owes you.")
debit = fields.Monetary(compute='_credit_debit_get', search=_debit_search, string='Total Payable',
help="Total amount you have to pay to this supplier.")
help="Total amount you have to pay to this vendor.")
debit_limit = fields.Monetary('Payable Limit')
total_invoiced = fields.Monetary(compute='_invoice_total', string="Total Invoiced",
groups='account.group_account_invoice')
@@ -385,8 +385,8 @@ class ResPartner(models.Model):
string ='Customer Payment Term',
help="This payment term will be used instead of the default one for sale orders and customer invoices", oldname="property_payment_term")
property_supplier_payment_term_id = fields.Many2one('account.payment.term', company_dependent=True,
string ='Supplier Payment Term',
help="This payment term will be used instead of the default one for purchase orders and supplier bills", oldname="property_supplier_payment_term")
string ='Vendor Payment Term',
help="This payment term will be used instead of the default one for purchase orders and vendor bills", oldname="property_supplier_payment_term")
ref_company_ids = fields.One2many('res.company', 'partner_id',
string='Companies that refers to partner', oldname="ref_companies")
has_unreconciled_entries = fields.Boolean(compute='_compute_has_unreconciled_entries',
addons/account/models/product.py
+1 -1
View File
@@ -24,7 +24,7 @@ class ProductTemplate(models.Model):
taxes_id = fields.Many2many('account.tax', 'product_taxes_rel', 'prod_id', 'tax_id', string='Customer Taxes',
domain=[('type_tax_use', '=', 'sale')])
supplier_taxes_id = fields.Many2many('account.tax', 'product_supplier_taxes_rel', 'prod_id', 'tax_id', string='Supplier Taxes',
supplier_taxes_id = fields.Many2many('account.tax', 'product_supplier_taxes_rel', 'prod_id', 'tax_id', string='Vendor Taxes',
domain=[('type_tax_use', '=', 'purchase')])
property_account_income_id = fields.Many2one('account.account', company_dependent=True,
string="Income Account", oldname="property_account_income",
addons/account/models/res_config.py
+2 -2
View File
@@ -69,7 +69,7 @@ class AccountConfigSettings(models.TransientModel):
period_lock_date = fields.Date(related='company_id.period_lock_date', help="Only users with the 'Adviser' role can edit accounts prior to and inclusive of this date")
fiscalyear_lock_date = fields.Date(string="Fiscal Year lock date", related='company_id.fiscalyear_lock_date', help="No users, including Advisers, can edit accounts prior to and inclusive of this date")
module_account_check_writing = fields.Boolean(string='Pay your suppliers by check',
module_account_check_writing = fields.Boolean(string='Pay your vendors by check',
help='This allows you to check writing and printing.\n'
'-This installs the module account_check_writing.')
module_account_accountant = fields.Boolean(string='Full accounting features: journals, legal statements, chart of accounts, etc.',
@@ -107,7 +107,7 @@ class AccountConfigSettings(models.TransientModel):
group_analytic_accounting = fields.Boolean(string='Analytic accounting',
implied_group='analytic.group_analytic_accounting',
help="Allows you to use the analytic accounting.")
group_check_supplier_invoice_total = fields.Boolean(string='Check the total of supplier bills',
group_check_supplier_invoice_total = fields.Boolean(string='Check the total of vendor bills',
implied_group="account.group_supplier_inv_check_total")
currency_exchange_journal_id = fields.Many2one('account.journal',
related='company_id.currency_exchange_journal_id',
addons/account/report/account_invoice_report.py
+2 -2
View File
@@ -49,9 +49,9 @@ class AccountInvoiceReport(models.Model):
nbr = fields.Integer(string='# of Invoices', readonly=True) # TDE FIXME master: rename into nbr_lines
type = fields.Selection([
('out_invoice', 'Customer Invoice'),
('in_invoice', 'Supplier Bill'),
('in_invoice', 'Vendor Bill'),
('out_refund', 'Customer Refund'),
('in_refund', 'Supplier Refund'),
('in_refund', 'Vendor Refund'),
], readonly=True)
state = fields.Selection([
('draft', 'Draft'),
addons/account/tests/test_account_supplier_invoice.py
+1 -1
View File
@@ -35,7 +35,7 @@ class TestAccountSupplierInvoice(AccountingTestCase):
})
# check that Initially supplier bill state is "Draft"
self.assertTrue((invoice.state == 'draft'), "Initially supplier bill state is Draft")
self.assertTrue((invoice.state == 'draft'), "Initially vendor bill state is Draft")
#change the state of invoice to open by clicking Validate button
invoice.signal_workflow('invoice_open')
addons/account/tests/test_reconciliation.py
+1 -1
View File
@@ -46,7 +46,7 @@ class TestReconciliation(AccountingTestCase):
invoice = self.account_invoice_model.create({'partner_id': self.partner_agrolait_id,
'reference_type': 'none',
'currency_id': currency_id,
'name': type == 'out_invoice' and 'invoice to client' or 'invoice to supplier',
'name': type == 'out_invoice' and 'invoice to client' or 'invoice to vendor',
'account_id': self.account_rcv.id,
'type': type,
'date_invoice': time.strftime('%Y') + '-07-01',
addons/account_check_writing/tests/test_check_writing.py
+1 -1
View File
@@ -23,7 +23,7 @@ class TestCheckWriting(AccountingTestCase):
invoice = self.invoice_model.create({
'partner_id': self.partner_axelor.id,
'reference_type': 'none',
'name': is_refund and "Supplier Refund" or "Supplier Invoice",
'name': is_refund and "Vendor Refund" or "Vendor Invoice",
'type': is_refund and "in_refund" or "in_invoice",
'account_id': self.account_payable.id,
'date_invoice': time.strftime('%Y') + '-06-26',
addons/hr_equipment/models/hr_equipment.py
+1 -1
View File
@@ -109,7 +109,7 @@ class HrEquipment(models.Model):
employee_id = fields.Many2one('hr.employee', string='Assigned to Employee', track_visibility='onchange')
department_id = fields.Many2one('hr.department', string='Assigned to Department', track_visibility='onchange')
category_id = fields.Many2one('hr.equipment.category', string='Equipment Category', track_visibility='onchange')
partner_id = fields.Many2one('res.partner', string='Supplier', domain="[('supplier', '=', 1)]")
partner_id = fields.Many2one('res.partner', string='Vendor', domain="[('supplier', '=', 1)]")
model = fields.Char('Model')
serial_no = fields.Char('Serial Number', copy=False)
assign_date = fields.Date('Assigned Date', track_visibility='onchange')
addons/inter_company_rules/models/purchase_order.py
+1 -1
View File
@@ -54,7 +54,7 @@ class purchase_order(models.Model):
so_line_vals = self.sudo()._prepare_sale_order_line_data(line, company, sale_order.id)
SaleOrderLine.sudo(intercompany_uid).create(so_line_vals)
# write supplier reference field on PO
# write vendor reference field on PO
if not self.partner_ref:
self.partner_ref = sale_order.name
addons/inter_company_rules/models/res_company.py
+2 -2
View File
@@ -8,11 +8,11 @@ class res_company(models.Model):
_inherit = 'res.company'
so_from_po = fields.Boolean(string="Create Sale Orders when buying to this company",
help="Generate a Sale Order when a Purchase Order with this company as supplier is created.\n The intercompany user must at least be Sale User.")
help="Generate a Sale Order when a Purchase Order with this company as vendor is created.\n The intercompany user must at least be Sale User.")
po_from_so = fields.Boolean(string="Create Purchase Orders when selling to this company",
help="Generate a Purchase Order when a Sale Order with this company as customer is created.\n The intercompany user must at least be Purchase User.")
auto_generate_invoices = fields.Boolean(string="Create Invoices/Refunds when encoding invoices/refunds made to this company",
help="Generate Customer/Supplier Bills (and refunds) when encoding invoices (or refunds) made to this company.\n e.g: Generate a Customer Invoice when a Supplier Bill with this company as supplier is created.")
help="Generate Customer/Vendor Bills (and refunds) when encoding invoices (or refunds) made to this company.\n e.g: Generate a Customer Invoice when a Vendor Bill with this company as vendor is created.")
auto_validation = fields.Boolean(string="Sale/Purchase Orders Auto Validation",
help="When a Sale Order or a Purchase Order is created by a multi company rule for this company, it will automatically validate it")
intercompany_user_id = fields.Many2one("res.users", string="Inter Company User", default=SUPERUSER_ID,
addons/inter_company_rules/models/res_config.py
+1 -1
View File
@@ -11,7 +11,7 @@ class inter_company_rules_configuration(models.TransientModel):
('invoice_and_refunds', 'Create Invoice/Refunds when encoding invoice/refunds')],
help='Select the type to setup inter company rules in selected company.')
so_from_po = fields.Boolean(string='Create Sale Orders when buying to this company',
help='Generate a Sale Order when a Purchase Order with this company as supplier is created.')
help='Generate a Sale Order when a Purchase Order with this company as vendor is created.')
po_from_so = fields.Boolean(string='Create Purchase Orders when selling to this company',
help='Generate a Purchase Order when a Sale Order with this company as customer is created.')
auto_validation = fields.Boolean(string='Sale/Purchase Orders Auto Validation',
addons/lunch/models/lunch.py
+4 -4
View File
@@ -138,7 +138,7 @@ class LunchOrderLine(models.Model):
category_id = fields.Many2one('lunch.product.category', string='Product Category',
related='product_id.category_id', readonly=True, store=True)
date = fields.Date(string='Date', related='order_id.date', readonly=True, store=True)
supplier = fields.Many2one('res.partner', string='Supplier', related='product_id.supplier',
supplier = fields.Many2one('res.partner', string='Vendor', related='product_id.supplier',
readonly=True, store=True)
user_id = fields.Many2one('res.users', string='User', related='order_id.user_id',
readonly=True, store=True)
@@ -156,7 +156,7 @@ class LunchOrderLine(models.Model):
@api.one
def order(self):
"""
The order_line is ordered to the supplier but isn't received yet
The order_line is ordered to the vendor but isn't received yet
"""
self.state = 'ordered'
@@ -187,7 +187,7 @@ class LunchOrderLine(models.Model):
class LunchProduct(models.Model):
""" Products available to order. A product is linked to a specific supplier. """
""" Products available to order. A product is linked to a specific vendor. """
_name = 'lunch.product'
_description = 'lunch product'
@@ -195,7 +195,7 @@ class LunchProduct(models.Model):
category_id = fields.Many2one('lunch.product.category', 'Category', required=True)
description = fields.Text('Description')
price = fields.Float('Price', digits_compute=dp.get_precision('Account'))
supplier = fields.Many2one('res.partner', 'Supplier')
supplier = fields.Many2one('res.partner', 'Vendor')
class LunchProductCategory(models.Model):
addons/purchase/report/purchase_report.py
+2 -2
View File
@@ -15,7 +15,7 @@ class purchase_report(osv.osv):
_columns = {
'date': fields.datetime('Order Date', readonly=True, help="Date on which this document has been created"), # TDE FIXME master: rename into date_order
'state': fields.selection([('draft', 'Request for Quotation'),
('confirmed', 'Waiting Supplier Ack'),
('confirmed', 'Waiting Vendor Ack'),
('approved', 'Approved'),
('except_picking', 'Shipping Exception'),
('except_invoice', 'Invoice Exception'),
@@ -24,7 +24,7 @@ class purchase_report(osv.osv):
'product_id':fields.many2one('product.product', 'Product', readonly=True),
'picking_type_id': fields.many2one('stock.warehouse', 'Warehouse', readonly=True),
'location_id': fields.many2one('stock.location', 'Destination', readonly=True),
'partner_id':fields.many2one('res.partner', 'Supplier', readonly=True),
'partner_id':fields.many2one('res.partner', 'Vendor', readonly=True),
'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', readonly=True),
'date_approve':fields.date('Date Approved', readonly=True),
'expected_date':fields.date('Expected Date', readonly=True),
addons/purchase/wizard/purchase_line_invoice.py
+2 -2
View File
@@ -46,7 +46,7 @@ class purchase_line_invoice(osv.osv_memory):
def make_invoice_by_partner(partner, orders, lines_ids):
"""
create a new invoice for one supplier
create a new invoice for one vendor
@param partner : The object partner
@param orders : The set of orders to add in the invoice
@param lines : The list of line's id
@@ -94,7 +94,7 @@ class purchase_line_invoice(osv.osv_memory):
return {
'domain': "[('id','in', ["+','.join(map(str,res))+"])]",
'name': _('Supplier Bills'),
'name': _('Vendor Bills'),
'view_type': 'form',
'view_mode': 'tree,form',
'res_model': 'account.invoice',
addons/purchase_requisition/wizard/purchase_requisition_partner.py
+1 -1
View File
@@ -9,7 +9,7 @@ class purchase_requisition_partner(osv.osv_memory):
_name = "purchase.requisition.partner"
_description = "Purchase Requisition Partner"
_columns = {
'partner_ids': fields.many2many('res.partner', 'purchase_requisition_supplier_rel', 'requisition_id', 'partner_id', string='Suppliers', required=True, domain=[('supplier', '=', True)])
'partner_ids': fields.many2many('res.partner', 'purchase_requisition_supplier_rel', 'requisition_id', 'partner_id', string='Vendors', required=True, domain=[('supplier', '=', True)])
}
def view_init(self, cr, uid, fields_list, context=None):
addons/resource/faces/task.py
+1 -1
View File
@@ -535,7 +535,7 @@ class _ValueWrapper(object):
"""
This class represents a value, of a task attribute or
a return value of a task method. It contains the value,
and the supplier of that value
and the vendor of that value
"""
#@ @+others
#@+node:__init__
addons/stock_account/wizard/stock_invoice_onshipping.py
+2 -2
View File
@@ -48,9 +48,9 @@ class stock_invoice_onshipping(osv.osv_memory):
'invoice_date': fields.date('Invoice Date'),
'invoice_type': fields.selection(selection=[
('out_invoice', 'Create Customer Invoice'),
('in_invoice', 'Create Supplier Bill'),
('in_invoice', 'Create Vendor Bill'),
('out_refund', 'Create Customer Refund'),
('in_refund', 'Create Supplier Refund'),
('in_refund', 'Create Vendor Refund'),
], string='Invoice type', readonly=True),
}
_defaults = {
openerp/addons/base/res/res_partner.py
+1 -1
View File
@@ -236,7 +236,7 @@ class res_partner(osv.Model, format_address):
'barcode': fields.char('Barcode', oldname='ean13'),
'active': fields.boolean('Active'),
'customer': fields.boolean('Is a Customer', help="Check this box if this contact is a customer."),
'supplier': fields.boolean('Is a Supplier', help="Check this box if this contact is a supplier. If it's not checked, purchase people will not see it when encoding a purchase order."),
'supplier': fields.boolean('Is a Vendor', help="Check this box if this contact is a vendor. If it's not checked, purchase people will not see it when encoding a purchase order."),
'employee': fields.boolean('Employee', help="Check this box if this contact is an Employee."),
'function': fields.char('Job Position'),
'type': fields.selection([('default', 'Default'), ('invoice', 'Invoice'),
openerp/addons/base/tests/test_mail_examples.py
+1 -1
View File
@@ -1116,7 +1116,7 @@ BUG3 = """<div class="oe_msg_body_long" style="/* display: none; */"><p>OpenERP
<p>Schedule your picking, packing, receptions and internal moves automatically with Odoo using
your own routing rules. Define push and procurement rules to organize a warehouse or to manage
product moves between several warehouses. Track in detail all stock moves, not only in your
warehouse but wherever else it's taken as well (customers, suppliers or manufacturing
warehouse but wherever else it's taken as well (customers, vendors or manufacturing
locations).</p>
</blockquote>
</li>