From 39470414b0d576036a048d6d3a4c69a092128f81 Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Wed, 5 Dec 2012 14:07:31 +0530 Subject: [PATCH 1/5] [IMP]String Replaced Invoiced to Invoice Ratio and Given string to currency_id field. bzr revid: bth@tinyerp.com-20121205083731-vuyi112ouewch5iw --- addons/hr_attendance/hr_attendance.py | 2 +- addons/product/product.py | 2 +- addons/purchase/purchase.py | 2 +- addons/sale/sale.py | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py index a2ee3650a2f..5de1bc5f3bc 100644 --- a/addons/hr_attendance/hr_attendance.py +++ b/addons/hr_attendance/hr_attendance.py @@ -137,7 +137,7 @@ class hr_employee(osv.osv): _columns = { 'state': fields.function(_state, type='selection', selection=[('absent', 'Absent'), ('present', 'Present')], string='Attendance'), 'last_sign': fields.function(_last_sign, type='datetime', string='Last Sign'), - 'attendance_access': fields.function(_attendance_access, type='boolean'), + 'attendance_access': fields.function(_attendance_access, string='Attendance Access', type='boolean'), } def _action_check(self, cr, uid, emp_id, dt=False, context=None): diff --git a/addons/product/product.py b/addons/product/product.py index fb28f85b10f..8d58d2e6d50 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -573,7 +573,7 @@ class product_product(osv.osv): help="Small-sized image of the product. It is automatically "\ "resized as a 64x64px image, with aspect ratio preserved. "\ "Use this field anywhere a small image is required."), - 'seller_info_id': fields.function(_calc_seller, type='many2one', relation="product.supplierinfo", multi="seller_info"), + 'seller_info_id': fields.function(_calc_seller, type='many2one', relation="product.supplierinfo", string="Seller Info", multi="seller_info"), 'seller_delay': fields.function(_calc_seller, type='integer', string='Supplier Lead Time', multi="seller_info", help="This is the average delay in days between the purchase order confirmation and the reception of goods for this product and for the default supplier. It is used by the scheduler to order requests based on reordering delays."), 'seller_qty': fields.function(_calc_seller, type='float', string='Supplier Quantity', multi="seller_info", help="This is minimum quantity to purchase from Main Supplier."), 'seller_id': fields.function(_calc_seller, type='many2one', relation="res.partner", string='Main Supplier', help="Main Supplier who has highest priority in Supplier List.", multi="seller_info"), diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index aaaa9ddc5a5..45c9509de8d 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -186,7 +186,7 @@ class purchase_order(osv.osv): 'invoice_ids': fields.many2many('account.invoice', 'purchase_invoice_rel', 'purchase_id', 'invoice_id', 'Invoices', help="Invoices generated for a purchase order"), 'picking_ids': fields.one2many('stock.picking.in', 'purchase_id', 'Picking List', readonly=True, help="This is the list of incoming shipments that have been generated for this purchase order."), 'shipped':fields.boolean('Received', readonly=True, select=True, help="It indicates that a picking has been done"), - 'shipped_rate': fields.function(_shipped_rate, string='Received', type='float'), + 'shipped_rate': fields.function(_shipped_rate, string='Received Ratio', type='float'), 'invoiced': fields.function(_invoiced, string='Invoice Received', type='boolean', help="It indicates that an invoice has been paid"), '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, diff --git a/addons/sale/sale.py b/addons/sale/sale.py index ccd53c47b25..c777d5fe599 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -201,12 +201,12 @@ class sale_order(osv.osv): help="""This field controls how invoice and delivery operations are synchronized. - With 'Before Delivery', a draft invoice is created, and it must be paid before delivery."""), 'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True, readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="Pricelist for current sales order."), - 'currency_id': fields.related('pricelist_id', 'currency_id', type="many2one", relation="res.currency", readonly=True, required=True), + 'currency_id': fields.related('pricelist_id', 'currency_id', type="many2one", relation="res.currency", string="Currency", readonly=True, required=True), 'project_id': fields.many2one('account.analytic.account', 'Contract / Analytic', readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="The analytic account related to a sales order."), 'order_line': fields.one2many('sale.order.line', 'order_id', 'Order Lines', readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}), 'invoice_ids': fields.many2many('account.invoice', 'sale_order_invoice_rel', 'order_id', 'invoice_id', 'Invoices', readonly=True, help="This is the list of invoices that have been generated for this sales order. The same sales order may have been invoiced in several times (by line for example)."), - 'invoiced_rate': fields.function(_invoiced_rate, string='Invoiced', type='float'), + 'invoiced_rate': fields.function(_invoiced_rate, string='Invoice Ratio', type='float'), 'invoiced': fields.function(_invoiced, string='Paid', fnct_search=_invoiced_search, type='boolean', help="It indicates that an invoice has been paid."), 'invoice_exists': fields.function(_invoice_exists, string='Invoiced', From 149525095c0332e4ce631fcc8b84d5a00c022ca0 Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Wed, 5 Dec 2012 14:31:14 +0530 Subject: [PATCH 2/5] [IMP] Replaced String. bzr revid: bth@tinyerp.com-20121205090114-8xq7fsntg4xn3dzr --- addons/crm/res_partner.py | 2 +- addons/product/product.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/crm/res_partner.py b/addons/crm/res_partner.py index e43534476fd..cf1aa77d138 100644 --- a/addons/crm/res_partner.py +++ b/addons/crm/res_partner.py @@ -47,7 +47,7 @@ class res_partner(osv.osv): 'phonecall_ids': fields.one2many('crm.phonecall', 'partner_id',\ 'Phonecalls'), 'opportunity_count': fields.function(_opportunity_meeting_count, string="Opportunity", type='integer', multi='opp_meet'), - 'meeting_count': fields.function(_opportunity_meeting_count, string="Meeting", type='integer', multi='opp_meet'), + 'meeting_count': fields.function(_opportunity_meeting_count, string="#Meetings", type='integer', multi='opp_meet'), } def copy(self, cr, uid, record_id, default=None, context=None): diff --git a/addons/product/product.py b/addons/product/product.py index 8d58d2e6d50..2bf5e5686ba 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -539,9 +539,9 @@ class product_product(osv.osv): 'virtual_available': fields.function(_product_virtual_available, type='float', string='Quantity Available'), 'incoming_qty': fields.function(_product_incoming_qty, type='float', string='Incoming'), 'outgoing_qty': fields.function(_product_outgoing_qty, type='float', string='Outgoing'), - 'price': fields.function(_product_price, type='float', string='Pricelist', digits_compute=dp.get_precision('Product Price')), + 'price': fields.function(_product_price, type='float', string='Price', digits_compute=dp.get_precision('Product Price')), 'lst_price' : fields.function(_product_lst_price, type='float', string='Public Price', digits_compute=dp.get_precision('Product Price')), - 'code': fields.function(_product_code, type='char', string='Internal Reference'), + 'code': fields.function(_product_code, type='char', string='Partner Reference'), 'partner_ref' : fields.function(_product_partner_ref, type='char', string='Customer ref'), 'default_code' : fields.char('Internal Reference', size=64, select=True), 'active': fields.boolean('Active', help="If unchecked, it will allow you to hide the product without removing it."), From 875c27d45e5ba2a440e5cb3cedc5c3a89c700cfe Mon Sep 17 00:00:00 2001 From: Paramjit Singh Sahota Date: Wed, 5 Dec 2012 16:13:29 +0530 Subject: [PATCH 3/5] [IMP] Rename string from 'Journal Entry' to 'Journal Entry Name','Reconcile' to 'Reconcile Name','amount_residual_currency' to 'Residual Amount Currency'. bzr revid: psa@tinyerp.com-20121205104329-ff6pd8v6v2fpkgb8 --- addons/account/account_invoice.py | 2 +- addons/account/account_move_line.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py index 0c6442eed57..ac3a236070f 100644 --- a/addons/account/account_invoice.py +++ b/addons/account/account_invoice.py @@ -229,7 +229,7 @@ class account_invoice(osv.osv): 'invoice_line': fields.one2many('account.invoice.line', 'invoice_id', 'Invoice Lines', readonly=True, states={'draft':[('readonly',False)]}), 'tax_line': fields.one2many('account.invoice.tax', 'invoice_id', 'Tax Lines', readonly=True, states={'draft':[('readonly',False)]}), - 'move_id': fields.many2one('account.move', 'Journal Entry', readonly=True, select=1, ondelete='restrict', help="Link to the automatically generated Journal Items."), + 'move_id': fields.many2one('account.move', 'Journal Entry Name', readonly=True, select=1, ondelete='restrict', help="Link to the automatically generated Journal Items."), 'amount_untaxed': fields.function(_amount_all, digits_compute=dp.get_precision('Account'), string='Untaxed', store={ 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 20), diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 2c6e651b14b..265be108baa 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -443,9 +443,9 @@ class account_move_line(osv.osv): '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), - 'reconcile': fields.function(_get_reconcile, type='char', string='Reconcile'), + 'reconcile': fields.function(_get_reconcile, type='char', string='Reconcile Name'), 'amount_currency': fields.float('Amount Currency', help="The amount expressed in an optional other currency if it is a multi-currency entry.", digits_compute=dp.get_precision('Account')), - 'amount_residual_currency': fields.function(_amount_residual, string='Residual Amount', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in its currency (maybe different of the company currency)."), + 'amount_residual_currency': fields.function(_amount_residual, string='Residual Amount Currency', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in its currency (maybe different of the company currency)."), 'amount_residual': fields.function(_amount_residual, string='Residual Amount', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in the company currency."), 'currency_id': fields.many2one('res.currency', 'Currency', help="The optional other currency if it is a multi-currency entry."), 'journal_id': fields.related('move_id', 'journal_id', string='Journal', type='many2one', relation='account.journal', required=True, select=True, From 0a859cddcdb108109f3a8acd207c7e6939105a2d Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Thu, 6 Dec 2012 12:22:14 +0530 Subject: [PATCH 4/5] [IMP] Add string and renamed string. bzr revid: bth@tinyerp.com-20121206065214-2dp3hmqhuu0r9g8n --- addons/portal_hr_employees/hr_employee.py | 2 +- addons/sale/sale.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/portal_hr_employees/hr_employee.py b/addons/portal_hr_employees/hr_employee.py index 94acea8c4aa..f9a369d2e1f 100644 --- a/addons/portal_hr_employees/hr_employee.py +++ b/addons/portal_hr_employees/hr_employee.py @@ -51,7 +51,7 @@ class hr_employee(osv.osv): _columns = { 'visibility': fields.selection([('public', 'Public'),('private', 'Private')], string='Visibility', help='Employee\'s visibility in the portal\'s contact page'), - 'public_info': fields.text(), + 'public_info': fields.text('Public Info'), } _defaults = { 'visibility': 'private', diff --git a/addons/sale/sale.py b/addons/sale/sale.py index c777d5fe599..614c0a558be 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -206,7 +206,7 @@ class sale_order(osv.osv): 'order_line': fields.one2many('sale.order.line', 'order_id', 'Order Lines', readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}), 'invoice_ids': fields.many2many('account.invoice', 'sale_order_invoice_rel', 'order_id', 'invoice_id', 'Invoices', readonly=True, help="This is the list of invoices that have been generated for this sales order. The same sales order may have been invoiced in several times (by line for example)."), - 'invoiced_rate': fields.function(_invoiced_rate, string='Invoice Ratio', type='float'), + 'invoiced_rate': fields.function(_invoiced_rate, string='Invoiced Ratio', type='float'), 'invoiced': fields.function(_invoiced, string='Paid', fnct_search=_invoiced_search, type='boolean', help="It indicates that an invoice has been paid."), 'invoice_exists': fields.function(_invoice_exists, string='Invoiced', From 163c118b69c4762596124638a8f56cdc7bf0e526 Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Thu, 6 Dec 2012 12:44:10 +0530 Subject: [PATCH 5/5] [IMP] Renamed String. bzr revid: bth@tinyerp.com-20121206071410-rdt5c70n5hl7uak9 --- addons/membership/membership.py | 4 ++-- addons/product_margin/product_margin.py | 10 +++++----- addons/purchase/purchase.py | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/addons/membership/membership.py b/addons/membership/membership.py index 4ffd067d73e..4b9c8e9f885 100644 --- a/addons/membership/membership.py +++ b/addons/membership/membership.py @@ -467,8 +467,8 @@ class Product(osv.osv): _inherit = 'product.product' _columns = { 'membership': fields.boolean('Membership', help='Check if the product is eligible for membership.'), - 'membership_date_from': fields.date('Date from', help='Date from which membership becomes active.'), - 'membership_date_to': fields.date('Date to', help='Date until which membership remains active.'), + 'membership_date_from': fields.date('Membership Date From', help='Date from which membership becomes active.'), + 'membership_date_to': fields.date('Membership Date To', help='Date until which membership remains active.'), } _sql_constraints = [('membership_date_greater','check(membership_date_to >= membership_date_from)','Error ! Ending Date cannot be set before Beginning Date.')] diff --git a/addons/product_margin/product_margin.py b/addons/product_margin/product_margin.py index c06c4971474..4e519c9fbc7 100644 --- a/addons/product_margin/product_margin.py +++ b/addons/product_margin/product_margin.py @@ -93,8 +93,8 @@ class product_product(osv.osv): return res _columns = { - 'date_from': fields.function(_product_margin, type='date', string='From Date', multi='product_margin'), - 'date_to': fields.function(_product_margin, type='date', string='To Date', multi='product_margin'), + 'date_from': fields.function(_product_margin, type='date', string='Margin Date From', multi='product_margin'), + 'date_to': fields.function(_product_margin, type='date', string='Margin Date To', multi='product_margin'), 'invoice_state': fields.function(_product_margin, type='selection', selection=[ ('paid','Paid'),('open_paid','Open and Paid'),('draft_open_paid','Draft, Open and Paid') ], string='Invoice State',multi='product_margin', readonly=True), @@ -102,9 +102,9 @@ class product_product(osv.osv): help="Avg. Price in Customer Invoices."), 'purchase_avg_price' : fields.function(_product_margin, type='float', string='Avg. Unit Price', multi='product_margin', help="Avg. Price in Supplier Invoices "), - 'sale_num_invoiced' : fields.function(_product_margin, type='float', string='# Invoiced', multi='product_margin', + 'sale_num_invoiced' : fields.function(_product_margin, type='float', string='# Invoiced in Sale', multi='product_margin', help="Sum of Quantity in Customer Invoices"), - 'purchase_num_invoiced' : fields.function(_product_margin, type='float', string='# Invoiced', multi='product_margin', + 'purchase_num_invoiced' : fields.function(_product_margin, type='float', string='# Invoiced in Purchase', multi='product_margin', help="Sum of Quantity in Supplier Invoices"), 'sales_gap' : fields.function(_product_margin, type='float', string='Sales Gap', multi='product_margin', help="Expected Sale - Turn Over"), @@ -122,7 +122,7 @@ class product_product(osv.osv): help="Turnover - Standard price"), 'expected_margin' : fields.function(_product_margin, type='float', string='Expected Margin', multi='product_margin', help="Expected Sale - Normal Cost"), - 'total_margin_rate' : fields.function(_product_margin, type='float', string='Total Margin (%)', multi='product_margin', + 'total_margin_rate' : fields.function(_product_margin, type='float', string='Total Margin Rate(%)', multi='product_margin', help="Total margin * 100 / Turnover"), 'expected_margin_rate' : fields.function(_product_margin, type='float', string='Expected Margin (%)', multi='product_margin', help="Expected margin * 100 / Expected Sale"), diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 45c9509de8d..74416b68a5d 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -178,7 +178,7 @@ class purchase_order(osv.osv): 'warehouse_id': fields.many2one('stock.warehouse', 'Destination Warehouse'), 'location_id': fields.many2one('stock.location', 'Destination', required=True, domain=[('usage','<>','view')], states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]} ), 'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, help="The pricelist sets the currency used for this purchase order. It also computes the supplier price for the selected products/quantities."), - 'currency_id': fields.related('pricelist_id', 'currency_id', type="many2one", relation="res.currency", readonly=True, required=True), + 'currency_id': fields.related('pricelist_id', 'currency_id', type="many2one", relation="res.currency", string="Currency",readonly=True, required=True), 'state': fields.selection(STATE_SELECTION, 'Status', readonly=True, help="The status of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' status. Then the order has to be confirmed by the user, the status switch to 'Confirmed'. Then the supplier must confirm the order to change the status to 'Approved'. When the purchase order is paid and received, the status becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the status becomes in exception.", select=True), 'order_line': fields.one2many('purchase.order.line', 'order_id', 'Order Lines', states={'approved':[('readonly',True)],'done':[('readonly',True)]}), 'validator' : fields.many2one('res.users', 'Validated by', readonly=True),