From 156b92a7f698489acb99e44f697603b0d38c3779 Mon Sep 17 00:00:00 2001 From: "ksa (Open ERP)" Date: Mon, 3 May 2010 14:29:51 +0530 Subject: [PATCH] [IMP] taskid-620 : Apply usability for sale module bzr revid: ksa@tinyerp.co.in-20100503085951-nknipbk2kia0u19u --- addons/account/partner_view.xml | 4 ++-- addons/crm/crm_opportunity.py | 2 +- addons/crm/crm_opportunity_view.xml | 2 +- addons/product/pricelist_view.xml | 2 +- addons/product/product.py | 12 ++++++------ addons/product/product_view.xml | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml index 494c0f71a48..d3b61f34f31 100644 --- a/addons/account/partner_view.xml +++ b/addons/account/partner_view.xml @@ -74,13 +74,13 @@ - + - + diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py index c52127f876f..1c15c867960 100644 --- a/addons/crm/crm_opportunity.py +++ b/addons/crm/crm_opportunity.py @@ -126,7 +126,7 @@ class crm_opportunity(osv.osv): 'ref': fields.reference('Reference', selection=crm._links_get, size=128), 'ref2': fields.reference('Reference 2', selection=crm._links_get, size=128), 'date_closed': fields.datetime('Closed', readonly=True), - 'user_id': fields.many2one('res.users', 'Salesman'), + 'user_id': fields.many2one('res.users', 'Salesman', help='By Default set the user is Administrator'), 'phone': fields.char("Phone", size=64), 'date_deadline': fields.date('Expected Closing'), 'date_action': fields.date('Next Action'), diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml index dd5c4e10f30..45fb2ca0e88 100644 --- a/addons/crm/crm_opportunity_view.xml +++ b/addons/crm/crm_opportunity_view.xml @@ -294,7 +294,7 @@ help="My Opportunities" default="1" /> diff --git a/addons/product/product.py b/addons/product/product.py index b21ebe5ee3a..4849bc7543e 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -210,11 +210,11 @@ class product_category(osv.osv): 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of product categories."), 'type': fields.selection([('view','View'), ('normal','Normal')], 'Category Type'), } - + _defaults = { 'type' : lambda *a : 'normal', } - + _order = "sequence" def _check_recursion(self, cr, uid, ids): level = 100 @@ -274,8 +274,8 @@ class product_template(osv.osv): 'sale_ok': fields.boolean('Can be Sold', help="Determines if the product can be visible in the list of product within a selection from a sale order line."), 'purchase_ok': fields.boolean('Can be Purchased', help="Determine if the product is visible in the list of products within a selection from a purchase order line."), 'state': fields.selection([('',''),('draft', 'In Development'),('sellable','In Production'),('end','End of Lifecycle'),('obsolete','Obsolete')], 'State', help="Tells the user if he can use the product or not."), - 'uom_id': fields.many2one('product.uom', 'Default UoM', required=True, help="Default Unit of Measure used for all stock operation."), - 'uom_po_id': fields.many2one('product.uom', 'Purchase UoM', required=True, help="Default Unit of Measure used for purchase orders. It must be in the same category than the default unit of measure."), + 'uom_id': fields.many2one('product.uom', 'Default Unit of Measure ', required=True, help="Default Unit of Measure used for all stock operation."), + 'uom_po_id': fields.many2one('product.uom', 'Purchase Unit of Measure ', required=True, help="Default Unit of Measure used for purchase orders. It must be in the same category than the default unit of measure."), 'uos_id' : fields.many2one('product.uom', 'Unit of Sale', help='Used by companies that manage two units of measure: invoicing and inventory management. For example, in food industries, you will manage a stock of ham but invoice in Kg. Keep empty to use the default UOM.'), 'uos_coeff': fields.float('UOM -> UOS Coeff', digits=(16,4), @@ -448,7 +448,7 @@ class product_product(osv.osv): 'lst_price' : fields.function(_product_lst_price, method=True, type='float', string='List Price', digits_compute=dp.get_precision('Sale Price')), 'code': fields.function(_product_code, method=True, type='char', string='Code'), 'partner_ref' : fields.function(_product_partner_ref, method=True, type='char', string='Customer ref'), - 'default_code' : fields.char('Code', size=64), + 'default_code' : fields.char('Reference', size=64), 'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the product without removing it."), 'variants': fields.char('Variants', size=64), 'product_tmpl_id': fields.many2one('product.template', 'Product Template', required=False), @@ -551,7 +551,7 @@ class product_product(osv.osv): price_type_currency_id = pricetype_obj.browse(cr,uid,price_type_id).currency_id.id res[product.id] = self.pool.get('res.currency').compute(cr, uid, price_type_currency_id, context['currency_id'], res[product.id],context=context) - + return res def copy(self, cr, uid, id, default=None, context=None): diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml index 7cb5a6f2c67..1b74c829b98 100644 --- a/addons/product/product_view.xml +++ b/addons/product/product_view.xml @@ -18,7 +18,7 @@ - + @@ -99,7 +99,7 @@ - +