From c1d66e1ac53492e4ea87dde6edc9639f015e2f67 Mon Sep 17 00:00:00 2001 From: "uco (OpenERP)" Date: Tue, 22 Dec 2009 15:08:41 +0530 Subject: [PATCH] [IMP]: Generalization of tooltips: Added tooltips for 'origin' fields, renamed 'Ref' to 'Reference', Added same tooltips for same fields of 'account & account template' and 'tax & tax templates' bzr revid: uco@tinyerp.co.in-20091222093841-2uamhp6w0wkmcnk0 --- addons/account/account.py | 28 +++++++++++-------- addons/account/account_analytic_line.py | 2 +- addons/account/account_bank_statement.py | 2 +- addons/account/account_move_line.py | 2 +- addons/account/invoice.py | 2 +- .../wizard/wizard_crossovered_analytic.py | 2 +- addons/account_voucher/voucher.py | 2 +- addons/mrp/mrp.py | 6 ++-- addons/mrp_repair/mrp_repair.py | 6 ++-- addons/point_of_sale/pos.py | 4 +-- addons/purchase/purchase.py | 4 +-- addons/report_account/report_receivable.py | 2 +- addons/sale/sale.py | 6 ++-- addons/stock/stock.py | 4 +-- 14 files changed, 38 insertions(+), 34 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index d88c6219ec4..7bb0e7622d4 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -275,9 +275,13 @@ class account_account(osv.osv): ('consolidation', 'Consolidation'), ('other', 'Others'), ('closed', 'Closed'), - ], 'Internal Type', required=True,), - - 'user_type': fields.many2one('account.account.type', 'Account Type', required=True), + ], 'Internal Type', required=True, help="This type is used to differentiate types with "\ + "special effects in Open ERP: view can not have entries, consolidation are accounts that "\ + "can have children accounts for multi-company consolidations, payable/receivable are for "\ + "partners accounts (for debit/credit computations), closed for depreciated accounts."), + 'user_type': fields.many2one('account.account.type', 'Account Type', required=True, + help="These types are defined according to your country. The type contains more information "\ + "about the account and its specificities."), 'parent_id': fields.many2one('account.account', 'Parent', ondelete='cascade'), 'child_parent_ids': fields.one2many('account.account','parent_id','Children'), 'child_consol_ids': fields.many2many('account.account', 'account_account_consol_rel', 'child_id', 'parent_id', 'Consolidated Children'), @@ -762,7 +766,7 @@ class account_move(osv.osv): _columns = { 'name': fields.char('Number', size=64, required=True), - 'ref': fields.char('Ref', size=64), + 'ref': fields.char('Reference', size=64), 'period_id': fields.many2one('account.period', 'Period', required=True, states={'posted':[('readonly',True)]}), 'journal_id': fields.many2one('account.journal', 'Journal', required=True, states={'posted':[('readonly',True)]}), 'state': fields.selection([('draft','Draft'), ('posted','Posted')], 'State', required=True, readonly=True, @@ -1526,7 +1530,7 @@ class account_model(osv.osv): _description = "Account Model" _columns = { 'name': fields.char('Model Name', size=64, required=True, help="This is a model for recurring accounting entries"), - 'ref': fields.char('Ref', size=64), + 'ref': fields.char('Reference', size=64), 'journal_id': fields.many2one('account.journal', 'Journal', required=True), 'lines_id': fields.one2many('account.model.line', 'model_id', 'Model Entries'), 'legend' :fields.text('Legend',readonly=True,size=100), @@ -1586,7 +1590,7 @@ class account_model_line(osv.osv): 'model_id': fields.many2one('account.model', 'Model', required=True, ondelete="cascade", select=True), - 'ref': fields.char('Ref.', size=16), + 'ref': fields.char('Reference', size=16), 'amount_currency': fields.float('Amount Currency', help="The amount expressed in an optional other currency."), 'currency_id': fields.many2one('res.currency', 'Currency'), @@ -1615,7 +1619,7 @@ class account_subscription(osv.osv): _description = "Account Subscription" _columns = { 'name': fields.char('Name', size=64, required=True), - 'ref': fields.char('Ref', size=16), + 'ref': fields.char('Reference', size=16), 'model_id': fields.many2one('account.model', 'Model', required=True), 'date_start': fields.date('Start Date', required=True), @@ -1806,10 +1810,10 @@ class account_account_template(osv.osv): ('consolidation','Consolidation'), ('other','Others'), ('closed','Closed'), - ], 'Internal Type', required=True,help="This type is used to differenciate types with "\ + ], 'Internal Type', required=True,help="This type is used to differentiate types with "\ "special effects in Open ERP: view can not have entries, consolidation are accounts that "\ "can have children accounts for multi-company consolidations, payable/receivable are for "\ - "partners accounts (for debit/credit computations), closed for deprecated accounts."), + "partners accounts (for debit/credit computations), closed for depreciated accounts."), 'user_type': fields.many2one('account.account.type', 'Account Type', required=True, help="These types are defined according to your country. The type contains more information "\ "about the account and its specificities."), @@ -1994,14 +1998,14 @@ class account_tax_template(osv.osv): 'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', required=True), 'name': fields.char('Tax Name', size=64, required=True), 'sequence': fields.integer('Sequence', required=True, help="The sequence field is used to order the taxes lines from lower sequences to higher ones. The order is important if you have a tax that has several tax children. In this case, the evaluation order is important."), - 'amount': fields.float('Amount', required=True, digits=(14,4)), + 'amount': fields.float('Amount', required=True, digits=(14,4), help="For Tax Type percent enter % ratio between 0-1."), 'type': fields.selection( [('percent','Percent'), ('fixed','Fixed'), ('none','None'), ('code','Python Code')], 'Tax Type', required=True), - 'applicable_type': fields.selection( [('true','True'), ('code','Python Code')], 'Applicable Type', required=True), + 'applicable_type': fields.selection( [('true','True'), ('code','Python Code')], 'Applicable Type', required=True, help="If not applicable (computed through a Python code), the tax won't appear on the invoice."), 'domain':fields.char('Domain', size=32, help="This field is only used if you develop your own module allowing developers to create specific taxes in a custom domain."), 'account_collected_id':fields.many2one('account.account.template', 'Invoice Tax Account'), 'account_paid_id':fields.many2one('account.account.template', 'Refund Tax Account'), 'parent_id':fields.many2one('account.tax.template', 'Parent Tax Account', select=True), - 'child_depend':fields.boolean('Tax on Children', help="Indicates if the tax computation is based on the value computed for the computation of child taxes or based on the total amount."), + 'child_depend':fields.boolean('Tax on Children', help="Set if the tax computation is based on the computation of child taxes rather than on the total amount."), 'python_compute':fields.text('Python Code'), 'python_compute_inv':fields.text('Python Code (reverse)'), 'python_applicable':fields.text('Python Code'), diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py index 0b723b4c9e4..7c872669d8c 100644 --- a/addons/account/account_analytic_line.py +++ b/addons/account/account_analytic_line.py @@ -42,7 +42,7 @@ class account_analytic_line(osv.osv): 'journal_id' : fields.many2one('account.analytic.journal', 'Analytic Journal', required=True, ondelete='cascade', select=True), 'code' : fields.char('Code', size=8), 'user_id' : fields.many2one('res.users', 'User',), - 'ref': fields.char('Ref.', size=32), + 'ref': fields.char('Reference', size=32), } _defaults = { 'date': lambda *a: time.strftime('%Y-%m-%d'), diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index 1ebc3623f9b..096f33b2496 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -587,7 +587,7 @@ class account_bank_statement_line(osv.osv): 'move_ids': fields.many2many('account.move', 'account_bank_statement_line_move_rel', 'move_id','statement_id', 'Moves'), - 'ref': fields.char('Ref.', size=32), + 'ref': fields.char('Reference', size=32), 'note': fields.text('Notes'), 'reconcile_amount': fields.function(_reconcile_amount, string='Amount reconciled', method=True, type='float'), diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index f0639b9af0d..dacca142274 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -357,7 +357,7 @@ class account_move_line(osv.osv): 'account_id': fields.many2one('account.account', 'Account', required=True, ondelete="cascade", domain=[('type','<>','view'), ('type', '<>', 'closed')], select=2), 'move_id': fields.many2one('account.move', 'Move', ondelete="cascade", states={'valid':[('readonly',True)]}, help="The move of this entry line.", select=2), - 'ref': fields.char('Ref.', size=32), + 'ref': fields.char('Reference', size=32), 'statement_id': fields.many2one('account.bank.statement', 'Statement', help="The bank statement used for bank reconciliation", select=1), 'reconcile_id': fields.many2one('account.move.reconcile', 'Reconcile', readonly=True, ondelete='set null', select=2), 'reconcile_partial_id': fields.many2one('account.move.reconcile', 'Partial Reconcile', readonly=True, ondelete='set null', select=2), diff --git a/addons/account/invoice.py b/addons/account/invoice.py index 4e91fca92a4..76ab9a63182 100644 --- a/addons/account/invoice.py +++ b/addons/account/invoice.py @@ -1075,7 +1075,7 @@ class account_invoice_line(osv.osv): _columns = { 'name': fields.char('Description', size=256, required=True), 'origin': fields.char('Origin', size=256, help="Reference of the document that produced this invoice."), - 'invoice_id': fields.many2one('account.invoice', 'Invoice Ref', ondelete='cascade', select=True), + 'invoice_id': fields.many2one('account.invoice', 'Invoice Reference', ondelete='cascade', select=True), 'uos_id': fields.many2one('product.uom', 'Unit of Measure', ondelete='set null'), 'product_id': fields.many2one('product.product', 'Product', ondelete='set null'), 'account_id': fields.many2one('account.account', 'Account', required=True, domain=[('type','<>','view'), ('type', '<>', 'closed')], help="The income or expense account related to the selected product."), diff --git a/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py b/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py index d36f684bab4..58effcce3db 100644 --- a/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py +++ b/addons/account_analytic_plans/wizard/wizard_crossovered_analytic.py @@ -38,7 +38,7 @@ fields = { 'date1': {'string':'Start Date', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-01-01')}, 'date2': {'string':'End Date', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-%m-%d')}, 'journal_ids': {'string':'Analytic Journal', 'type':'many2many', 'relation':'account.analytic.journal'}, - 'ref' :{'string':'Analytic Account Ref.', 'type':'many2one', 'relation':'account.analytic.account','required':True}, + 'ref' :{'string':'Analytic Account Reference', 'type':'many2one', 'relation':'account.analytic.account','required':True}, 'empty_line': {'string':'Dont show empty lines', 'type':'boolean', 'default': lambda *a:False}, } diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py index b9c223dcb0a..459611aca43 100755 --- a/addons/account_voucher/voucher.py +++ b/addons/account_voucher/voucher.py @@ -487,7 +487,7 @@ class VoucherLine(osv.osv): 'partner_id': fields.many2one('res.partner', 'Partner', change_default=True), 'amount':fields.float('Amount'), 'type':fields.selection([('dr','Debit'),('cr','Credit')], 'Type'), - 'ref':fields.char('Ref.', size=32), + 'ref':fields.char('Reference', size=32), 'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account') } _defaults = { diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 84930f1ae69..12790a5d42b 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -186,7 +186,7 @@ class mrp_bom(osv.osv): 'date_start': fields.date('Valid From', help="Validity of this BoM or component. Keep empty if it's always valid."), 'date_stop': fields.date('Valid Until', help="Validity of this BoM or component. Keep empty if it's always valid."), 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of bills of material."), - 'position': fields.char('Internal Ref.', size=64, help="Reference to a position in an external plan."), + 'position': fields.char('Internal Reference', size=64, help="Reference to a position in an external plan."), 'product_id': fields.many2one('product.product', 'Product', required=True), 'product_uos_qty': fields.float('Product UOS Qty'), 'product_uos': fields.many2one('product.uom', 'Product UOS', help="Product UOS (Unit of Sale) is the unit of measurement for the invoicing and promotion of stock."), @@ -407,7 +407,7 @@ class mrp_production(osv.osv): _columns = { 'name': fields.char('Reference', size=64, required=True), - 'origin': fields.char('Origin', size=64), + 'origin': fields.char('Origin', size=64, help="Reference of the document that generated this production order request."), 'priority': fields.selection([('0','Not urgent'),('1','Normal'),('2','Urgent'),('3','Very Urgent')], 'Priority'), 'product_id': fields.many2one('product.product', 'Product', required=True, domain=[('type','<>','service')]), @@ -445,7 +445,7 @@ class mrp_production(osv.osv): 'cycle_total': fields.function(_production_calc, method=True, type='float', string='Total Cycles', multi='workorder'), 'sale_name': fields.function(_sale_name_calc, method=True, type='char', string='Sale Name'), - 'sale_ref': fields.function(_sale_ref_calc, method=True, type='char', string='Sale Ref'), + 'sale_ref': fields.function(_sale_ref_calc, method=True, type='char', string='Sale Reference'), 'company_id': fields.many2one('res.company','Company',required=True), } _defaults = { diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py index 51dd47aaf13..7ad80e3de22 100644 --- a/addons/mrp_repair/mrp_repair.py +++ b/addons/mrp_repair/mrp_repair.py @@ -73,7 +73,7 @@ class mrp_repair(osv.osv): return res _columns = { - 'name' : fields.char('Repair Ref',size=24, required=True), + 'name' : fields.char('Repair Reference',size=24, required=True), 'product_id': fields.many2one('product.product', string='Product to Repair', required=True, readonly=True, states={'draft':[('readonly',False)]}), 'partner_id' : fields.many2one('res.partner', 'Partner', select=True, help='This field allow you to choose the parner that will be invoiced and delivered'), 'address_id': fields.many2one('res.partner.address', 'Delivery Address', domain="[('partner_id','=',partner_id)]"), @@ -489,7 +489,7 @@ class mrp_repair_line(osv.osv, ProductChangeMixin): _columns = { 'name' : fields.char('Description',size=64,required=True), - 'repair_id': fields.many2one('mrp.repair', 'Repair Order Ref',ondelete='cascade', select=True), + 'repair_id': fields.many2one('mrp.repair', 'Repair Order Reference',ondelete='cascade', select=True), 'type': fields.selection([('add','Add'),('remove','Remove')],'Type', required=True), 'to_invoice': fields.boolean('To Invoice'), 'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok','=',True)], required=True), @@ -555,7 +555,7 @@ class mrp_repair_fee(osv.osv, ProductChangeMixin): return res _columns = { - 'repair_id': fields.many2one('mrp.repair', 'Repair Order Ref', required=True, ondelete='cascade', select=True), + 'repair_id': fields.many2one('mrp.repair', 'Repair Order Reference', required=True, ondelete='cascade', select=True), 'name': fields.char('Description', size=64, select=True,required=True), 'product_id': fields.many2one('product.product', 'Product'), 'product_uom_qty': fields.float('Quantity', digits=(16,2), required=True), diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py index 4cf8ef4ec56..156c42e25f6 100644 --- a/addons/point_of_sale/pos.py +++ b/addons/point_of_sale/pos.py @@ -826,7 +826,7 @@ class pos_order_line(osv.osv): 'qty': fields.float('Quantity'), 'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal'), 'discount': fields.float('Discount (%)', digits=(16, 2)), - 'order_id': fields.many2one('pos.order', 'Order Ref', ondelete='cascade'), + 'order_id': fields.many2one('pos.order', 'Order Reference', ondelete='cascade'), 'create_date': fields.datetime('Creation Date', readonly=True), } @@ -922,7 +922,7 @@ class pos_payment(osv.osv): _columns = { 'name': fields.char('Description', size=64), - 'order_id': fields.many2one('pos.order', 'Order Ref', required=True, ondelete='cascade'), + 'order_id': fields.many2one('pos.order', 'Order Reference', required=True, ondelete='cascade'), 'journal_id': fields.many2one('account.journal', "Journal", required=True), 'payment_id': fields.many2one('account.payment.term','Payment Term', select=True), 'payment_nb': fields.char('Piece Number', size=32), diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index f217c7d9a13..f16ea80f540 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -148,7 +148,7 @@ class purchase_order(osv.osv): 'origin': fields.char('Origin', size=64, help="Reference of the document that generated this purchase order request." ), - 'partner_ref': fields.char('Supplier Ref.', size=64), + 'partner_ref': fields.char('Supplier Reference', size=64), 'date_order':fields.date('Date Ordered', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}, help="Date on which this document has been created."), 'date_approve':fields.date('Date Approved', readonly=1), 'partner_id':fields.many2one('res.partner', 'Supplier', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}, change_default=True), @@ -454,7 +454,7 @@ class purchase_order_line(osv.osv): 'price_unit': fields.float('Unit Price', required=True, digits=(16, int(config['price_accuracy']))), 'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', digits=(16, int(config['price_accuracy']))), 'notes': fields.text('Notes'), - 'order_id': fields.many2one('purchase.order', 'Order Ref', select=True, required=True, ondelete='cascade'), + 'order_id': fields.many2one('purchase.order', 'Order Reference', select=True, required=True, ondelete='cascade'), 'account_analytic_id':fields.many2one('account.analytic.account', 'Analytic Account',), 'company_id': fields.related('order_id','company_id',type='many2one',relation='res.company',string='Company',store=True) } diff --git a/addons/report_account/report_receivable.py b/addons/report_account/report_receivable.py index 8d106193cf7..b8e3cf22f67 100644 --- a/addons/report_account/report_receivable.py +++ b/addons/report_account/report_receivable.py @@ -179,7 +179,7 @@ class report_invoice_created(osv.osv): ('paid','Done'), ('cancel','Cancelled') ],'State', readonly=True), - 'origin': fields.char('Origin', size=64, readonly=True), + 'origin': fields.char('Origin', size=64, readonly=True, help="Reference of the document that generated this invoice report."), 'create_date' : fields.datetime('Create Date', readonly=True) } _order = 'create_date' diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 92ff5325982..3b77bf8eb88 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -184,8 +184,8 @@ class sale_order(osv.osv): _columns = { 'name': fields.char('Order Reference', size=64, required=True, select=True), 'shop_id': fields.many2one('sale.shop', 'Shop', required=True, readonly=True, states={'draft': [('readonly', False)]}), - 'origin': fields.char('Origin', size=64), - 'client_order_ref': fields.char('Customer Ref', size=64), + 'origin': fields.char('Origin', size=64, help="Reference of the document that generated this sale order request."), + 'client_order_ref': fields.char('Customer Reference', size=64), 'state': fields.selection([ ('draft', 'Quotation'), @@ -750,7 +750,7 @@ class sale_order_line(osv.osv): _name = 'sale.order.line' _description = 'Sale Order line' _columns = { - 'order_id': fields.many2one('sale.order', 'Order Ref', required=True, ondelete='cascade', select=True), + 'order_id': fields.many2one('sale.order', 'Order Reference', required=True, ondelete='cascade', select=True), 'name': fields.char('Description', size=256, required=True, select=True), 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of sale order lines."), 'delay': fields.float('Delivery Lead Time', required=True, help="Number of days between the order confirmation the the shipping of the products to the customer"), diff --git a/addons/stock/stock.py b/addons/stock/stock.py index b81edbc300f..dbd8c0c743e 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -437,7 +437,7 @@ class stock_picking(osv.osv): _columns = { 'name': fields.char('Reference', size=64, select=True), - 'origin': fields.char('Origin Reference', size=64), + 'origin': fields.char('Origin', size=64, help="Reference of the document that produced this picking."), 'backorder_id': fields.many2one('stock.picking', 'Back Order'), 'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal'), ('delivery', 'Delivery')], 'Shipping Type', required=True, select=True, help="Shipping type specify, goods coming in or going out."), 'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the picking without removing it."), @@ -883,7 +883,7 @@ class stock_production_lot(osv.osv): _columns = { 'name': fields.char('Serial', size=64, required=True), - 'ref': fields.char('Internal Ref', size=64), + 'ref': fields.char('Internal Reference', size=64), 'product_id': fields.many2one('product.product', 'Product', required=True), 'date': fields.datetime('Created Date', required=True), 'stock_available': fields.function(_get_stock, fnct_search=_stock_search, method=True, type="float", string="Available", select="2"),