From 3fa45da18751627b84f162b670f7167cec26bcea Mon Sep 17 00:00:00 2001 From: "Twinkle Christian (OpenERP)" Date: Tue, 23 Oct 2012 17:34:15 +0530 Subject: [PATCH 1/5] [IMP]Improve tooltip in Quatation bzr revid: tch@tinyerp.com-20121023120415-b3eo9x5248hr6n7i --- addons/crm_claim/crm_claim.py | 4 ++-- addons/crm_helpdesk/crm_helpdesk.py | 4 ++-- addons/project/project.py | 2 +- addons/sale/sale.py | 2 +- addons/sale_margin/sale_margin.py | 2 +- addons/sale_order_dates/sale_order_dates.py | 4 ++-- addons/sale_stock/sale_stock.py | 11 ++++------- 7 files changed, 13 insertions(+), 16 deletions(-) diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py index 60cde56ae1d..d9ef2a90250 100644 --- a/addons/crm_claim/crm_claim.py +++ b/addons/crm_claim/crm_claim.py @@ -96,13 +96,13 @@ class crm_claim(base_stage, osv.osv): 'user_id': fields.many2one('res.users', 'Responsible'), 'user_fault': fields.char('Trouble Responsible', size=64), 'section_id': fields.many2one('crm.case.section', 'Sales Team', \ - select=True, help="Sales team to which Case belongs to."\ + select=True, help="Responsible sales team."\ "Define Responsible user and Email account for"\ " mail gateway."), 'company_id': fields.many2one('res.company', 'Company'), 'partner_id': fields.many2one('res.partner', 'Partner'), 'email_cc': fields.text('Watchers Emails', size=252, help="These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma"), - 'email_from': fields.char('Email', size=128, help="These people will receive email."), + 'email_from': fields.char('Email', size=128, help="Destination email for email gateway."), 'partner_phone': fields.char('Phone', size=32), 'stage_id': fields.many2one ('crm.claim.stage', 'Stage', domain="['|', ('section_ids', '=', section_id), ('case_default', '=', True)]"), diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py index ceffd282aa8..da75141f9b5 100644 --- a/addons/crm_helpdesk/crm_helpdesk.py +++ b/addons/crm_helpdesk/crm_helpdesk.py @@ -53,13 +53,13 @@ class crm_helpdesk(base_state, base_stage, osv.osv): 'date_deadline': fields.date('Deadline'), 'user_id': fields.many2one('res.users', 'Responsible'), 'section_id': fields.many2one('crm.case.section', 'Sales Team', \ - select=True, help='Sales team to which Case belongs to.\ + select=True, help='Responsible sales team.\ Define Responsible user and Email account for mail gateway.'), 'company_id': fields.many2one('res.company', 'Company'), 'date_closed': fields.datetime('Closed', readonly=True), 'partner_id': fields.many2one('res.partner', 'Partner'), 'email_cc': fields.text('Watchers Emails', size=252 , help="These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma"), - 'email_from': fields.char('Email', size=128, help="These people will receive email."), + 'email_from': fields.char('Email', size=128, help="Destination email for email gateway"), 'date': fields.datetime('Date'), 'ref' : fields.reference('Reference', selection=crm._links_get, size=128), 'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128), diff --git a/addons/project/project.py b/addons/project/project.py index 56d7fef0e49..0ab7eedf5a7 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -1289,7 +1289,7 @@ class account_analytic_account(osv.osv): _inherit = 'account.analytic.account' _description = 'Analytic Account' _columns = { - 'use_tasks': fields.boolean('Tasks',help="If check,this contract will be available in the project menu and you will be able to manage tasks or track issues"), + 'use_tasks': fields.boolean('Tasks',help="If checked,this contract will be available in the project menu and you will be able to manage tasks or track issues"), 'company_uom_id': fields.related('company_id', 'project_time_mode_id', type='many2one', relation='product.uom'), } diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 222426f881b..7bfeedd18b1 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -717,7 +717,7 @@ class sale_order_line(osv.osv): 'invoiced': fields.boolean('Invoiced', readonly=True), 'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Product Price'), readonly=True, states={'draft': [('readonly', False)]}), 'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Procurement Method', required=True, readonly=True, states={'draft': [('readonly', False)]}, - help="If 'on order', it triggers a procurement when the sale order is confirmed to create a task, purchase order or manufacturing order linked to this sale order line."), + help=" From stock: When needed, the product is taken from the stock or we wait for replenishment. On order: When needed, the product is purchased or produced."), 'price_subtotal': fields.function(_amount_line, string='Subtotal', digits_compute= dp.get_precision('Account')), 'tax_id': fields.many2many('account.tax', 'sale_order_tax', 'order_line_id', 'tax_id', 'Taxes', readonly=True, states={'draft': [('readonly', False)]}), 'address_allotment_id': fields.many2one('res.partner', 'Allotment Partner'), diff --git a/addons/sale_margin/sale_margin.py b/addons/sale_margin/sale_margin.py index 64e07276c08..bbb2df673ff 100644 --- a/addons/sale_margin/sale_margin.py +++ b/addons/sale_margin/sale_margin.py @@ -73,7 +73,7 @@ class sale_order(osv.osv): return super(sale_order, self)._get_order(cr, uid, ids, context=context) _columns = { - 'margin': fields.function(_product_margin, string='Margin', help="It gives profitability by calculating the difference between the Unit Price and Cost Price.", store={ + 'margin': fields.function(_product_margin, string='Margin', help="It gives profitability by calculating the difference between the Unit Price and the cost price.", store={ 'sale.order.line': (_get_order, ['margin'], 20), 'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 20), }), diff --git a/addons/sale_order_dates/sale_order_dates.py b/addons/sale_order_dates/sale_order_dates.py index 1b069cb2bed..f8e0257ab33 100644 --- a/addons/sale_order_dates/sale_order_dates.py +++ b/addons/sale_order_dates/sale_order_dates.py @@ -54,8 +54,8 @@ class sale_order_dates(osv.osv): return res _columns = { - 'commitment_date': fields.function(_get_commitment_date, store=True, type='date', string='Commitment Date', help="Date on which delivery of products is to be made."), - 'requested_date': fields.date('Requested Date', help="Date on which customer has requested for sales."), + 'commitment_date': fields.function(_get_commitment_date, store=True, type='date', string='Commitment Date', help="Committed date for delivery"), + 'requested_date': fields.date('Requested Date', help="Date requested by the customer for the sale."), 'effective_date': fields.function(_get_effective_date, type='date', store=True, string='Effective Date',help="Date on which picking is created."), } diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py index 9611c97ac60..fc8f7913a01 100644 --- a/addons/sale_stock/sale_stock.py +++ b/addons/sale_stock/sale_stock.py @@ -127,19 +127,16 @@ class sale_order(osv.osv): \nThe exception state is automatically set when a cancel operation occurs \ in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception).\nThe 'Waiting Schedule' state is set when the invoice is confirmed\ but waiting for the scheduler to run on the order date.", select=True), - 'incoterm': fields.many2one('stock.incoterms', 'Incoterm', help="Incoterm which stands for 'International Commercial terms' implies its a series of sales terms which are used in the commercial transaction."), + 'incoterm': fields.many2one('stock.incoterms', 'Incoterm', help="International Commercial Terms are a series of predefined commercial terms used in international transactions."), 'picking_policy': fields.selection([('direct', 'Deliver each product when available'), ('one', 'Deliver all products at once')], 'Shipping Policy', required=True, readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, - help="""If you don't have enough stock available to deliver all at once, do you accept partial shipments or not?"""), + help="""Pick 'Deliver each product when available' if you allow partial delivery"""), 'order_policy': fields.selection([ ('manual', 'On Demand'), ('picking', 'On Delivery Order'), ('prepaid', 'Before Delivery'), ], 'Create Invoice', required=True, readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, - help="""This field controls how invoice and delivery operations are synchronized. - - With 'On Demand', the invoice is created manually when needed. - - With 'On Delivery Order', a draft invoice is generated after all pickings have been processed. - - With 'Before Delivery', a draft invoice is created, and it must be paid before delivery."""), + help="""On demand: A draft invoice can be created from the sales order when needed. On delivery order: A draft invoice can be created from the delivery order when the products have been delivered. Before delivery: A draft invoice is created from the sales order and must be paid before the products can be delivered."""), 'picking_ids': fields.one2many('stock.picking.out', 'sale_id', 'Related Picking', readonly=True, help="This is a list of delivery orders that has been generated for this sales order."), 'shipped': fields.boolean('Delivered', readonly=True, help="It indicates that the sales order has been delivered. This field is updated only after the scheduler(s) have been launched."), 'picked_rate': fields.function(_picked_rate, string='Picked', type='float'), @@ -488,7 +485,7 @@ class sale_order_line(osv.osv): _inherit = 'sale.order.line' _columns = { - 'delay': fields.float('Delivery Lead Time', required=True, help="Number of days between the order confirmation the shipping of the products to the customer", readonly=True, states={'draft': [('readonly', False)]}), + 'delay': fields.float('Delivery Lead Time', required=True, help="Number of days between the order confirmation and the shipping of the products to the customer", readonly=True, states={'draft': [('readonly', False)]}), 'procurement_id': fields.many2one('procurement.order', 'Procurement'), 'property_ids': fields.many2many('mrp.property', 'sale_order_line_property_rel', 'order_id', 'property_id', 'Properties', readonly=True, states={'draft': [('readonly', False)]}), 'product_packaging': fields.many2one('product.packaging', 'Packaging'), From 4fa627b0a0b2db15f08467f511e54308ce698434 Mon Sep 17 00:00:00 2001 From: "Twinkle Christian (OpenERP)" Date: Mon, 29 Oct 2012 17:13:28 +0530 Subject: [PATCH 2/5] [FIX]Imporve tooltip if sales team bzr revid: tch@tinyerp.com-20121029114328-frwb4wtz45zu3vwm --- addons/crm_helpdesk/crm_helpdesk.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py index cd54a1f8a5c..368003a65c0 100644 --- a/addons/crm_helpdesk/crm_helpdesk.py +++ b/addons/crm_helpdesk/crm_helpdesk.py @@ -53,8 +53,7 @@ class crm_helpdesk(base_state, base_stage, osv.osv): 'date_deadline': fields.date('Deadline'), 'user_id': fields.many2one('res.users', 'Responsible'), 'section_id': fields.many2one('crm.case.section', 'Sales Team', \ - select=True, help='Responsible sales team.\ - Define Responsible user and Email account for mail gateway.'), + select=True, help='Responsible sales team.Define Responsible user and Email account for mail gateway.'), 'company_id': fields.many2one('res.company', 'Company'), 'date_closed': fields.datetime('Closed', readonly=True), 'partner_id': fields.many2one('res.partner', 'Partner'), From 107ef7a51b9c642726c28d8f882dafc1b20cb5c3 Mon Sep 17 00:00:00 2001 From: "Twinkle Christian (OpenERP)" Date: Wed, 31 Oct 2012 16:33:26 +0530 Subject: [PATCH 3/5] [FIX]fix tooltip bzr revid: tch@tinyerp.com-20121031110326-r1mofl1t4ajsh4b9 --- addons/sale/sale.py | 4 ++-- addons/sale_journal/sale_journal.py | 2 +- addons/sale_order_dates/sale_order_dates.py | 2 +- addons/sale_stock/sale_stock.py | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 6e8c417492b..aa6512f1df6 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -717,10 +717,10 @@ class sale_order_line(osv.osv): 'invoiced': fields.boolean('Invoiced', readonly=True), 'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Product Price'), readonly=True, states={'draft': [('readonly', False)]}), 'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Procurement Method', required=True, readonly=True, states={'draft': [('readonly', False)]}, - help=" From stock: When needed, the product is taken from the stock or we wait for replenishment. On order: When needed, the product is purchased or produced."), + help=" From stock: When needed, the product is taken from the stock or we wait for replenishment.\n On order: When needed, the product is purchased or produced."), 'price_subtotal': fields.function(_amount_line, string='Subtotal', digits_compute= dp.get_precision('Account')), 'tax_id': fields.many2many('account.tax', 'sale_order_tax', 'order_line_id', 'tax_id', 'Taxes', readonly=True, states={'draft': [('readonly', False)]}), - 'address_allotment_id': fields.many2one('res.partner', 'Allotment Partner'), + 'address_allotment_id': fields.many2one('res.partner', 'Allotment Partner',help="A partner to whom the particular product needs to be allotted."), 'product_uom_qty': fields.float('Quantity', digits_compute= dp.get_precision('Product UoS'), required=True, readonly=True, states={'draft': [('readonly', False)]}), 'product_uom': fields.many2one('product.uom', 'Unit of Measure ', required=True, readonly=True, states={'draft': [('readonly', False)]}), 'product_uos_qty': fields.float('Quantity (UoS)' ,digits_compute= dp.get_precision('Product UoS'), readonly=True, states={'draft': [('readonly', False)]}), diff --git a/addons/sale_journal/sale_journal.py b/addons/sale_journal/sale_journal.py index e0b6e50f4cf..94cb9dd3fab 100644 --- a/addons/sale_journal/sale_journal.py +++ b/addons/sale_journal/sale_journal.py @@ -79,7 +79,7 @@ stock_picking_out() class sale(osv.osv): _inherit = "sale.order" _columns = { - 'invoice_type_id': fields.many2one('sale_journal.invoice.type', 'Invoice Type') + 'invoice_type_id': fields.many2one('sale_journal.invoice.type', 'Invoice Type', help="Generate invoice based on the selected option.") } def _prepare_order_picking(self, cr, uid, order, context=None): diff --git a/addons/sale_order_dates/sale_order_dates.py b/addons/sale_order_dates/sale_order_dates.py index f8e0257ab33..49e10eab787 100644 --- a/addons/sale_order_dates/sale_order_dates.py +++ b/addons/sale_order_dates/sale_order_dates.py @@ -54,7 +54,7 @@ class sale_order_dates(osv.osv): return res _columns = { - 'commitment_date': fields.function(_get_commitment_date, store=True, type='date', string='Commitment Date', help="Committed date for delivery"), + 'commitment_date': fields.function(_get_commitment_date, store=True, type='date', string='Commitment Date', help="Committed date for delivery."), 'requested_date': fields.date('Requested Date', help="Date requested by the customer for the sale."), 'effective_date': fields.function(_get_effective_date, type='date', store=True, string='Effective Date',help="Date on which picking is created."), } diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py index 005875f68de..cd84f5baa3b 100644 --- a/addons/sale_stock/sale_stock.py +++ b/addons/sale_stock/sale_stock.py @@ -130,13 +130,13 @@ class sale_order(osv.osv): 'incoterm': fields.many2one('stock.incoterms', 'Incoterm', help="International Commercial Terms are a series of predefined commercial terms used in international transactions."), 'picking_policy': fields.selection([('direct', 'Deliver each product when available'), ('one', 'Deliver all products at once')], 'Shipping Policy', required=True, readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, - help="""Pick 'Deliver each product when available' if you allow partial delivery"""), + help="""Pick 'Deliver each product when available' if you allow partial delivery."""), 'order_policy': fields.selection([ ('manual', 'On Demand'), ('picking', 'On Delivery Order'), ('prepaid', 'Before Delivery'), ], 'Create Invoice', required=True, readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, - help="""On demand: A draft invoice can be created from the sales order when needed. On delivery order: A draft invoice can be created from the delivery order when the products have been delivered. Before delivery: A draft invoice is created from the sales order and must be paid before the products can be delivered."""), + help="""On demand: A draft invoice can be created from the sales order when needed. \nOn delivery order: A draft invoice can be created from the delivery order when the products have been delivered. \nBefore delivery: A draft invoice is created from the sales order and must be paid before the products can be delivered."""), 'picking_ids': fields.one2many('stock.picking.out', 'sale_id', 'Related Picking', readonly=True, help="This is a list of delivery orders that has been generated for this sales order."), 'shipped': fields.boolean('Delivered', readonly=True, help="It indicates that the sales order has been delivered. This field is updated only after the scheduler(s) have been launched."), 'picked_rate': fields.function(_picked_rate, string='Picked', type='float'), From d3f5f663c3fb85839d634167560605c70a14d698 Mon Sep 17 00:00:00 2001 From: "Twinkle Christian (OpenERP)" Date: Wed, 31 Oct 2012 18:38:08 +0530 Subject: [PATCH 4/5] [fix]tooltip bzr revid: tch@tinyerp.com-20121031130808-lmt4n8lcn1l1opln --- addons/sale/sale.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/sale/sale.py b/addons/sale/sale.py index aa6512f1df6..d25950885fa 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -717,7 +717,7 @@ class sale_order_line(osv.osv): 'invoiced': fields.boolean('Invoiced', readonly=True), 'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Product Price'), readonly=True, states={'draft': [('readonly', False)]}), 'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Procurement Method', required=True, readonly=True, states={'draft': [('readonly', False)]}, - help=" From stock: When needed, the product is taken from the stock or we wait for replenishment.\n On order: When needed, the product is purchased or produced."), + help="From stock: When needed, the product is taken from the stock or we wait for replenishment.\nOn order: When needed, the product is purchased or produced."), 'price_subtotal': fields.function(_amount_line, string='Subtotal', digits_compute= dp.get_precision('Account')), 'tax_id': fields.many2many('account.tax', 'sale_order_tax', 'order_line_id', 'tax_id', 'Taxes', readonly=True, states={'draft': [('readonly', False)]}), 'address_allotment_id': fields.many2one('res.partner', 'Allotment Partner',help="A partner to whom the particular product needs to be allotted."), From f9a5b741e2902efea7028ac1bd619f50aeb6630c Mon Sep 17 00:00:00 2001 From: "Twinkle Christian (OpenERP)" Date: Thu, 1 Nov 2012 10:49:57 +0530 Subject: [PATCH 5/5] [fix]tooltip bzr revid: tch@tinyerp.com-20121101051957-sycnv3b47vfemi9u --- addons/crm_claim/crm_claim.py | 2 +- addons/crm_helpdesk/crm_helpdesk.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py index a5be4405bfe..e4d5f5999cb 100644 --- a/addons/crm_claim/crm_claim.py +++ b/addons/crm_claim/crm_claim.py @@ -97,7 +97,7 @@ class crm_claim(base_stage, osv.osv): 'user_fault': fields.char('Trouble Responsible', size=64), 'section_id': fields.many2one('crm.case.section', 'Sales Team', \ select=True, help="Responsible sales team."\ - "Define Responsible user and Email account for"\ + " Define Responsible user and Email account for"\ " mail gateway."), 'company_id': fields.many2one('res.company', 'Company'), 'partner_id': fields.many2one('res.partner', 'Partner'), diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py index 368003a65c0..276dd0b4b49 100644 --- a/addons/crm_helpdesk/crm_helpdesk.py +++ b/addons/crm_helpdesk/crm_helpdesk.py @@ -53,7 +53,7 @@ class crm_helpdesk(base_state, base_stage, osv.osv): 'date_deadline': fields.date('Deadline'), 'user_id': fields.many2one('res.users', 'Responsible'), 'section_id': fields.many2one('crm.case.section', 'Sales Team', \ - select=True, help='Responsible sales team.Define Responsible user and Email account for mail gateway.'), + select=True, help='Responsible sales team. Define Responsible user and Email account for mail gateway.'), 'company_id': fields.many2one('res.company', 'Company'), 'date_closed': fields.datetime('Closed', readonly=True), 'partner_id': fields.many2one('res.partner', 'Partner'),