pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port branch saas-6 up to ef4efea

Browse Source
This commit is contained in:
Christophe Simonis
2016-10-12 15:33:01 +02:00
parent 77c64e3f05 ef4efeac7c
commit 6faf232b71
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/point_of_sale/point_of_sale.py
+1 -2
View File
@@ -625,8 +625,7 @@ class pos_session(osv.osv):
return True return True
def open_frontend_cb(self, cr, uid, ids, context=None): def open_frontend_cb(self, cr, uid, ids, context=None):
if not context: context = dict(context or {})
context = {}
if not ids: if not ids:
return {} return {}
for session in self.browse(cr, uid, ids, context=context): for session in self.browse(cr, uid, ids, context=context):
addons/purchase_requisition/purchase_requisition_view.xml
+1 -1
View File
@@ -63,7 +63,7 @@
<field name="ordering_date" attrs="{'readonly': [('state','not in',('draft'))]}"/> <field name="ordering_date" attrs="{'readonly': [('state','not in',('draft'))]}"/>
<field name="schedule_date" attrs="{'readonly': [('state','not in',('draft'))]}"/> <field name="schedule_date" attrs="{'readonly': [('state','not in',('draft'))]}"/>
<field name="origin" placeholder="e.g. PO0025" attrs="{'readonly': [('state', '!=', 'draft')]}"/> <field name="origin" placeholder="e.g. PO0025" attrs="{'readonly': [('state', '!=', 'draft')]}"/>
<field name="picking_type_id" widget="selection" groups="stock.group_stock_adv_location" attrs="{'readonly': [('state', '!=', 'draft')]}"/> <field name="picking_type_id" widget="selection" groups="stock.group_adv_location" attrs="{'readonly': [('state', '!=', 'draft')]}"/>
<field name="company_id" groups="base.group_multi_company" options="{'no_create': True}" attrs="{'readonly': [('state','not in',('draft'))]}"/> <field name="company_id" groups="base.group_multi_company" options="{'no_create': True}" attrs="{'readonly': [('state','not in',('draft'))]}"/>
</group> </group>
</group> </group>
openerp/models.py
+1 -1
View File
@@ -1899,7 +1899,7 @@ class BaseModel(object):
for order_part in orderby.split(','): for order_part in orderby.split(','):
order_split = order_part.split() order_split = order_part.split()
order_field = order_split[0] order_field = order_split[0]
if order_field in groupby_fields: if order_field == 'id' or order_field in groupby_fields:
if self._fields[order_field.split(':')[0]].type == 'many2one': if self._fields[order_field.split(':')[0]].type == 'many2one':
order_clause = self._generate_order_by(order_part, query).replace('ORDER BY ', '') order_clause = self._generate_order_by(order_part, query).replace('ORDER BY ', '')