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

[IMP] account,sale,purchase: typo 'Payment Term' -> 'Payment Terms'

Browse Source
This commit is contained in:
Yannick Tivisse
2016-08-30 13:20:23 +02:00
parent 8c08a9be10
commit 4b60d5c1bd
9 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/data/account_data.xml
+1 -1
View File
@@ -32,7 +32,7 @@
</record>
<record forcecreate="True" id="decimal_payment" model="decimal.precision">
<field name="name">Payment Term</field>
<field name="name">Payment Terms</field>
<field name="digits">6</field>
</record>
addons/account/models/account_invoice.py
+4 -4
View File
@@ -244,7 +244,7 @@ class AccountInvoice(models.Model):
partner_id = fields.Many2one('res.partner', string='Partner', change_default=True,
required=True, readonly=True, states={'draft': [('readonly', False)]},
track_visibility='always')
payment_term_id = fields.Many2one('account.payment.term', string='Payment Term', oldname='payment_term',
payment_term_id = fields.Many2one('account.payment.term', string='Payment Terms', oldname='payment_term',
readonly=True, states={'draft': [('readonly', False)]},
help="If you use payment terms, the due date will be computed automatically at the generation "
"of accounting entries. If you keep the payment term and the due date empty, it means direct payment. "
@@ -1324,7 +1324,7 @@ class AccountPaymentTerm(models.Model):
def _default_line_ids(self):
return [(0, 0, {'value': 'balance', 'value_amount': 0.0, 'sequence': 9, 'days': 0, 'option': 'day_after_invoice_date'})]
name = fields.Char(string='Payment Term', translate=True, required=True)
name = fields.Char(string='Payment Terms', translate=True, required=True)
active = fields.Boolean(default=True, help="If the active field is set to False, it will allow you to hide the payment term without removing it.")
note = fields.Text(string='Description on the Invoice', translate=True)
line_ids = fields.One2many('account.payment.term.line', 'payment_id', string='Terms', copy=True, default=_default_line_ids)
@@ -1399,14 +1399,14 @@ class AccountPaymentTermLine(models.Model):
],
default='day_after_invoice_date', required=True, string='Options'
)
payment_id = fields.Many2one('account.payment.term', string='Payment Term', required=True, index=True, ondelete='cascade')
payment_id = fields.Many2one('account.payment.term', string='Payment Terms', required=True, index=True, ondelete='cascade')
sequence = fields.Integer(default=10, help="Gives the sequence order when displaying a list of payment term lines.")
@api.one
@api.constrains('value', 'value_amount')
def _check_percent(self):
if self.value == 'percent' and (self.value_amount < 0.0 or self.value_amount > 100.0):
raise ValidationError(_('Percentages for Payment Term Line must be between 0 and 100.'))
raise ValidationError(_('Percentages for Payment Terms Line must be between 0 and 100.'))
@api.onchange('option')
def _onchange_option(self):
addons/account/models/partner.py
+2 -2
View File
@@ -401,10 +401,10 @@ class ResPartner(models.Model):
string="Fiscal Position",
help="The fiscal position will determine taxes and accounts used for the partner.", oldname="property_account_position")
property_payment_term_id = fields.Many2one('account.payment.term', company_dependent=True,
string ='Customer Payment Term',
string='Customer Payment Terms',
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 ='Vendor Payment Term',
string='Vendor Payment Terms',
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")
addons/account/report/account_invoice_report.py
+1 -1
View File
@@ -32,7 +32,7 @@ class AccountInvoiceReport(models.Model):
product_id = fields.Many2one('product.product', string='Product', readonly=True)
product_qty = fields.Float(string='Product Quantity', readonly=True)
uom_name = fields.Char(string='Reference Unit of Measure', readonly=True)
payment_term_id = fields.Many2one('account.payment.term', string='Payment Term', oldname='payment_term', readonly=True)
payment_term_id = fields.Many2one('account.payment.term', string='Payment Terms', oldname='payment_term', readonly=True)
fiscal_position_id = fields.Many2one('account.fiscal.position', oldname='fiscal_position', string='Fiscal Position', readonly=True)
currency_id = fields.Many2one('res.currency', string='Currency', readonly=True)
categ_id = fields.Many2one('product.category', string='Product Category', readonly=True)
addons/account/views/account_view.xml
+5 -5
View File
@@ -1446,7 +1446,7 @@
<field name="name">account.payment.term.line.tree</field>
<field name="model">account.payment.term.line</field>
<field name="arch" type="xml">
<tree string="Payment Term">
<tree string="Payment Terms">
<field name="sequence" widget="handle"/>
<field name="value" string="Due Type"/>
<field name="value_amount" attrs="{'readonly':[('value','=','balance')]}"/>
@@ -1459,7 +1459,7 @@
<field name="name">account.payment.term.line.form</field>
<field name="model">account.payment.term.line</field>
<field name="arch" type="xml">
<form string="Payment Term">
<form string="Payment Terms">
<group>
<group string="Term Type">
<field name="value" widget="radio"/>
@@ -1488,8 +1488,8 @@
<field name="name">account.payment.term.search</field>
<field name="model">account.payment.term</field>
<field name="arch" type="xml">
<search string="Payment Term">
<field name="name" string="Payment Term"/>
<search string="Payment Terms">
<field name="name" string="Payment Terms"/>
<field name="active"/>
</search>
</field>
@@ -1498,7 +1498,7 @@
<field name="name">account.payment.term.form</field>
<field name="model">account.payment.term</field>
<field name="arch" type="xml">
<form string="Payment Term">
<form string="Payment Terms">
<group col="4">
<field name="name"/>
<field name="active"/>
addons/purchase/models/purchase.py
+1 -1
View File
@@ -145,7 +145,7 @@ class PurchaseOrder(models.Model):
amount_total = fields.Monetary(string='Total', store=True, readonly=True, compute='_amount_all')
fiscal_position_id = fields.Many2one('account.fiscal.position', string='Fiscal Position', oldname='fiscal_position')
payment_term_id = fields.Many2one('account.payment.term', 'Payment Term')
payment_term_id = fields.Many2one('account.payment.term', 'Payment Terms')
incoterm_id = fields.Many2one('stock.incoterms', 'Incoterm', states={'done': [('readonly', True)]}, help="International Commercial Terms are a series of predefined commercial terms used in international transactions.")
product_id = fields.Many2one('product.product', related='order_line.product_id', string='Product')
addons/report_intrastat/report/report_intrastat_invoice_template.xml
+1 -1
View File
@@ -125,7 +125,7 @@
<span t-field="o.comment"/>
</p>
<p t-if="o.payment_term_id">
<strong>Payment Term:</strong>
<strong>Payment Terms:</strong>
<span t-field="o.payment_term_id"/>
</p>
<p t-if="o.fiscal_position_id">
addons/sale/models/sale.py
+1 -1
View File
@@ -142,7 +142,7 @@ class SaleOrder(models.Model):
amount_tax = fields.Monetary(string='Taxes', store=True, readonly=True, compute='_amount_all', track_visibility='always')
amount_total = fields.Monetary(string='Total', store=True, readonly=True, compute='_amount_all', track_visibility='always')
payment_term_id = fields.Many2one('account.payment.term', string='Payment Term', oldname='payment_term')
payment_term_id = fields.Many2one('account.payment.term', string='Payment Terms', oldname='payment_term')
fiscal_position_id = fields.Many2one('account.fiscal.position', oldname='fiscal_position', string='Fiscal Position')
company_id = fields.Many2one('res.company', 'Company', default=lambda self: self.env['res.company']._company_default_get('sale.order'))
team_id = fields.Many2one('crm.team', 'Sales Team', change_default=True, default=_get_default_team, oldname='section_id')
addons/sale/report/sale_report_templates.xml
+1 -1
View File
@@ -46,7 +46,7 @@
<p t-field="doc.user_id"/>
</div>
<div name="payment_term" t-if="doc.payment_term_id" class="col-xs-3">
<strong>Payment Term:</strong>
<strong>Payment Terms:</strong>
<p t-field="doc.payment_term_id"/>
</div>
</div>