Twinkle Christian(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-terminology_batch2-contacts-tch into
lp:~openerp-dev/openobject-addons/trunk-terminology_batch2.
Requested reviews:
Purnendu Singh (OpenERP) (psi-tinyerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-terminology_batch2-contacts-tch/+merge/131344
Hello sir,
I have Improved tooltips in contacts.
Kindly Review this.
Thanks,
TCH.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-terminology_batch2-contacts-tch/+merge/131344
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-terminology_batch2.
=== modified file 'account/partner.py'
--- account/partner.py 2012-09-29 12:01:24 +0000
+++ account/partner.py 2012-10-31 12:01:36 +0000
@@ -209,7 +209,7 @@
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',
=== modified file 'base_vat/base_vat_view.xml'
--- base_vat/base_vat_view.xml 2012-10-08 10:52:22 +0000
+++ base_vat/base_vat_view.xml 2012-10-31 12:01:36 +0000
@@ -9,7 +9,7 @@
<field name="arch" type="xml">
<field name="property_account_position" position="after" version="7.0">
<label for="vat"/>
- <div>
+ <div name="vat_info">
<field name="vat" on_change="vat_change(vat)" placeholder="e.g. BE0477472701" class="oe_inline"/>
<button colspan="2" name="button_check_vat" string="Check Validity" type="object" icon="gtk-execute" class="oe_inline"/>
<field name="vat_subjected" class="oe_inline"/>
=== modified file 'event/res_partner.py'
--- event/res_partner.py 2012-10-02 10:29:15 +0000
+++ event/res_partner.py 2012-10-31 12:01:36 +0000
@@ -25,7 +25,7 @@
_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),
}
=== modified file 'l10n_ro/partner_view.xml'
--- l10n_ro/partner_view.xml 2012-08-08 13:06:14 +0000
+++ l10n_ro/partner_view.xml 2012-10-31 12:01:36 +0000
@@ -6,9 +6,9 @@
<field name="inherit_id" ref="base_vat.view_partner_form"/>
<field name="model">res.partner</field>
<field name="arch" type="xml">
- <field name="vat" position="after">
+ <xpath expr="//div[@name='vat_info']" position="after">
<field name="nrc"/>
- </field>
+ </xpath>
</field>
</record>
</data>
=== modified file 'membership/membership.py'
--- membership/membership.py 2012-10-12 11:42:58 +0000
+++ membership/membership.py 2012-10-31 12:01:36 +0000
@@ -317,7 +317,7 @@
_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 @@
'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',
=== modified file 'sale_journal/sale_journal.py'
--- sale_journal/sale_journal.py 2012-09-12 13:26:46 +0000
+++ sale_journal/sale_journal.py 2012-10-31 12:01:36 +0000
@@ -50,7 +50,7 @@
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()
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
