summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Dony <odo@openerp.com>2015-01-26 11:21:28 +0100
committerOlivier Dony <odo@openerp.com>2015-01-26 11:27:01 +0100
commit6ebdcbd2cdf64257d163d69caaeb20c176a2c823 (patch)
treed83e8c341d5cef3b19bd9ced4c990ebefcb5dc2e
parent9b749d4d795200ee6d21da965b45617f7f0daa7c (diff)
[FIX] account: misleading labels/tooltips on new fiscal position fields
-rw-r--r--addons/account/partner.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/account/partner.py b/addons/account/partner.py
index c0a1a695e0c..e23a2436c72 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -37,10 +37,10 @@ class account_fiscal_position(osv.osv):
'account_ids': fields.one2many('account.fiscal.position.account', 'position_id', 'Account Mapping', copy=True),
'tax_ids': fields.one2many('account.fiscal.position.tax', 'position_id', 'Tax Mapping', copy=True),
'note': fields.text('Notes'),
- 'auto_apply': fields.boolean('Automatic', help="Apply automatically this fiscal position."),
+ 'auto_apply': fields.boolean('Automatic', help="Apply automatically this fiscal position if the conditions match."),
'vat_required': fields.boolean('VAT required', help="Apply only if partner has a VAT number."),
- 'country_id': fields.many2one('res.country', 'Countries', help="Apply only if delivery or invoicing country match."),
- 'country_group_id': fields.many2one('res.country.group', 'Country Group', help="Apply only if delivery or invocing country match the group."),
+ 'country_id': fields.many2one('res.country', 'Country', help="Apply when the shipping or invoicing country matches. Takes precedence over positions matching on a country group."),
+ 'country_group_id': fields.many2one('res.country.group', 'Country Group', help="Apply when the shipping or invoicing country is in this country group, and no position matches the country directly."),
}
_defaults = {