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

merge

Browse Source 
bzr revid: olt@tinyerp.com-20081014062746-kidp56hsws9qppoa
This commit is contained in:
Olivier Laurent
2008-10-14 08:27:46 +02:00
parent 5ae5bebc2a 2b01b81023
commit e163eded56
8 changed files with 152 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/.pydevproject
+6
View File
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?eclipse-pydev version="1.0"?>
<pydev_project>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.4</pydev_property>
</pydev_project>
addons/account/report/__init__.py
+1
View File
@@ -40,6 +40,7 @@ import overdue
import aged_trial_balance
import tax_report
import general_ledger_landscape
import account_tax_code
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/account/report/account_tax_code.py
+19
View File
@@ -0,0 +1,19 @@
import time
import pooler
import rml_parse
import copy
from report import report_sxw
import re
class account_tax_code_report(rml_parse.rml_parse):
_name = 'report.account.tax.code.entries'
def __init__(self, cr, uid, name, context):
super(account_tax_code_report, self).__init__(cr, uid, name, context)
self.localcontext.update({
'time': time,
})
report_sxw.report_sxw('report.account.tax.code.entries', 'account.tax.code',
'addons/account/report/account_tax_code.rml', parser=account_tax_code_report, header=False)
addons/account/report/account_tax_code.rml
+113 -106
View File
@@ -2,7 +2,31 @@
<document filename="test.pdf">
<template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
<frame id="first" x1="57.0" y1="57.0" width="481" height="700"/>
<header>
<pageGraphics>
<setFont name="Helvetica-Bold" size="9"/>
<!--COL 1-->
<drawString x="1.0cm" y="28.1cm">[[ company.name ]]</drawString>
<drawRightString x="20cm" y="28.1cm">Accounting Entries-[[ company.currency_id.name ]]</drawRightString>
<!-- Header -->
<setFont name="Helvetica" size="9"/>
<drawString x="1.0cm" y="1cm"> [[ time.strftime("%m-%d-%Y %H:%M", time.localtime()) ]]</drawString>
<drawString x="19.0cm" y="1cm">Page <pageNumber/></drawString>
<!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>-->
<lineMode width="0.7"/>
<lines>1cm 27.7cm 20cm 27.7cm</lines>
<setFont name="Helvetica" size="8"/>
</pageGraphics>
</header>
</pageTemplate>
</template>
<stylesheet>
@@ -10,42 +34,29 @@
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Table1">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/>
<blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/>
<blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/>
</blockTableStyle>
<blockTableStyle id="Table2">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="GRID" colorName="black"/>
</blockTableStyle>
<blockTableStyle id="Table3">
<blockTableStyle id="Table_Title_Table">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Table4">
<blockTableStyle id="Table_Line_Title">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="GRID" colorName="black"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
</blockTableStyle>
<blockTableStyle id="Table_Line_Content_Detail">
<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"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="P1" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P2" fontName="Times-Roman" fontSize="20.0" leading="25" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P3" fontName="Times-Roman" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P4" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P5" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P6" fontName="Times-Roman" fontSize="11.0" leading="14"/>
<paraStyle name="P7" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P8" fontName="Times-Roman" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P9" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P10" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P11" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P12" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Standard" fontName="Times-Roman"/>
<paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -53,115 +64,111 @@
<paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="Index" fontName="Times-Roman"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="15.0" leading="19" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Footer" fontName="Times-Roman"/>
<paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
<paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" 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"/>
</stylesheet>
<images/>
<story>
<para style="P1">[[ repeatIn(objects, 'o') ]]</para>
<blockTable colWidths="145.0,192.0,145.0" repeatRows="1" style="Table1">
<section>
<para style="terp_default_8">[[ repeatIn(objects, 'o') ]]</para>
<!--blockTable colWidths="162.0,222.0,154.0" repeatRows="1" style="Table_Title_Table">
<tr>
<td>
<para style="Table Contents">
<font color="white"> </font>
<para style="terp_header">[[ company.name ]]</para>
</td>
<td>
<para style="terp_header">
<font face="Times-Roman" size="11.0"/>
</para>
</td>
<td>
<para style="P2">Accounting Entries</para>
</td>
<td>
<para style="P3">
<font color="white"> </font>
</para>
<para style="terp_header">Accounting Entries-[[ company.currency_id.name ]]</para>
</td>
</tr>
<tr>
<td>
<para style="Table Contents">[[ company.name ]]</para>
</td>
<td>
<para style="P4">
<font color="white"> </font>
</para>
</td>
<td>
<para style="P5">Currency: [[ company.currency_id.name ]]</para>
</td>
</tr>
</blockTable>
<para style="P6">
</blockTable-->
<para style="terp_default_9">
<font color="white"> </font>
</para>
<blockTable colWidths="49.0,39.0,54.0,117.0,105.0,58.0,60.0" repeatRows="1" style="Table2">
<blockTable colWidths="55.0,43.0,57.0,125.0,127.0,65.0,67.0" repeatRows="1" style="Table_Line_Title">
<tr>
<td>
<para style="P7">Date</para>
<para style="terp_tblheader_Details_Centre">Date</para>
</td>
<td>
<para style="P7">Voucher Nb</para>
<para style="terp_tblheader_Details">Voucher Nb</para>
</td>
<td>
<para style="P7">Account Number</para>
<para style="terp_tblheader_Details">Account Number</para>
</td>
<td>
<para style="P7">Third party (Country)</para>
<para style="terp_tblheader_Details">Third party (Country)</para>
</td>
<td>
<para style="P7">Entry label</para>
<para style="terp_tblheader_Details">Entry label</para>
</td>
<td>
<para style="P7">Debit</para>
<para style="terp_tblheader_Details_Right">Debit</para>
</td>
<td>
<para style="P7">Credit</para>
<para style="terp_tblheader_Details_Right">Credit</para>
</td>
</tr>
</blockTable>
<blockTable colWidths="49.0,38.0,55.0,118.0,104.0,58.0,60.0" style="Table3">
<tr>
<td>
<para style="Table Contents">
<font face="Times-Roman" size="8.0">[[ repeatIn(o.line_ids, 'line') ]] </font>
<font face="Times-Roman" size="8.0">[[ line.date ]]</font>
</para>
</td>
<td>
<para style="P8">[[ line.ref ]]</para>
</td>
<td>
<para style="P8">[[ line.account_id.code ]]</para>
</td>
<td>
<para style="P8">[[ line.partner_id and line.partner_id.name ]] ([[ line.partner_id and line.partner_id.address and line.partner_id.address[0].country_id.code or '' ]] )</para>
</td>
<td>
<para style="P9">[[ line.name ]]</para>
</td>
<td>
<para style="P10">[[ '%.2f' % line.debit ]]</para>
</td>
<td>
<para style="P10">[[ '%.2f' % line.credit ]]</para>
</td>
<td>
<para style="terp_default_8">[[ repeatIn(o.line_ids, 'line') ]]</para>
<blockTable colWidths="48.0,43.0,58.0,128.0,127.0,64.0,65.0" style="Table_Line_Content_Detail">
<tr>
<td>
<para style="terp_default_9">[[ line.date ]]</para>
</td>
<td>
<para style="terp_default_9">[[ line.ref ]]</para>
</td>
<td>
<para style="terp_default_9">[[ line.account_id.code ]]</para>
</td>
<td>
<para style="terp_default_9">[[ line.partner_id and line.partner_id.name ]]<font>([[ line.partner_id and line.partner_id.address and line.partner_id.address[0].country_id.code or removeParentNode('font') ]] )</font></para>
</td>
<td>
<para style="terp_default_9">[[ line.name ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(line.debit) or '%.2f' % line.debit ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(line.credit) or '%.2f' % line.credit ]]</para>
</td>
</tr>
</blockTable>
</td>
</tr>
</blockTable>
<blockTable colWidths="364.0,58.0,60.0" style="Table4">
<tr>
<td>
<para style="P11">TOTAL:</para>
</td>
<td>
<para style="P12">
<font color="white"> </font>
</para>
</td>
<td>
<para style="P12">
<font color="white"> </font>
</para>
</td>
</tr>
</blockTable>
<para style="Standard">
</section>
<para style="terp_default_8">
<font color="white"> </font>
</para>
</story>
</document>
addons/account/report/tax_report.py
+3 -2
View File
@@ -87,7 +87,7 @@ class tax_report(rml_parse.rml_parse):
while ind_general < len(res_general) :
res_general[ind_general]['type'] = 2
res_general[ind_general]['pos'] = 0
res_general[ind_general]['level'] = res_dict['level'] + ' '
res_general[ind_general]['level'] = res_dict['level']
top_result.append(res_general[ind_general])
ind_general+=1
i+=1
@@ -143,6 +143,7 @@ class tax_report(rml_parse.rml_parse):
GROUP BY account.id,account.name,account.code', ('draft',tax_code_id,
company_id))
res = self.cr.dictfetchall()
#AND line.period_id IN ('+ period_sql_list +') \
i = 0
@@ -158,7 +159,7 @@ class tax_report(rml_parse.rml_parse):
res = []
for code in tc.browse(self.cr, self.uid, ids, {'based_on': based_on}):
res.append(('a'*2*level,code))
print"=====res=====",res
res += self._get_codes(based_on, code.id, level+1)
return res
addons/account/report/tax_report.rml
+4 -4
View File
@@ -215,19 +215,19 @@
<para style="Caption">[[ repeatIn(get_lines(data['form']['based_on'],data['form']['periods'],data['form']['company_id']), 'o') ]]</para>
<td>
<para style="P5"><font color="white">[[ o['level'] ]]</font>
[[o['type']==1 and ( setTag('para','para',{'fontName':'Helvetica'}))]]<font></font>
<font>[[o['type']==1 and ( setTag('para','para',{'fontName':'Helvetica'}))]]</font>
[[ setTag('tr','tr',{'style':'TrLevel'+str(o['level']), 'paraStyle':('Level'+str(o['level']))}) ]]<font></font>
[[ o['code'] ]] [[ o['name'] ]]<font></font>
</para>
</td>
<td>
<para style="P6">[[o['type']==2 and (o['debit']) ]]</para>
<para style="P6">[[o['type']==2 and (o['debit']) or '0.0' ]]</para>
</td>
<td>
<para style="P6"> [[o['type']==2 and (o['credit']) ]] </para>
<para style="P6"> [[o['type']==2 and (o['credit']) or '0.0' ]] </para>
</td>
<td>
<para style="P6">[[ o['tax_amount'] ]]</para>
<para style="P6">[[ o['tax_amount'] or '0.0' ]]</para>
</td>
</tr>
addons/account_report/report/print_indicator.py
+5 -3
View File
@@ -36,7 +36,8 @@ from report.interface import report_int
from reportlab.graphics.shapes import Drawing
from reportlab.graphics.charts.barcharts import VerticalBarChart
import reportlab.lib.colors
from reportlab.graphics import renderPM
#from reportlab.graphics import renderPM
import tools
class accounting_report1(report_sxw.rml_parse):
@@ -53,7 +54,7 @@ class accounting_report1(report_sxw.rml_parse):
drawing = Drawing(400, 200)
data = [
(13, 5, 20, 22, 37, 45, 19, 4),
(11, 3, 10, 22, 30, 25, 29, 6),
(15, 13, 4, 22, 30, 25, 29, 6),
]
bc = VerticalBarChart()
bc.x = 50
@@ -72,7 +73,8 @@ class accounting_report1(report_sxw.rml_parse):
bc.categoryAxis.categoryNames = ['Jan-99','Feb-99','Mar-99',
'Apr-99','May-99','Jun-99','Jul-99','Aug-99']
drawing.add(bc)
renderPM.drawToFile(drawing, 'example1.jpg','jpg')
drawing.save(formats=['png'],fnRoot=tools.config['root_path']+"/Image",title="helo")
# renderPM.drawToFile(drawing, 'example1.jpg','jpg')
return True
addons/account_report/report/print_indicator.rml
+1 -1
View File
@@ -128,7 +128,7 @@
</td>
</tr>
</blockTable>
<image file="//home/jvo/ws_bazaar/server/bin/example1.png"/>
<image file="//home/jvo/ws_bazaar/server/bin/Image.png"/>
<para style="P1">
<font color="white"> </font>
</para>