odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] allow users to change product price from CMS[FIX] small bug in reordering of PTT 

bzr revid: fp@tinyerp.com-20131209210511-5w03vf2wt0pmgdew
This commit is contained in:
Fabien Pinckaers 2013-12-09 22:05:11 +01:00
parent 6652856445
commit 59906a3af8
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/product/product.py
View File

@ -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),

4
addons/website/models/website.py
View File

@ -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):

2
addons/website_sale/views/website_sale.xml
View File

@ -279,7 +279,7 @@
</div>
</section>
<section class="container oe_website_sale mb16" id="product_detail">
<section class="container oe_website_sale" id="product_detail">
<div class="row">
<div class="col-sm-7 col-md-7 col-lg-7">
<span t-field="product.image" style="max-height: 500px" t-field-options='{"widget": "image", "class": "img img-responsive"}'/>