[MERGE]Lunch_new application

bzr revid: api@openerp.com-20121024130315-vbfrp648vt4rgj97

4 files changed, 6 insertions, 11 deletions

diff --git a/addons/lunch/report/order.py b/addons/lunch/report/order.py
index 11ca7f79dbc..08daebec482 100644
--- a/addons/lunch/report/order.py
+++ b/addons/lunch/report/order.py
@@ -26,7 +26,7 @@ from osv import osv
 
 class order(report_sxw.rml_parse):
 
-    def get_lines(self, user,objects):
+    def get_lines(self,user,objects):
         lines=[]
         for obj in objects:
             if user.id==obj.user_id.id:
diff --git a/addons/lunch/report/order.rml b/addons/lunch/report/order.rml
index b09b59bb96b..ca334a369f7 100644
--- a/addons/lunch/report/order.rml
+++ b/addons/lunch/report/order.rml
@@ -107,7 +107,7 @@
         </td>
       </tr>
     </blockTable>
-    <para style="terp_header">Lunch Order</para>
+    <para style="terp_header">Lunch Orders</para>
     <blockTable colWidths="149.0,114.0,201.0,63.0" style="Table5">
       <tr>
         <td>
@@ -152,7 +152,7 @@
               <para style="terp_default_9">[[ (lines.product and lines.product.name) or '' ]]</para>
             </td>
             <td>
-              <para style="terp_default_9">[[ lines.descript]]</para>
+              <para style="terp_default_9">[[ lines.note]]</para>
             </td>
             <td>
               <para style="terp_default_9_right">[[ lines.price ]] [[ (o.company_id and o.company_id.currency_id and o.company_id.currency_id.symbol) or '' ]]</para>
diff --git a/addons/lunch/report/report_lunch_order.py b/addons/lunch/report/report_lunch_order.py
index 7e2b8de9f49..f874cfbf521 100644
--- a/addons/lunch/report/report_lunch_order.py
+++ b/addons/lunch/report/report_lunch_order.py
@@ -22,7 +22,7 @@
 import tools
 from osv import fields,osv
 
-class report_lunch_order(osv.osv):
+class report_lunch_order_line(osv.osv):
     _name = "report.lunch.order"
     _description = "Lunch Orders Statistics"
     _auto = False
@@ -39,6 +39,7 @@ class report_lunch_order(osv.osv):
         'price_total':fields.float('Total Price', readonly=True),
     }
     _order = 'date desc'
+
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'report_lunch_order')
         cr.execute("""
@@ -50,19 +51,14 @@ class report_lunch_order(osv.osv):
                    to_char(lo.date, 'MM') as month,
                    to_char(lo.date, 'YYYY-MM-DD') as day,
                    lo.user_id,
-                   cm.name as box_name,
                    sum(lp.price) as price_total
-
             from
                    lunch_order as lo
-                   left join lunch_cashmove as cm on (cm.id = lo.cashmove)
-                   left join lunch_cashbox as lc on (lc.id = cm.box)
                    left join lunch_product as lp on (lo.product = lp.id)
 
             group by
-                   lo.date,lo.user_id,cm.name
+                   lo.date,lo.user_id
             )
             """)
-report_lunch_order()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/lunch/report/report_lunch_order_view.xml b/addons/lunch/report/report_lunch_order_view.xml
index e92007592ac..2758cd1653c 100644
--- a/addons/lunch/report/report_lunch_order_view.xml
+++ b/addons/lunch/report/report_lunch_order_view.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
        <record id="view_report_lunch_order_tree" model="ir.ui.view">
         <field name="name">report.lunch.order.tree</field>
         <field name="model">report.lunch.order</field>