[MERGE] [IMP] crm_phonecall, membership, point_of_sale, purchase, purchase_requisitions: minor usability improvements: improved some help tooltips
bzr revid: tde@openerp.com-20130821122501-7hemnjrbm1oob7v3
This commit is contained in:
@@ -58,7 +58,7 @@ class crm_phonecall(base_state, osv.osv):
|
||||
# phonecall fields
|
||||
'name': fields.char('Call Summary', size=64, required=True),
|
||||
'active': fields.boolean('Active', required=False),
|
||||
'duration': fields.float('Duration', help="Duration in Minutes"),
|
||||
'duration': fields.float('Duration', help='Duration in minutes and seconds.'),
|
||||
'categ_id': fields.many2one('crm.case.categ', 'Category', \
|
||||
domain="['|',('section_id','=',section_id),('section_id','=',False),\
|
||||
('object_id.model', '=', 'crm.phonecall')]"),
|
||||
|
||||
@@ -102,7 +102,10 @@
|
||||
<group col="4">
|
||||
<field name="date"/>
|
||||
<field name="user_id"/>
|
||||
<field name="duration" widget="float_time"/>
|
||||
<label for="duration"/>
|
||||
<div>
|
||||
<field name="duration" widget="float_time" class="oe_inline" style="vertical-align:baseline"/> <b> min(s)</b>
|
||||
</div>
|
||||
<field name="section_id" colspan="1" widget="selection"
|
||||
groups="base.group_multi_salesteams"/>
|
||||
<field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
|
||||
|
||||
@@ -328,13 +328,13 @@ class Partner(osv.osv):
|
||||
'account.invoice': (_get_invoice_partner, ['state'], 10),
|
||||
'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 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.
|
||||
-Paying member: A member who has paid the membership fee."""),
|
||||
}, help='It indicates the membership state.\n'
|
||||
'-Non Member: A partner who has not applied for any membership.\n'
|
||||
'-Cancelled Member: A member who has cancelled his membership.\n'
|
||||
'-Old Member: A member whose membership date has expired.\n'
|
||||
'-Waiting Member: A member who has applied for the membership and whose invoice is going to be created.\n'
|
||||
'-Invoiced Member: A member whose invoice has been created.\n'
|
||||
'-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',
|
||||
|
||||
@@ -1352,7 +1352,7 @@ class product_product(osv.osv):
|
||||
'expense_pdt': fields.boolean('Point of Sale Cash Out', help="Check if, this is a product you can use to take cash from a statement for the point of sale backend, example: money lost, transfer to bank, etc."),
|
||||
'available_in_pos': fields.boolean('Available in the Point of Sale', help='Check if you want this product to appear in the Point of Sale'),
|
||||
'pos_categ_id': fields.many2one('pos.category','Point of Sale Category',
|
||||
help="The Point of Sale Category this products belongs to. Those categories are used to group similar products and are specific to the Point of Sale."),
|
||||
help="These products belong to those categories that are used to group similar products and are specific to the Point of Sale."),
|
||||
'to_weight' : fields.boolean('To Weight', help="Check if the product should be weighted (mainly used with self check-out interface)."),
|
||||
}
|
||||
|
||||
|
||||
@@ -199,9 +199,9 @@ class purchase_order(osv.osv):
|
||||
'invoiced_rate': fields.function(_invoiced_rate, string='Invoiced', type='float'),
|
||||
'invoice_method': fields.selection([('manual','Based on Purchase Order lines'),('order','Based on generated draft invoice'),('picking','Based on incoming shipments')], 'Invoicing Control', required=True,
|
||||
readonly=True, states={'draft':[('readonly',False)], 'sent':[('readonly',False)]},
|
||||
help="Based on Purchase Order lines: place individual lines in 'Invoice Control > Based on P.O. lines' from where you can selectively create an invoice.\n" \
|
||||
help="Based on Purchase Order lines: place individual lines in 'Invoice Control / On Purchase Order lines' from where you can selectively create an invoice.\n" \
|
||||
"Based on generated invoice: create a draft invoice you can validate later.\n" \
|
||||
"Bases on incoming shipments: let you create an invoice when receptions are validated."
|
||||
"Based on incoming shipments: let you create an invoice when receptions are validated."
|
||||
),
|
||||
'minimum_planned_date':fields.function(_minimum_planned_date, fnct_inv=_set_minimum_planned_date, string='Expected Date', type='date', select=True, help="This is computed as the minimum scheduled date of all purchase order lines' products.",
|
||||
store = {
|
||||
|
||||
@@ -37,7 +37,7 @@ class purchase_requisition(osv.osv):
|
||||
'date_start': fields.datetime('Requisition Date'),
|
||||
'date_end': fields.datetime('Requisition Deadline'),
|
||||
'user_id': fields.many2one('res.users', 'Responsible'),
|
||||
'exclusive': fields.selection([('exclusive','Purchase Requisition (exclusive)'),('multiple','Multiple Requisitions')],'Requisition Type', required=True, help="Purchase Requisition (exclusive): On the confirmation of a purchase order, it cancels the remaining purchase order.\nPurchase Requisition(Multiple): It allows to have multiple purchase orders.On confirmation of a purchase order it does not cancel the remaining orders"""),
|
||||
'exclusive': fields.selection([('exclusive','Purchase Requisition (exclusive)'),('multiple','Multiple Requisitions')],'Requisition Type', required=True, help="Purchase Requisition (exclusive): On the confirmation of a purchase order, it cancels the remaining purchase order.\nMultiple Requisitions: It allows to have multiple purchase orders.On confirmation of a purchase order it does not cancel the remaining orders"""),
|
||||
'description': fields.text('Description'),
|
||||
'company_id': fields.many2one('res.company', 'Company', required=True),
|
||||
'purchase_ids' : fields.one2many('purchase.order','requisition_id','Purchase Orders',states={'done': [('readonly', True)]}),
|
||||
|
||||
Reference in New Issue
Block a user