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

merge

Browse Source 
bzr revid: apa@tinyerp.com-20101011050115-rm1b16mg6ngk6e5c
This commit is contained in:
apa-tiny
2010-10-11 10:31:15 +05:30
parent b6ea04941a eaccd57934
commit 1c02bd418b
13 changed files with 220 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml
+15 -15
View File
@@ -2,7 +2,7 @@
<document filename="test.pdf">
<template pageSize="(595.0,842.0)" title="Cashbox of the day" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
<frame id="first" x1="27.0" y1="57.0" width="512" height="728"/>
</pageTemplate>
</template>
<stylesheet>
@@ -114,10 +114,10 @@
<font color="white"> </font>
</para>
<para style="terp_header_Centre">Today's Closed Cashbox</para>
<para style="terp_header_Centre">
<para style="terp_default_Right_9">
<font color="white"> </font>
</para>
<blockTable colWidths="241.0,241.0" style="Table1">
<blockTable colWidths="256.0,256.0" style="Table1">
<tr>
<td>
<para style="terp_tblheader_General_Centre">Company</para>
@@ -127,7 +127,7 @@
</td>
</tr>
</blockTable>
<blockTable colWidths="241.0,241.0" style="Table2">
<blockTable colWidths="256.0,256.0" style="Table2">
<tr>
<td>
<para style="terp_default_Centre_8">[[ company.name ]]</para>
@@ -140,7 +140,7 @@
<para style="Standard">
<font color="white"> </font>
</para>
<blockTable colWidths="55.0,95.0,71.0,73.0,98.0,89.0" style="Table3">
<blockTable colWidths="59.0,101.0,75.0,78.0,104.0,95.0" style="Table3">
<tr>
<td>
<para style="terp_tblheader_General">St.Name</para>
@@ -162,7 +162,7 @@
</td>
</tr>
</blockTable>
<blockTable colWidths="55.0,95.0,71.0,73.0,98.0,89.0" style="Table4">
<blockTable colWidths="59.0,101.0,75.0,78.0,104.0,95.0" style="Table4">
<tr>
<td>
<para style="terp_tblheader_General">Total:</para>
@@ -183,16 +183,16 @@
</para>
</td>
<td>
<para style="terp_tblheader_General_Right">[[ formatLang(get_net_total_starting(user)[1]) ]] [[company.currency_id.symbol]]</para>
<para style="terp_tblheader_General_Right"><u>[[ formatLang(get_net_total_starting(user)[1]) ]] [[company.currency_id.symbol]]</u></para>
</td>
<td>
<para style="terp_tblheader_General_Right">[[ formatLang(get_net_total(user)) ]] [[company.currency_id.symbol]]</para>
<para style="terp_tblheader_General_Right"><u>[[ formatLang(get_net_total(user)) ]] [[company.currency_id.symbol]]</u></para>
</td>
</tr>
</blockTable>
<section>
<para style="terp_default_Bold_8">[[ repeatIn(get_data(user),'statement') ]]</para>
<blockTable colWidths="56.0,94.0,71.0,74.0,97.0,90.0" style="Table7">
<para style="terp_default_1">[[ repeatIn(get_data(user),'statement') ]]</para>
<blockTable colWidths="60.0,99.0,75.0,79.0,103.0,96.0" style="Table7">
<tr>
<td>
<para style="terp_default_Bold_8">[[ statement['statement'] ]]</para>
@@ -207,16 +207,16 @@
<para style="terp_default_Bold_8">[[ statement['closing_date'] ]]</para>
</td>
<td>
<para style="P1">[[ (get_bal(statement)) or '0.00' ]] [[company.currency_id.symbol]]</para>
<para style="P1"><u>[[ (get_bal(statement)) or '0.00' ]] [[company.currency_id.symbol]]</u></para>
</td>
<td>
<para style="P1">[[ formatLang(get_sub_total(user,statement['journal_id'],statement['date'])) ]] [[company.currency_id.symbol]]</para>
<para style="P1"><u>[[ formatLang(get_sub_total(user,statement['journal_id'],statement['date'])) ]] [[company.currency_id.symbol]]</u></para>
</td>
</tr>
</blockTable>
<section>
<para style="Standard">[[ repeatIn(get_lines(statement),'line_ids') ]]</para>
<blockTable colWidths="94.0,126.0,121.0,3.0,138.0" style="Table5">
<para style="terp_default_1">[[ repeatIn(get_lines(statement),'line_ids') ]]</para>
<blockTable colWidths="99.0,134.0,129.0,3.0,147.0" style="Table5">
<tr>
<td>
<para style="terp_default_9">[[ line_ids['name'] ]]</para>
@@ -240,7 +240,7 @@
</td>
</tr>
</blockTable>
<para style="Standard">
<para style="terp_default_1">
<font color="white"> </font>
</para>
</section>
addons/point_of_sale/report/pos_details_summary.rml
+98 -91
View File
@@ -2,7 +2,7 @@
<document filename="test.pdf">
<template pageSize="(595.0,842.0)" title="Detail of sales" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
<frame id="first" x1="27.0" y1="57.0" width="512" height="728"/>
</pageTemplate>
</template>
<stylesheet>
@@ -38,23 +38,30 @@
<lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
</blockTableStyle>
<blockTableStyle id="Table4">
<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"/>
</blockTableStyle>
<blockTableStyle id="Table6">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
<lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
<lineStyle kind="LINEAFTER" colorName="#cccccc" start="1,0" stop="1,-1"/>
<lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
</blockTableStyle>
<blockTableStyle id="Table3">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
<lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
<lineStyle kind="LINEAFTER" colorName="#cccccc" start="1,0" stop="1,-1"/>
<lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,1" stop="0,-1"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,1" stop="1,-1"/>
<lineStyle kind="LINEAFTER" colorName="#cccccc" start="1,1" stop="1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
</blockTableStyle>
<blockTableStyle id="Table5">
<blockTableStyle id="Table9">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
@@ -64,11 +71,6 @@
<lineStyle kind="LINEAFTER" colorName="#cccccc" start="1,0" stop="1,-1"/>
<lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,1" stop="0,-1"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,1" stop="1,-1"/>
<lineStyle kind="LINEAFTER" colorName="#cccccc" start="1,1" stop="1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
</blockTableStyle>
<blockTableStyle id="Table8">
<blockAlignment value="LEFT"/>
@@ -104,11 +106,12 @@
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="P1" fontName="Helvetica" fontSize="15.0" leading="19" alignment="LEFT"/>
<paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
<paraStyle name="P3" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="P4" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="P5" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
<paraStyle name="P2" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
<paraStyle name="P3" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="P4" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="P5" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P6" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Standard" fontName="Helvetica"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -147,14 +150,14 @@
<para style="terp_default_8">
<font color="white"> </font>
</para>
<para style="P3">
<font color="white"> </font>
</para>
<para style="P3">Details of Sales</para>
<para style="P4">
<font color="white"> </font>
</para>
<para style="P4">Details of Sales</para>
<para style="P5">
<font color="white"> </font>
</para>
<blockTable colWidths="161.0,161.0,161.0" style="Table1">
<blockTable colWidths="170.0,170.0,170.0" style="Table1">
<tr>
<td>
<para style="terp_tblheader_General_Centre">Company</para>
@@ -167,7 +170,7 @@
</td>
</tr>
</blockTable>
<blockTable colWidths="161.0,161.0,161.0" style="Table2">
<blockTable colWidths="170.0,170.0,170.0" style="Table2">
<tr>
<td>
<para style="terp_default_Centre_8">[[ '%s' % getcompany(objects)]]</para>
@@ -180,80 +183,84 @@
</td>
</tr>
</blockTable>
<para style="terp_header">
<para style="terp_default_8">
<font color="white"> </font>
</para>
<blockTable colWidths="241.0,241.0" style="Table3">
<blockTable colWidths="256.0,256.0" style="Table4">
<tr>
<td>
<para style="terp_tblheader_Details">Mode of Taxes</para>
</td>
<td>
<para style="P2">
<font color="white"> </font>
</para>
</td>
</tr>
</blockTable>
<section>
<para style="terp_default_1">[[ repeatIn(gettaxamount(objects).items(),'p') ]]</para>
<blockTable colWidths="256.0,256.0" style="Table6">
<tr>
<td>
<para style="P6">[[ p[0] ]]</para>
</td>
<td>
<para style="terp_default_Right_9_Bold">[[ p[1] ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_1">
<font color="white"> </font>
</para>
</section>
<para style="terp_default_8">
<font color="white"> </font>
</para>
<blockTable colWidths="256.0,256.0" style="Table3">
<tr>
<td>
<para style="terp_tblheader_Details">Mode of Payment</para>
</td>
<td>
<para style="P2">
<font color="white"> </font>
</para>
</td>
</tr>
</blockTable>
<section>
<para style="terp_default_1">[[ repeatIn(getpayments(objects).items(),'t') ]]</para>
<blockTable colWidths="256.0,256.0" style="Table9">
<tr>
<td>
<para style="P5">[[ t[0] ]]</para>
</td>
<td>
<para style="terp_default_Right_9_Bold">[[ '%.2f' % (t[1],) ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_1">
<font color="white"> </font>
</para>
</section>
<para style="terp_default_8">
<font color="white"> </font>
</para>
<blockTable colWidths="256.0,256.0" style="Table8">
<tr>
<td>
<para style="terp_default_Bold_9">Summary</para>
</td>
<td>
<para style="P1">
<font color="white"> </font>
</para>
</td>
</tr>
<tr>
<td>
<para style="terp_default_9">
<font face="Helvetica" size="6.0">[[ repeatIn(gettaxamount(objects).items(),'p') ]] </font>
<font face="Helvetica" size="8.0">[[ p[0] ]]</font>
</para>
</td>
<td>
<para style="terp_default_Right_9">[[ p[1] ]]</para>
</td>
</tr>
</blockTable>
<blockTable colWidths="241.0,241.0" style="Table5">
<tr>
<td>
<para style="P3">Mode of Payment</para>
</td>
<td>
<para style="P2">
<font color="white"> </font>
</para>
</td>
</tr>
<tr>
<td>
<para style="terp_default_9">
<font face="Helvetica" size="6.0">[[ repeatIn(getpayments(objects).items(),'t') ]]</font>
<font face="Helvetica" size="9.0">[[ t[0] ]]</font>
</para>
</td>
<td>
<para style="terp_default_Right_9">[[ '%.2f' % (t[1],) ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_9">
<font color="white"> </font>
</para>
<para style="terp_default_9">
<font color="white"> </font>
</para>
<para style="terp_default_9">
<font color="white"> </font>
</para>
<para style="terp_default_9">
<font color="white"> </font>
</para>
<blockTable colWidths="241.0,241.0" style="Table8">
<tr>
<td>
<para style="terp_default_Bold_9">Summary</para>
</td>
<td>
<para style="P2">
<font color="white"> </font>
</para>
</td>
</tr>
</blockTable>
<blockTable colWidths="241.0,241.0" style="Table7">
<blockTable colWidths="256.0,256.0" style="Table7">
<tr>
<td>
<para style="terp_default_Bold_9">Sales total</para>
addons/point_of_sale/report/pos_lines.rml
+8 -8
View File
@@ -2,7 +2,7 @@
<document filename="test.pdf">
<template pageSize="(595.0,842.0)" title="Sales lines" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="36.0" y1="57.0" width="525" height="728"/>
<frame id="first" x1="27.0" y1="57.0" width="512" height="728"/>
</pageTemplate>
</template>
<stylesheet>
@@ -115,7 +115,7 @@
<para style="terp_default_8">
<font color="white"> </font>
</para>
<blockTable colWidths="175.0,175.0,175.0" style="Table3">
<blockTable colWidths="171.0,170.0,170.0" style="Table3">
<tr>
<td>
<para style="terp_tblheader_General_Centre">Company</para>
@@ -128,7 +128,7 @@
</td>
</tr>
</blockTable>
<blockTable colWidths="175.0,175.0,175.0" style="Table4">
<blockTable colWidths="170.0,170.0,170.0" style="Table4">
<tr>
<td>
<para style="terp_default_Centre_8">[[ company.name ]]</para>
@@ -147,7 +147,7 @@
<para style="terp_default_9">
<font color="white"> </font>
</para>
<blockTable colWidths="201.0,82.0,64.0,61.0,51.0,67.0" style="Tableau6">
<blockTable colWidths="196.0,78.0,62.0,58.0,56.0,63.0" style="Tableau6">
<tr>
<td>
<para style="terp_tblheader_Details">Description</para>
@@ -170,8 +170,8 @@
</tr>
</blockTable>
<section>
<para style="terp_default_8">[[repeatIn(o.lines,'l')]]</para>
<blockTable colWidths="201.0,83.0,64.0,60.0,51.0,67.0" style="Tableau7">
<para style="terp_default_1">[[repeatIn(o.lines,'l')]]</para>
<blockTable colWidths="195.0,78.0,62.0,58.0,56.0,63.0" style="Tableau7">
<tr>
<td>
<para style="terp_default_9">[ [[l.product_id.code]] ] [[l.product_id.name]]</para>
@@ -194,7 +194,7 @@
</tr>
</blockTable>
</section>
<blockTable colWidths="87.0,87.0,88.0,117.0,70.0,76.0" style="Table1">
<blockTable colWidths="84.0,85.0,86.0,114.0,68.0,74.0" style="Table1">
<tr>
<td>
<para style="terp_default_9">
@@ -284,4 +284,4 @@
<font color="white"> </font>
</para>
</story>
</document>
</document>
addons/point_of_sale/report/pos_payment_report.py
+6 -6
View File
@@ -38,17 +38,17 @@ class pos_payment_report(report_sxw.rml_parse):
sql = """ select id from pos_order where id = %d"""%(obj.id)
self.cr.execute(sql)
if self.cr.fetchone():
self.cr.execute ("select pt.name,pol.qty,pol.discount,pol.price_unit, " \
self.cr.execute ("select pt.name,pp.default_code as code,pol.qty,pu.name as uom,pol.discount,pol.price_unit, " \
"(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0)) as total " \
"from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt " \
"where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id " \
"from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt, product_uom as pu " \
"where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id and pu.id=pt.uom_id " \
"and po.state IN ('paid','invoiced') and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date = current_date and po.id=%d"%(obj.id))
data=self.cr.dictfetchall()
else :
self.cr.execute ("select pt.name,pol.qty,pol.discount,pol.price_unit, " \
self.cr.execute ("select pt.name,pp.default_code as code,pol.qty,pu.name as uom,pol.discount,pol.price_unit, " \
"(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0)) as total " \
"from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt " \
"where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id " \
"from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt, product_uom as pu " \
"where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id and pu.id=pt.uom_id " \
"and po.state IN ('paid','invoiced') and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date = current_date")
data=self.cr.dictfetchall()
addons/point_of_sale/report/pos_payment_report.rml
+2 -2
View File
@@ -175,10 +175,10 @@
<blockTable colWidths="198.0,81.0,87.0,87.0,83.0" style="Tableau7">
<tr>
<td>
<para style="terp_default_9">[[ line_ids['name'] ]]</para>
<para style="terp_default_9">[ [[ line_ids['code'] ]] ] [[ line_ids['name'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]]</para>
<para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]] [[line_ids['uom'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(line_ids['discount']) ]]</para>
addons/point_of_sale/report/pos_payment_report_date.py
+6 -6
View File
@@ -38,17 +38,17 @@ class pos_payment_report_date(report_sxw.rml_parse):
dt2 = form['date_end'] + ' 23:59:59'
data={}
if form['user_id']:
self.cr.execute ("select pt.name,pol.qty,pol.discount,pol.price_unit, " \
self.cr.execute ("select pt.name,pp.default_code as code,pol.qty,pu.name as uom,pol.discount,pol.price_unit, " \
"(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0)) as total " \
"from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt " \
"where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id " \
"from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt,product_uom as pu " \
"where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id and pu.id=pt.uom_id " \
"and po.state IN ('paid','invoiced') and po.date_order >= %s and po.date_order <= %s and po.user_id IN %s " \
,(dt1,dt2,tuple(form['user_id'])))
else:
self.cr.execute ("select pt.name,pol.qty,pol.discount,pol.price_unit, " \
self.cr.execute ("select pt.name,pp.default_code as code,pol.qty,pu.name as uom,pol.discount,pol.price_unit, " \
"(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0)) as total " \
"from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt " \
"where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id " \
"from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt,product_uom as pu " \
"where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id and pu.id=pt.uom_id " \
"and po.state IN ('paid','invoiced') and po.date_order >= %s and po.date_order <= %s" \
,(dt1,dt2))
data=self.cr.dictfetchall()
addons/point_of_sale/report/pos_payment_report_date.rml
+8 -8
View File
@@ -2,7 +2,7 @@
<document filename="test.pdf">
<template pageSize="(595.0,842.0)" title="Payment" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
<frame id="first" x1="27.0" y1="57.0" width="512" height="728"/>
</pageTemplate>
</template>
<stylesheet>
@@ -102,7 +102,7 @@
<para style="Standard">
<font color="white"> </font>
</para>
<blockTable colWidths="241.0,241.0" style="Table1">
<blockTable colWidths="256.0,256.0" style="Table1">
<tr>
<td>
<para style="terp_tblheader_General_Centre">Company</para>
@@ -112,7 +112,7 @@
</td>
</tr>
</blockTable>
<blockTable colWidths="241.0,241.0" style="Table2">
<blockTable colWidths="256.0,256.0" style="Table2">
<tr>
<td>
<para style="terp_default_Centre_8">[[ company.name ]]</para>
@@ -128,7 +128,7 @@
<para style="Standard">
<font color="white"> </font>
</para>
<blockTable colWidths="256.0,59.0,42.0,61.0,64.0" style="Table3">
<blockTable colWidths="271.0,63.0,45.0,64.0,68.0" style="Table3">
<tr>
<td>
<para style="terp_tblheader_Details">Product</para>
@@ -149,13 +149,13 @@
</blockTable>
<section>
<para style="terp_default_1">[[ repeatIn(pos_payment_date(data['form']), 'line_ids') ]]</para>
<blockTable colWidths="256.0,59.0,42.0,61.0,64.0" style="Table6">
<blockTable colWidths="271.0,63.0,45.0,64.0,68.0" style="Table6">
<tr>
<td>
<para style="terp_default_9">[[ line_ids['name'] ]]</para>
<para style="terp_default_9">[ [[ line_ids['code'] ]] ] [[ line_ids['name'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]]</para>
<para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]] [[line_ids['uom'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(line_ids['discount']) ]]</para>
@@ -169,7 +169,7 @@
</tr>
</blockTable>
</section>
<blockTable colWidths="256.0,59.0,42.0,61.0,64.0" style="Table5">
<blockTable colWidths="271.0,63.0,45.0,64.0,68.0" style="Table5">
<tr>
<td>
<para style="Table Contents">
addons/point_of_sale/report/pos_payment_report_user.py
+3 -3
View File
@@ -35,10 +35,10 @@ class pos_payment_report_user(report_sxw.rml_parse):
def __pos_payment_user__(self,form):
data={}
ids = form['user_id']
sql = "select pt.name,pol.qty,pol.discount,pol.price_unit, " \
sql = "select pt.name,pp.default_code as code,pol.qty,pu.name as uom,pol.discount,pol.price_unit, " \
"(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0)) as total " \
"from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt " \
"where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id " \
"from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt,product_uom as pu " \
"where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id and pu.id=pt.uom_id " \
"and po.state in ('paid','invoiced') and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date = current_date " \
"and po.user_id IN %s"
self.cr.execute (sql, (tuple(ids), ))
addons/point_of_sale/report/pos_payment_report_user.rml
+6 -7
View File
@@ -59,8 +59,7 @@
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="P1" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P2" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P1" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Standard" fontName="Helvetica"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -103,8 +102,8 @@
<para style="Standard">
<font color="white"> </font>
</para>
<para style="P2">Payment By User </para>
<para style="P2">
<para style="P1">Payment By User </para>
<para style="P1">
<font color="white"> </font>
</para>
<blockTable colWidths="241.0,241.0" style="Table1">
@@ -153,14 +152,14 @@
</tr>
</blockTable>
<section>
<para style="P1">[[ repeatIn(pos_payment_user(data['form']), 'line_ids') ]]</para>
<para style="terp_default_1">[[ repeatIn(pos_payment_user(data['form']), 'line_ids') ]]</para>
<blockTable colWidths="241.0,55.0,61.0,61.0,64.0" style="Table6">
<tr>
<td>
<para style="terp_default_9">[[ line_ids['name'] ]]</para>
<para style="terp_default_9">[ [[ line_ids['code'] ]] ] [[ line_ids['name'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]]</para>
<para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]] [[line_ids['uom'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(line_ids['discount']) ]]</para>
addons/point_of_sale/report/pos_sales_user.rml
+11 -15
View File
@@ -2,7 +2,7 @@
<document filename="test.pdf">
<template pageSize="(595.0,842.0)" title="Sales Report" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
<frame id="first" x1="27.0" y1="57.0" width="512" height="728"/>
</pageTemplate>
</template>
<stylesheet>
@@ -41,7 +41,7 @@
<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="Table5">
<blockTableStyle id="Table4">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
@@ -54,8 +54,7 @@
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="P1" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="P2" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P3" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P2" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Standard" fontName="Helvetica"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -98,11 +97,11 @@
<para style="Standard">
<font color="white"> </font>
</para>
<para style="P3">Sales Report</para>
<para style="P3">
<para style="P2">Sales Report</para>
<para style="P2">
<font color="white"> </font>
</para>
<blockTable colWidths="241.0,241.0" style="Table1">
<blockTable colWidths="256.0,256.0" style="Table1">
<tr>
<td>
<para style="terp_tblheader_General_Centre">Company</para>
@@ -112,7 +111,7 @@
</td>
</tr>
</blockTable>
<blockTable colWidths="241.0,241.0" style="Table2">
<blockTable colWidths="256.0,256.0" style="Table2">
<tr>
<td>
<para style="terp_default_Centre_8">[[ company.name ]]</para>
@@ -128,7 +127,7 @@
<para style="Standard">
<font color="white"> </font>
</para>
<blockTable colWidths="141.0,111.0,92.0,61.0,77.0" style="Table3">
<blockTable colWidths="150.0,118.0,97.0,64.0,82.0" style="Table3">
<tr>
<td>
<para style="terp_tblheader_Details">Name</para>
@@ -148,8 +147,8 @@
</tr>
</blockTable>
<section>
<para style="P2">[[ repeatIn(get_data(data['form']), 'line_ids')]]</para>
<blockTable colWidths="141.0,111.0,92.0,61.0,77.0" style="Table5">
<para style="terp_default_1">[[ repeatIn(get_data(data['form']), 'line_ids')]]</para>
<blockTable colWidths="150.0,118.0,97.0,64.0,82.0" style="Table4">
<tr>
<td>
<para style="terp_default_8">[[ line_ids['pos'] ]]</para>
@@ -168,12 +167,9 @@
</td>
</tr>
</blockTable>
<para style="terp_default_8">
<para style="terp_default_1">
<font color="white"> </font>
</para>
</section>
<para style="Standard">
<font color="white"> </font>
</para>
</story>
</document>
addons/point_of_sale/report/pos_sales_user_today.rml
+12 -14
View File
@@ -2,7 +2,7 @@
<document filename="test.pdf">
<template pageSize="(595.0,842.0)" title="Todays Sales By User" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
<frame id="first" x1="27.0" y1="57.0" width="512" height="728"/>
</pageTemplate>
</template>
<stylesheet>
@@ -53,10 +53,8 @@
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="P1" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P2" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P3" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="P4" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P1" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P2" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="Standard" fontName="Helvetica"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -99,11 +97,11 @@
<para style="Standard">
<font color="white"> </font>
</para>
<para style="P2">Today's Sales By User</para>
<para style="P2">
<para style="P1">Today's Sales By User</para>
<para style="P1">
<font color="white"> </font>
</para>
<blockTable colWidths="241.0,241.0" style="Table1">
<blockTable colWidths="256.0,256.0" style="Table1">
<tr>
<td>
<para style="terp_tblheader_General_Centre">Company</para>
@@ -113,7 +111,7 @@
</td>
</tr>
</blockTable>
<blockTable colWidths="241.0,241.0" style="Table2">
<blockTable colWidths="256.0,256.0" style="Table2">
<tr>
<td>
<para style="terp_default_Centre_8">[[ company.name ]]</para>
@@ -129,7 +127,7 @@
<para style="Standard">
<font color="white"> </font>
</para>
<blockTable colWidths="141.0,111.0,92.0,61.0,77.0" style="Table3">
<blockTable colWidths="150.0,118.0,97.0,64.0,82.0" style="Table3">
<tr>
<td>
<para style="terp_tblheader_Details">Name</para>
@@ -138,7 +136,7 @@
<para style="terp_tblheader_Details_Centre">Date Order</para>
</td>
<td>
<para style="P3">User</para>
<para style="P2">User</para>
</td>
<td>
<para style="terp_tblheader_General_Right">State</para>
@@ -149,8 +147,8 @@
</tr>
</blockTable>
<section>
<para style="P1">[[ repeatIn(get_data(data['form']), 'line_ids')]]</para>
<blockTable colWidths="141.0,111.0,92.0,60.0,78.0" style="Table5">
<para style="terp_default_1">[[ repeatIn(get_data(data['form']), 'line_ids')]]</para>
<blockTable colWidths="150.0,118.0,97.0,64.0,83.0" style="Table5">
<tr>
<td>
<para style="terp_default_8">[[ line_ids['pos'] ]]</para>
@@ -169,7 +167,7 @@
</td>
</tr>
</blockTable>
<para style="terp_default_8">
<para style="terp_default_1">
<font color="white"> </font>
</para>
</section>
addons/point_of_sale/report/pos_sales_user_today_current_user.rml
+9 -10
View File
@@ -2,7 +2,7 @@
<document filename="test.pdf">
<template pageSize="(595.0,842.0)" title="Todays Sales By Current User" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
<frame id="first" x1="27.0" y1="57.0" width="512" height="728"/>
</pageTemplate>
</template>
<stylesheet>
@@ -65,8 +65,7 @@
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
<paraStyle name="P2" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P3" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P2" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Standard" fontName="Helvetica"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -109,11 +108,11 @@
<para style="terp_default_8">
<font color="white"> </font>
</para>
<para style="P3">Today's Sales By Current User</para>
<para style="P2">Today's Sales By Current User</para>
<para style="terp_default_8">
<font color="white"> </font>
</para>
<blockTable colWidths="161.0,161.0,161.0" style="Table1">
<blockTable colWidths="170.0,170.0,170.0" style="Table1">
<tr>
<td>
<para style="terp_tblheader_General_Centre">Company</para>
@@ -126,7 +125,7 @@
</td>
</tr>
</blockTable>
<blockTable colWidths="161.0,161.0,161.0" style="Table2">
<blockTable colWidths="170.0,170.0,170.0" style="Table2">
<tr>
<td>
<para style="terp_default_Centre_8">[[ company.name ]]</para>
@@ -145,7 +144,7 @@
<para style="terp_default_8">
<font color="white"> </font>
</para>
<blockTable colWidths="282.0,72.0,65.0,63.0" style="Table3">
<blockTable colWidths="299.0,76.0,69.0,67.0" style="Table3">
<tr>
<td>
<para style="terp_tblheader_Details">Name</para>
@@ -162,8 +161,8 @@
</tr>
</blockTable>
<section>
<para style="P2">[[ repeatIn(get_data_current_user(user), 'line_ids')]]</para>
<blockTable colWidths="282.0,72.0,65.0,63.0" style="Table6">
<para style="terp_default_1">[[ repeatIn(get_data_current_user(user), 'line_ids')]]</para>
<blockTable colWidths="299.0,76.0,69.0,67.0" style="Table6">
<tr>
<td>
<para style="terp_default_9">[[ line_ids['name'] ]]</para>
@@ -180,7 +179,7 @@
</tr>
</blockTable>
</section>
<blockTable colWidths="282.0,72.0,65.0,63.0" style="Table5">
<blockTable colWidths="299.0,76.0,69.0,67.0" style="Table5">
<tr>
<td>
<para style="P1">
addons/point_of_sale/report/pos_users_product.rml
+36 -28
View File
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<document filename="test.pdf">
<template pageSize="(595.0,842.0)" title="User's Product'" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
<template pageSize="(595.0,842.0)" title="User's Product" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
</pageTemplate>
@@ -57,9 +57,19 @@
<lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
</blockTableStyle>
<blockTableStyle id="Table4">
<blockTableStyle id="Table6">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
<lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
<lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
<lineStyle kind="LINEAFTER" colorName="#cccccc" start="2,0" stop="2,-1"/>
<lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
</blockTableStyle>
<blockTableStyle id="Table5">
<blockAlignment value="LEFT"/>
@@ -71,8 +81,8 @@
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
<paraStyle name="P2" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P2" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P3" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Standard" fontName="Helvetica"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -118,7 +128,7 @@
<para style="terp_default_8">
<font color="white"> </font>
</para>
<para style="P3">User's Product</para>
<para style="P2">User's Product</para>
<para style="terp_default_8">
<font color="white"> </font>
</para>
@@ -169,13 +179,7 @@
<para style="terp_default_8">
<font color="white"> </font>
</para>
<para style="terp_default_8">
<font color="white"> </font>
</para>
<para style="terp_default_8">
<font color="white"> </font>
</para>
<blockTable colWidths="239.0,80.0,163.0" style="Table3">
<blockTable colWidths="161.0,161.0,161.0" style="Table3">
<tr>
<td>
<para style="terp_tblheader_General">Product</para>
@@ -184,25 +188,29 @@
<para style="terp_tblheader_General_Right">Qty</para>
</td>
<td>
<para style="terp_tblheader_General_Right">Amount </para>
</td>
</tr>
</blockTable>
<blockTable colWidths="239.0,80.0,163.0" style="Table4">
<tr>
<td>
<para style="P2">[[ repeatIn(get_data(statement), 'line_ids') and ' ' or removeParentNode('blockTable') ]]</para>
<para style="P2">[[ repeatIn(get_data(statement), 'line_ids')]]</para>
<para style="terp_default_9">[[ line_ids['name'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(line_ids['amt']) ]] [[ company.currency_id.symbol ]]</para>
<para style="terp_tblheader_General_Right">Amount</para>
</td>
</tr>
</blockTable>
<section>
<para style="terp_default_1">[[ repeatIn(get_data(statement), 'line_ids') and ' ' or removeParentNode('blockTable') ]]</para>
<section>
<para style="terp_default_1">[[ repeatIn(get_data(statement), 'line_ids')]]</para>
<blockTable colWidths="161.0,161.0,161.0" style="Table6">
<tr>
<td>
<para style="terp_default_9">[[ line_ids['name'] ]]</para>
</td>
<td>
<para style="terp_default_9">[[ formatLang(line_ids['qty']) ]]</para>
</td>
<td>
<para style="terp_default_Right_9_Bold">[[ formatLang(line_ids['amt']) ]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
</section>
</section>
<blockTable colWidths="319.0,80.0,83.0" style="Table5">
<tr>
<td>