From 59906a3af82aeb216c7c29e9b492e7b69183ec5b Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Mon, 9 Dec 2013 22:05:11 +0100 Subject: [PATCH] [IMP] allow users to change product price from CMS[FIX] small bug in reordering of PTT bzr revid: fp@tinyerp.com-20131209210511-5w03vf2wt0pmgdew --- addons/product/product.py | 4 ++-- addons/website/models/website.py | 4 ++-- addons/website_sale/views/website_sale.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/product/product.py b/addons/product/product.py index 2b1380bd58e..e73486c2e13 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -657,8 +657,8 @@ 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='Price', digits_compute=dp.get_precision('Product Price')), - 'lst_price' : fields.function(_product_lst_price, fnct_inv=_save_product_lst_price, type='float', string='Public Price', digits_compute=dp.get_precision('Product Price')), + 'price': fields.function(_product_price, fnct_inv=_save_product_lst_price, type='float', string='Price', digits_compute=dp.get_precision('Product Price')), + 'lst_price' : fields.function(_product_lst_price, fnct_inv=_save_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'), 'partner_ref' : fields.function(_product_partner_ref, type='char', string='Customer ref'), 'default_code' : fields.char('Internal Reference', size=64, select=True), diff --git a/addons/website/models/website.py b/addons/website/models/website.py index b1df178e8ed..611b582d9ce 100644 --- a/addons/website/models/website.py +++ b/addons/website/models/website.py @@ -535,8 +535,8 @@ class website_menu(osv.osv): 'new_window': False, } _parent_store = True - _parent_order = 'sequence, name' - _order = "parent_left" + _parent_order = 'sequence' + _order = "sequence" # would be better to take a menu_id as argument def get_tree(self, cr, uid, website_id, context=None): diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml index 24328b6dbb9..0335ac04e81 100644 --- a/addons/website_sale/views/website_sale.xml +++ b/addons/website_sale/views/website_sale.xml @@ -279,7 +279,7 @@ -
+