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

Modifs

Browse Source 
bzr revid: jvo@tinyerp.com-20090529112359-nzzojxax22n1mh47
This commit is contained in:
Jay (Open ERP)
2009-05-29 16:53:59 +05:30
parent d444fffbc8
commit e9bf956c44
3 changed files with 13 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/report/account_balance.rml
+3 -13
View File
@@ -59,18 +59,8 @@
<blockTableStyle id="Table2">
<blockValign value="TOP"/>
<blockAlignment value="RIGHT"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="0,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="1,0" stop="1,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="2,0" stop="2,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="3,0" stop="3,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="4,0" stop="4,0"/>
<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="#000000" start="0,0" stop="-1,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,-1"/>
</blockTableStyle>
<blockTableStyle id="Table3">
<blockAlignment value="LEFT"/>
@@ -180,4 +170,4 @@
</tr>
</blockTable>
</story>
</document>
</document>
addons/account/report/account_tax_code.py
+9 -9
View File
@@ -37,27 +37,27 @@ class account_tax_code_report(rml_parse.rml_parse):
})
def get_line(self,obj):
res ={}
result=[]
res = {}
result = []
line_ids = self.pool.get('account.move.line').search(self.cr,self.uid,[('tax_code_id','=',obj.id)])
if line_ids:
b_objs = self.pool.get('account.move.line').browse(self.cr,self.uid,line_ids)
for line in b_objs:
move_line_objs = self.pool.get('account.move.line').browse(self.cr,self.uid,line_ids)
for line in move_line_objs:
res['date'] = line.date
res['ref'] = line.ref
res['acode'] = line.account_id.code
res['pname'] = ''
res['country'] = ''
if line.partner_id:
res['pname'] = line.partner_id.name
res['country'] = ''
if line.partner_id.address:
if line.partner_id.address[0].country_id:
if line.partner_id.address and line.partner_id.address[0].country_id:
res['country'] = line.partner_id.address[0].country_id.code
else:
res['pname'] = ''
res['name'] = line.name
res['debit'] = line.debit
res['credit'] = line.credit
result.append(res)
return result
report_sxw.report_sxw('report.account.tax.code.entries', 'account.tax.code',
addons/account/report/tax_report.py
+1 -1
View File
@@ -57,7 +57,7 @@ class tax_report(rml_parse.rml_parse):
return new
else:
return self.comma_me(new)
def _get_lines(self, based_on,period_list,company_id, parent=False, level=0):
def _get_lines(self, based_on,period_list,company_id=False, parent=False, level=0):
res = self._get_codes(based_on,company_id,parent,level,period_list)
if period_list[0][2] :