diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py
index 5b5e99b5f51..36c304f072a 100644
--- a/addons/lunch/lunch.py
+++ b/addons/lunch/lunch.py
@@ -169,7 +169,7 @@ class lunch_order(osv.Model):
line_ref = self.pool.get("lunch.order.line")
if view_type == 'form':
doc = etree.XML(res['arch'])
- pref_ids = line_ref.search(cr, uid, [('user_id', '=', uid)], order='create_date desc', context=context)
+ pref_ids = line_ref.search(cr, uid, [('user_id', '=', uid)], order='id desc', context=context)
xml_start = etree.Element("div")
#If there are no preference (it's the first time for the user)
if len(pref_ids)==0:
@@ -215,63 +215,70 @@ class lunch_order(osv.Model):
currency = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id
#For each preferences that we get, we will create the XML structure
- for key,value in categories.items():
+ for key, value in categories.items():
xml_pref_1 = etree.Element("div")
- xml_pref_1.set('class','oe_lunch_30pc')
+ xml_pref_1.set('class', 'oe_lunch_30pc')
xml_pref_2 = etree.Element("h2")
xml_pref_2.text = key
xml_pref_1.append(xml_pref_2)
i = 0
value = value.values()
+ #TODO: sorted_values is used for a quick and dirty hack in order to display the 5 last orders of each categories.
+ #It would be better to fetch only the 5 items to display instead of fetching everything then sorting them in order to keep only the 5 last.
+ #NB: The note could also be ignored + we could fetch the preferences on the most ordered products instead of the last ones...
+ sorted_values = {}
for val in value:
- for pref in val.values():
- #We only show 5 preferences per category (or it will be too long)
- if i==5: break
- i+=1
- xml_pref_3 = etree.Element("div")
- xml_pref_3.set('class','oe_lunch_vignette')
- xml_pref_1.append(xml_pref_3)
+ for elmt in val.values():
+ sorted_values[elmt.id] = elmt
+ for key, pref in sorted(sorted_values.iteritems(), key=lambda (k, v): (k, v), reverse=True):
+ #We only show 5 preferences per category (or it will be too long)
+ if i == 5:
+ break
+ i += 1
+ xml_pref_3 = etree.Element("div")
+ xml_pref_3.set('class','oe_lunch_vignette')
+ xml_pref_1.append(xml_pref_3)
- xml_pref_4 = etree.Element("span")
- xml_pref_4.set('class','oe_lunch_button')
- xml_pref_3.append(xml_pref_4)
+ xml_pref_4 = etree.Element("span")
+ xml_pref_4.set('class','oe_lunch_button')
+ xml_pref_3.append(xml_pref_4)
- xml_pref_5 = etree.Element("button")
- xml_pref_5.set('name',"add_preference_"+str(pref.id))
- xml_pref_5.set('class','oe_link oe_i oe_button_plus')
- xml_pref_5.set('type','object')
- xml_pref_5.set('string','+')
- xml_pref_4.append(xml_pref_5)
+ xml_pref_5 = etree.Element("button")
+ xml_pref_5.set('name',"add_preference_"+str(pref.id))
+ xml_pref_5.set('class','oe_link oe_i oe_button_plus')
+ xml_pref_5.set('type','object')
+ xml_pref_5.set('string','+')
+ xml_pref_4.append(xml_pref_5)
- xml_pref_6 = etree.Element("button")
- xml_pref_6.set('name',"add_preference_"+str(pref.id))
- xml_pref_6.set('class','oe_link oe_button_add')
- xml_pref_6.set('type','object')
- xml_pref_6.set('string',_("Add"))
- xml_pref_4.append(xml_pref_6)
+ xml_pref_6 = etree.Element("button")
+ xml_pref_6.set('name',"add_preference_"+str(pref.id))
+ xml_pref_6.set('class','oe_link oe_button_add')
+ xml_pref_6.set('type','object')
+ xml_pref_6.set('string',_("Add"))
+ xml_pref_4.append(xml_pref_6)
- xml_pref_7 = etree.Element("div")
- xml_pref_7.set('class','oe_group_text_button')
- xml_pref_3.append(xml_pref_7)
+ xml_pref_7 = etree.Element("div")
+ xml_pref_7.set('class','oe_group_text_button')
+ xml_pref_3.append(xml_pref_7)
- xml_pref_8 = etree.Element("div")
- xml_pref_8.set('class','oe_lunch_text')
- xml_pref_8.text = escape(pref.product_id.name)+str(" ")
- xml_pref_7.append(xml_pref_8)
+ xml_pref_8 = etree.Element("div")
+ xml_pref_8.set('class','oe_lunch_text')
+ xml_pref_8.text = escape(pref.product_id.name)+str(" ")
+ xml_pref_7.append(xml_pref_8)
- price = pref.product_id.price or 0.0
- cur = currency.name or ''
- xml_pref_9 = etree.Element("span")
- xml_pref_9.set('class','oe_tag')
- xml_pref_9.text = str(price)+str(" ")+cur
- xml_pref_8.append(xml_pref_9)
+ price = pref.product_id.price or 0.0
+ cur = currency.name or ''
+ xml_pref_9 = etree.Element("span")
+ xml_pref_9.set('class','oe_tag')
+ xml_pref_9.text = str(price)+str(" ")+cur
+ xml_pref_8.append(xml_pref_9)
- xml_pref_10 = etree.Element("div")
- xml_pref_10.set('class','oe_grey')
- xml_pref_10.text = escape(pref.note or '')
- xml_pref_3.append(xml_pref_10)
+ xml_pref_10 = etree.Element("div")
+ xml_pref_10.set('class','oe_grey')
+ xml_pref_10.text = escape(pref.note or '')
+ xml_pref_3.append(xml_pref_10)
- xml_start.append(xml_pref_1)
+ xml_start.append(xml_pref_1)
first_node = doc.xpath("//div[@name='preferences']")
if first_node and len(first_node)>0:
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 8023ba6419b..3655b3a8184 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -532,6 +532,9 @@ class sale_order(osv.osv):
invoice_ref += o.name + '|'
self.write(cr, uid, [o.id], {'state': 'progress'})
cr.execute('insert into sale_order_invoice_rel (order_id,invoice_id) values (%s,%s)', (o.id, res))
+ #remove last '|' in invoice_ref
+ if len(invoice_ref) >= 1:
+ invoice_ref = invoice_ref[:-1]
invoice.write(cr, uid, [res], {'origin': invoice_ref, 'name': invoice_ref})
else:
for order, il in val:
diff --git a/addons/sale/wizard/sale_make_invoice.py b/addons/sale/wizard/sale_make_invoice.py
index 87911228cb6..47716018caa 100644
--- a/addons/sale/wizard/sale_make_invoice.py
+++ b/addons/sale/wizard/sale_make_invoice.py
@@ -20,7 +20,6 @@
from openerp.osv import fields, osv
from openerp.tools.translate import _
-from openerp import netsvc
class sale_make_invoice(osv.osv_memory):
_name = "sale.make.invoice"
@@ -40,7 +39,7 @@ class sale_make_invoice(osv.osv_memory):
record_id = context and context.get('active_id', False)
order = self.pool.get('sale.order').browse(cr, uid, record_id, context=context)
if order.state == 'draft':
- raise osv.except_osv(_('Warning!'),'You cannot create invoice when sales order is not confirmed.')
+ raise osv.except_osv(_('Warning!'), _('You cannot create invoice when sales order is not confirmed.'))
return False
def make_invoices(self, cr, uid, ids, context=None):
@@ -51,10 +50,11 @@ class sale_make_invoice(osv.osv_memory):
if context is None:
context = {}
data = self.read(cr, uid, ids)[0]
- order_obj.action_invoice_create(cr, uid, context.get(('active_ids'), []), data['grouped'], date_invoice = data['invoice_date'])
- wf_service = netsvc.LocalService("workflow")
- for id in context.get(('active_ids'), []):
- wf_service.trg_validate(uid, 'sale.order', id, 'manual_invoice', cr)
+ for sale_order in order_obj.browse(cr, uid, context.get(('active_ids'), []), context=context):
+ if sale_order.state != 'manual':
+ raise osv.except_osv(_('Warning!'), _("You shouldn't manually invoice the following sale order %s") % (sale_order.name))
+
+ order_obj.action_invoice_create(cr, uid, context.get(('active_ids'), []), data['grouped'], date_invoice=data['invoice_date'])
for o in order_obj.browse(cr, uid, context.get(('active_ids'), []), context=context):
for i in o.invoice_ids:
@@ -63,7 +63,7 @@ class sale_make_invoice(osv.osv_memory):
result = mod_obj.get_object_reference(cr, uid, 'account', 'action_invoice_tree1')
id = result and result[1] or False
result = act_obj.read(cr, uid, [id], context=context)[0]
- result['domain'] = "[('id','in', ["+','.join(map(str,newinv))+"])]"
+ result['domain'] = "[('id','in', [" + ','.join(map(str, newinv)) + "])]"
return result
diff --git a/addons/sale/wizard/sale_make_invoice.xml b/addons/sale/wizard/sale_make_invoice.xml
index ced64a0f79d..de680feb049 100644
--- a/addons/sale/wizard/sale_make_invoice.xml
+++ b/addons/sale/wizard/sale_make_invoice.xml
@@ -6,16 +6,16 @@
sale.make.invoice