From 9222f2b039f2b875edb85715193d668573853487 Mon Sep 17 00:00:00 2001 From: "Twinkle Christian (OpenERP)" Date: Tue, 23 Oct 2012 17:31:42 +0530 Subject: [PATCH 1/4] [IMP]Improve tooltip in contacts bzr revid: tch@tinyerp.com-20121023120142-smuat2dqf5vomvv8 --- addons/account/partner.py | 2 +- addons/membership/membership.py | 6 +++--- addons/sale_journal/sale_journal.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/account/partner.py b/addons/account/partner.py index a9b2b99588d..3355363308b 100644 --- a/addons/account/partner.py +++ b/addons/account/partner.py @@ -209,7 +209,7 @@ class res_partner(osv.osv): relation='account.fiscal.position', string="Fiscal Position", view_load=True, - help="The fiscal position will determine taxes and the accounts used for the partner.", + help="The fiscal position will determine taxes and accounts used for the partner.", ), 'property_payment_term': fields.property( 'account.payment.term', diff --git a/addons/membership/membership.py b/addons/membership/membership.py index 87af723f2f9..2399d4694ee 100644 --- a/addons/membership/membership.py +++ b/addons/membership/membership.py @@ -317,7 +317,7 @@ class Partner(osv.osv): _columns = { 'associate_member': fields.many2one('res.partner', 'Associate Member',help="A member with whom you want to associate your membership.It will consider the membership state of the associated member."), 'member_lines': fields.one2many('membership.membership_line', 'partner', 'Membership'), - 'free_member': fields.boolean('Free Member', help = "Select if you want to give membership free of cost."), + 'free_member': fields.boolean('Free Member', help = "Select if you want to give free membership."), 'membership_amount': fields.float( 'Membership Amount', digits=(16, 2), help = 'The price negotiated by the partner'), @@ -330,12 +330,12 @@ class Partner(osv.osv): 'membership.membership_line': (_get_partner_id, ['state'], 10), 'res.partner': (_get_partners, ['free_member', 'membership_state', 'associate_member'], 10) }, help="""It indicates the membership state. - -Non Member: A member who has not applied for any membership. + -Non Member: A partner who has not applied for any membership. -Cancelled Member: A member who has cancelled his membership. -Old Member: A member whose membership date has expired. -Waiting Member: A member who has applied for the membership and whose invoice is going to be created. -Invoiced Member: A member whose invoice has been created. - -Paid Member: A member who has paid the membership amount."""), + -Paying member: A member who has paid the membership fee."""), 'membership_start': fields.function( _membership_date, multi = 'membeship_start', string = 'Membership Start Date', type = 'date', diff --git a/addons/sale_journal/sale_journal.py b/addons/sale_journal/sale_journal.py index e0b6e50f4cf..59f9512b525 100644 --- a/addons/sale_journal/sale_journal.py +++ b/addons/sale_journal/sale_journal.py @@ -50,7 +50,7 @@ class res_partner(osv.osv): string = "Invoicing Type", view_load = True, group_name = "Accounting Properties", - help = "This invoicing type will be used, by default, for invoicing the current partner."), + help = "This invoicing type will be used, by default, to invoice the current partner."), } res_partner() From f76521b53147d62afdbe82ed545f8f34f0ab19ed Mon Sep 17 00:00:00 2001 From: "Twinkle Christian (OpenERP)" Date: Wed, 31 Oct 2012 12:30:40 +0530 Subject: [PATCH 2/4] [FIX]fix tooltip bzr revid: tch@tinyerp.com-20121031070040-2lga67jkp11ogoqe --- addons/event/res_partner.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/event/res_partner.py b/addons/event/res_partner.py index c33bdf67540..140db4ceb47 100644 --- a/addons/event/res_partner.py +++ b/addons/event/res_partner.py @@ -25,7 +25,7 @@ class res_partner(osv.osv): _inherit = 'res.partner' _columns = { - 'speaker': fields.boolean('Speaker'), + 'speaker': fields.boolean('Speaker', help="Check this box if this contact is a speaker"), 'event_ids': fields.one2many('event.event','main_speaker_id', readonly=True), 'event_registration_ids': fields.one2many('event.registration','partner_id', readonly=True), } From c010b4fe8a584156344a098d6f9c01abea543c30 Mon Sep 17 00:00:00 2001 From: "Twinkle Christian (OpenERP)" Date: Wed, 31 Oct 2012 16:30:34 +0530 Subject: [PATCH 3/4] [FIX]fix tooltip bzr revid: tch@tinyerp.com-20121031110034-e8z4xj4v8lpus2x6 --- addons/event/res_partner.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/event/res_partner.py b/addons/event/res_partner.py index 140db4ceb47..17cf5216074 100644 --- a/addons/event/res_partner.py +++ b/addons/event/res_partner.py @@ -25,7 +25,7 @@ class res_partner(osv.osv): _inherit = 'res.partner' _columns = { - 'speaker': fields.boolean('Speaker', help="Check this box if this contact is a speaker"), + 'speaker': fields.boolean('Speaker', help="Check this box if this contact is a speaker."), 'event_ids': fields.one2many('event.event','main_speaker_id', readonly=True), 'event_registration_ids': fields.one2many('event.registration','partner_id', readonly=True), } From 7dbe811765f800d6073af88f50bebccd250b5ace Mon Sep 17 00:00:00 2001 From: "Twinkle Christian (OpenERP)" Date: Wed, 31 Oct 2012 17:28:42 +0530 Subject: [PATCH 4/4] [IMP]Change nrc field place and give label to nrc field bzr revid: tch@tinyerp.com-20121031115842-wmdahi1027eqzcc3 --- addons/base_vat/base_vat_view.xml | 2 +- addons/l10n_ro/partner_view.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/base_vat/base_vat_view.xml b/addons/base_vat/base_vat_view.xml index 6d15099dc5a..e5d8d9c92aa 100644 --- a/addons/base_vat/base_vat_view.xml +++ b/addons/base_vat/base_vat_view.xml @@ -9,7 +9,7 @@