From ded63ab87a17f5de2c098092147345ae80b4b16b Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 18 Oct 2010 13:03:00 +0530
Subject: [PATCH] [IMP]:lunch:improved lunch order

bzr revid: apa@tinyerp.com-20101018073300-z9dy97lvf37501jk
---
 addons/lunch/report/order.py  |  7 +++-
 addons/lunch/report/order.rml | 76 +++++++++++++++++++++--------------
 2 files changed, 52 insertions(+), 31 deletions(-)

diff --git a/addons/lunch/report/order.py b/addons/lunch/report/order.py
index 29c9d381745..11ca7f79dbc 100644
--- a/addons/lunch/report/order.py
+++ b/addons/lunch/report/order.py
@@ -41,8 +41,12 @@ class order(report_sxw.rml_parse):
         total=0.0
         for line in lines:
             total+=line.price
+        self.net_total+=total
         return total
 
+    def get_nettotal(self):
+        return self.net_total
+
     def get_users(self, objects):
         users=[]
         for obj in objects:
@@ -52,12 +56,13 @@ class order(report_sxw.rml_parse):
 
     def __init__(self, cr, uid, name, context):
         super(order, self).__init__(cr, uid, name, context)
-
+        self.net_total=0.0
         self.localcontext.update({
             'time': time,
             'get_lines': self.get_lines,
             'get_users': self.get_users,
             'get_total': self.get_total,
+            'get_nettotal': self.get_nettotal,
         })
 
 report_sxw.report_sxw('report.lunch.order', 'lunch.order',
diff --git a/addons/lunch/report/order.rml b/addons/lunch/report/order.rml
index d47816abd9c..ba66dcddb03 100644
--- a/addons/lunch/report/order.rml
+++ b/addons/lunch/report/order.rml
@@ -14,25 +14,28 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Table2">
+    <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table3">
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table7">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table4">
+    <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
@@ -63,9 +66,14 @@
     <paraStyle name="terp_default_9_right_bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_header_center" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_9_center" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9_left9" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <images/>
   </stylesheet>
   <story>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
     <blockTable colWidths="293.0,235.0" style="Table1">
       <tr>
         <td>
@@ -84,16 +92,10 @@
       </tr>
     </blockTable>
     <para style="terp_header">Lunch Order</para>
-
-	<section>
-    <para style="terp_default_8">[[repeatIn(get_users(objects),'o')]]</para>
-    <blockTable colWidths="80.0,70.0,141.0,172.0,65.0" style="Table2">
+    <blockTable colWidths="149.0,114.0,201.0,63.0" style="Table5">
       <tr>
         <td>
-          <para style="terp_tbl_detail_header">Name</para>
-        </td>
-        <td>
-          <para style="terp_tbl_detail_header_center">Date</para>
+          <para style="terp_tbl_detail_header">Name/Date</para>
         </td>
         <td>
           <para style="terp_tbl_detail_header">Order</para>
@@ -107,28 +109,43 @@
       </tr>
     </blockTable>
     <section>
-      <para style="terp_default_8">[[ repeatIn(get_lines(o,objects),'lines') ]]</para>
-      <blockTable colWidths="80.0,70.0,141.0,172.0,64.0" style="Table3">
+      <para style="terp_default_2">[[repeatIn(get_users(objects),'o')]]</para>
+      <blockTable colWidths="263.0,201.0,63.0" style="Table6">
         <tr>
           <td>
-            <para style="terp_default_9">[[ (lines.user_id and lines.user_id.name) or '']]</para>
+            <para style="terp_tbl_detail_header">[[ o.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_9_center">[[ formatLang(lines.date,date='True') ]]</para>
+            <para style="terp_default_8">
+              <font color="white"> </font>
+            </para>
           </td>
           <td>
-            <para style="terp_default_9">[[ (lines.product and lines.product.name) or '' ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_9">[[ lines.descript]]</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>
+            <para style="terp_default_9_right_bold"><u>[[ formatLang(get_total(o,objects)) ]] [[ (o.company_id and o.company_id.currency_id and o.company_id.currency_id.symbol) or '' ]]</u></para>
           </td>
         </tr>
       </blockTable>
+      <section>
+        <para style="terp_default_2">[[ repeatIn(get_lines(o,objects),'lines') ]]</para>
+        <blockTable colWidths="151.0,113.0,216.0,49.0" style="Table7">
+          <tr>
+            <td>
+              <para style="terp_default_9_left9">[[ formatLang(lines.date,date='True') ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_9">[[ (lines.product and lines.product.name) or '' ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_9">[[ lines.descript]]</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>
+            </td>
+          </tr>
+        </blockTable>
+      </section>
     </section>
-    <blockTable colWidths="409.0,55.0,64.0" style="Table4">
+    <blockTable colWidths="421.0,44.0,63.0" style="Table2">
       <tr>
         <td>
           <para style="terp_default_8">
@@ -136,16 +153,15 @@
           </para>
         </td>
         <td>
-          <para style="terp_tbl_detail_header">Total:</para>
+          <para style="terp_tbl_detail_header">Total :</para>
         </td>
         <td>
-          <para style="terp_default_9_right_bold">[[ formatLang(get_total(o,objects)) ]] [[ (o.company_id and o.company_id.currency_id and o.company_id.currency_id.symbol) or '' ]]</para>
+          <para style="terp_default_9_right_bold">[[ formatLang(get_nettotal()) ]] [[ (o.company_id and o.company_id.currency_id and o.company_id.currency_id.symbol) or '' ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_8">
+    <para style="terp_default_2">
       <font color="white"> </font>
     </para>
-	</section>
   </story>
-</document>
+</document>
\ No newline at end of file