[MERGE] English typos
bzr revid: fp@openerp.com-20121102173850-nvj56rd5c8gp3k8x
This commit is contained in:
commit
015aa35395
|
@ -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',
|
||||
|
|
|
@ -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"/>
|
||||
|
|
|
@ -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),
|
||||
}
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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',
|
||||
|
|
|
@ -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()
|
||||
|
||||
|
|
Loading…
Reference in New Issue