diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index b48d4ab1606..aa2eaa40d1a 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -63,7 +63,7 @@ - + diff --git a/addons/account/account_report.xml b/addons/account/account_report.xml index 3fe2e12a138..83b186bddd1 100644 --- a/addons/account/account_report.xml +++ b/addons/account/account_report.xml @@ -3,6 +3,7 @@ + diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml index 250c51840d9..f74fc8d21b4 100644 --- a/addons/account/report/account_balance.rml +++ b/addons/account/report/account_balance.rml @@ -59,10 +59,18 @@ - - - - + + + + + + + + + + + + @@ -91,14 +99,14 @@ - + - - + + @@ -146,7 +154,7 @@ - [[ get_fiscalyear(data['form']) or removeParentNode('para') ]]: + [[ get_fiscalyear(data['form']) or removeParentNode('para') ]]: [[ get_periods(data['form']) or removeParentNode('para') ]] @@ -155,44 +163,20 @@ - + - - Code - - - Account - - - Debit - - - Credit - - - Balance - + Code + Account + Debit + Credit + Balance - [[ repeatIn(lines(data['form']), 'a') ]][[ a['code'] or removeParentNode('tr') ]] - - - [[ (a['level']<3 and setTag('tr','tr',{'style':'TrLevel'+str(a['level']), 'paraStyle':('Level'+str(a['level']))})) or removeParentNode('font') ]] - [[ (a['level']>2 and setTag('tr','tr',{'style':'TrLevel', 'paraStyle':('Level')})) or removeParentNode('font') ]] - [[ '...'*(a['level']) ]][[ a['name'] ]] - - - [[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['debit']) ]] - [[ a['type']<>'view' and removeParentNode('font') ]] [[formatLang(a['debit']) ]] - - - [[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['credit']) ]] - [[ a['type']<>'view' and removeParentNode('font') ]] [[ formatLang(a['credit']) ]] - - - [[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['balance']) ]] - [[ a['type']<>'view' and removeParentNode('font') ]] [[ formatLang(a['balance']) ]] - + [[ repeatIn(lines(data['form']), 'a') ]][[ a['level']>2 and setTag('para','para',{'fontName':"Helvetica"}) ]][[ a['code'] or removeParentNode('tr') ]] + [[ a['level']>2 and setTag('para','para',{'fontName':"Helvetica"}) ]][[ '..'*(a['level']-1) ]][[ a['name'] ]] + [[ a['level']>2 and setTag('para','para',{'fontName':"Helvetica"}) ]][[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['debit']) ]][[ a['type']<>'view' and removeParentNode('font') ]] [[formatLang(a['debit']) ]] + [[ a['level']>2 and setTag('para','para',{'fontName':"Helvetica"}) ]][[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['credit']) ]][[ a['type']<>'view' and removeParentNode('font') ]] [[ formatLang(a['credit']) ]] + [[ a['level']>2 and setTag('para','para',{'fontName':"Helvetica"}) ]][[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['balance']) ]][[ a['type']<>'view' and removeParentNode('font') ]] [[ formatLang(a['balance']) ]] diff --git a/addons/account/report/account_journal.rml b/addons/account/report/account_journal.rml index 9e782e5bce3..2c8036ca82f 100644 --- a/addons/account/report/account_journal.rml +++ b/addons/account/report/account_journal.rml @@ -120,70 +120,31 @@ [[ repeatIn(objects, 'o') ]] - - Date - - - Voucher No - - - A/c No. - - - Third party - - - Entry label - - - Debit - - - Credit - + Date + Voucher No + A/c No. + Third party + Entry label + Debit + Credit - - [[o.period_id.name ]] - - - [[ o.journal_id.code ]] - - - - - [[ formatLang(sum_debit(o.period_id.id, o.journal_id.id)) ]] - - - [[ formatLang(sum_credit(o.period_id.id, o.journal_id.id)) ]] - + [[o.period_id.name ]] + [[ o.journal_id.code ]] + + + + [[ formatLang(sum_debit(o.period_id.id, o.journal_id.id)) ]] + [[ formatLang(sum_credit(o.period_id.id, o.journal_id.id)) ]] - - - [[ repeatIn(lines(o.period_id.id, o.journal_id.id), 'line') ]] - [[ formatLang(line.date,date=True) ]] - - - [[ line.ref ]] - - - [[ line.account_id.code ]] - - - [[ line.partner_id and line.partner_id.name ]] - - - [[ line.name ]] - - - [[ formatLang(line.debit) ]] - - - [[ formatLang(line.credit) ]] - - - - + + [[ repeatIn(lines(o.period_id.id, o.journal_id.id), 'line') ]][[ formatLang(line.date,date=True) ]] + [[ line.ref ]] + [[ line.account_id.code ]] + [[ line.partner_id and line.partner_id.name ]] + [[ line.name ]] + [[ formatLang(line.debit) ]] + [[ formatLang(line.credit) ]] diff --git a/addons/account/report/account_tax_code.py b/addons/account/report/account_tax_code.py index 972646c96cf..21126c57146 100644 --- a/addons/account/report/account_tax_code.py +++ b/addons/account/report/account_tax_code.py @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*- ############################################################################## # -# OpenERP, Open Source Management Solution +# OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (). All Rights Reserved # $Id$ # @@ -28,12 +28,37 @@ 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, + 'get_line':self.get_line, }) - + + def get_line(self,obj): + 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: + res['date'] = line.date + res['ref'] = line.ref + res['acode'] = line.account_id.code + 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: + 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/account_tax_code.rml', parser=account_tax_code_report, header=False) diff --git a/addons/account/report/account_tax_code.rml b/addons/account/report/account_tax_code.rml index 72bbf56c9e9..e1dd6bdade9 100644 --- a/addons/account/report/account_tax_code.rml +++ b/addons/account/report/account_tax_code.rml @@ -41,7 +41,21 @@ - + + + + + + + + + + + + + + + @@ -69,6 +83,7 @@ + @@ -90,81 +105,44 @@ - - - + + + + + [[ o.name ]] + +
- - Date - - - Voucher Nb - - - Account Number - - - Third party (Country) - - - Entry label - - - Debit - - - Credit - - - - - - [[ repeatIn(objects, 'o') ]] - [[ repeatIn(o.line_ids, 'line') ]] - - - - [[ formatLang(line.date,date=True) ]] - - - [[ line.ref ]] - - - [[ line.account_id.code ]] - - - [[ 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 removeParentNode('font') ]] ) - - - [[ line.name ]] - - - [[ formatLang(line.debit) ]] - - - [[ formatLang(line.credit) ]] - - - - + Date + Voucher Nb + Account Number + Third party (Country) + Entry label + Debit + Credit + + [[ repeatIn(get_line(o),'line') ]][[ not line and removeParentNode('tr') ]][[ formatLang(line['date'],date=True) ]] + [[ line['ref'] ]] + [[ line['acode'] ]] + [[ line['pname'] ]]([[ line['country'] ]] ) + [[ line['name'] ]] + [[ formatLang(line['debit']) ]] + [[ formatLang(line['credit']) ]] +
diff --git a/addons/account/report/central_journal.rml b/addons/account/report/central_journal.rml index d8f78bce8cb..1fe5b8be0f8 100644 --- a/addons/account/report/central_journal.rml +++ b/addons/account/report/central_journal.rml @@ -80,6 +80,7 @@ + @@ -103,79 +104,50 @@ - + - + - + [[ repeatIn(objects, 'o') ]] - - - - - - - Central Journal - - - - - + + Central Journal + - + - - Journal Code - - - Journal Name - - - Printing Date - + Journal Code + Journal Name + Printing Date - - [[ o.journal_id.code or '' ]] - - - [[ o.journal_id.name ]] - - - [[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'),date_time = True) ]] - + [[ o.journal_id.code or '' ]] + [[ o.journal_id.name ]] + [[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'),date_time = True) ]] - + - - Account Num. - - - Account Name - - - Debit - - - Credit - + Account Num. + Account Name + Debit + Credit @@ -183,20 +155,10 @@ - - Total: - - - - - - - - [[ formatLang( sum_debit(o.period_id.id, o.journal_id.id)) ]] - - - [[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)) ]] - + Total: + + [[ formatLang( sum_debit(o.period_id.id, o.journal_id.id)) ]] + [[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)) ]] @@ -206,25 +168,17 @@ [[ repeatIn(lines(o.period_id.id,o.journal_id.id),'line') ]] - - [[ line['code'] ]] - - - [[ line['name'] ]] - - - [[ formatLang(line['debit']) ]] - - - [[ formatLang(line['credit'])]] - + [[ line['code'] ]] + [[ line['name'] ]] + [[ formatLang(line['debit']) ]] + [[ formatLang(line['credit'])]] - + diff --git a/addons/account/report/general_journal.rml b/addons/account/report/general_journal.rml index 5a9ccff4213..6c62d82eb88 100644 --- a/addons/account/report/general_journal.rml +++ b/addons/account/report/general_journal.rml @@ -52,6 +52,7 @@ + @@ -84,13 +85,10 @@ - + - - - - + @@ -110,10 +108,10 @@ - + - + Printing Date : @@ -123,60 +121,27 @@ - + - - - - + - - Code - - - Journal Name - - - Period - - - Debit Trans. - - - Credit Trans. - + Code + Journal Name + Period + Debit Trans. + Credit Trans. - - - - - Total: - - - - - - - - - - - - - [[ formatLang(sum_debit()) ]] - - - [[ formatLang( sum_credit()) ]] - + Total: + + + [[ formatLang(sum_debit()) ]] + [[ formatLang( sum_credit()) ]] - - -
[[ repeatIn( periods(objects), 'o') ]] @@ -228,7 +193,7 @@
- + diff --git a/addons/account/report/invoice.rml b/addons/account/report/invoice.rml index f3acb1c3a54..48ce2043177 100644 --- a/addons/account/report/invoice.rml +++ b/addons/account/report/invoice.rml @@ -206,6 +206,7 @@ + @@ -235,11 +236,7 @@ [[ setLang(o.partner_id.lang) ]] - - - - - + [[ o.partner_id.title or '' ]] [[ o.partner_id.name ]] [[ o.address_invoice_id.title or '' ]] [[ o.address_invoice_id.name ]] @@ -248,7 +245,7 @@ [[ o.address_invoice_id.zip or '' ]] [[ o.address_invoice_id.city or '' ]] [[ o.address_invoice_id.state_id and o.address_invoice_id.state_id.name or '' ]] [[ o.address_invoice_id.country_id and o.address_invoice_id.country_id.name or '' ]] - + Tel. : [[ o.address_invoice_id.phone or removeParentNode('para') ]] @@ -264,131 +261,61 @@ Refund [[ (o.type=='out_refund' or removeParentNode('para')) and '' ]] [[ o.number ]] Supplier Refund [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]] [[ o.number ]] Supplier Invoice [[ (o.type=='in_invoice' or removeParentNode('para')) and '' ]] [[ o.number ]] - + - - Document - - - Invoice Date - - - Partner Ref. - + Document + Invoice Date + Partner Ref. - - [[ o.name ]] - - - [[ formatLang(o.date_invoice,date=True) ]] - - - [[ o.address_invoice_id.partner_id.ref or '' ]] - + [[ o.name ]] + [[ formatLang(o.date_invoice,date=True) ]] + [[ o.address_invoice_id.partner_id.ref or '' ]] - + + + + - - Description - - - Taxes - - - Quantity - - - Unit Price - - - Disc. (%) - - - Price - + Description + Taxes + Quantity + Unit Price + Disc. (%) + Price
[[ repeatIn(o.invoice_line,'l') ]] - - [[ l.name ]] - - - [[ ', '.join([ lt.description or '' for lt in l.invoice_line_tax_id ]) ]] - - - [[ formatLang(l.quantity)]] - - - [[ (l.uos_id and l.uos_id.name) or '' ]] - - - [[ formatLang(l.price_unit) ]] - - - [[ formatLang(l.discount) ]] - - - [[ formatLang(l.price_subtotal) ]] - - - [[ o.currency_id.code ]] - + [[ l.name ]] + [[ ', '.join([ lt.description or '' for lt in l.invoice_line_tax_id ]) ]] + [[ formatLang(l.quantity)]] + [[ (l.uos_id and l.uos_id.name) or '' ]] + [[ formatLang(l.price_unit) ]] + [[ formatLang(l.discount) ]] + [[ formatLang(l.price_subtotal) ]] + [[ o.currency_id.code ]] - - [[ format(l.note or removeParentNode('tr')) ]] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + [[ format(l.note or removeParentNode('tr')) ]] + + + + + + +
@@ -397,63 +324,31 @@ - - - - - - - - - - + + - - Net Total: - - - [[ formatLang(o.amount_untaxed) ]] - - - [[ o.currency_id.code ]] - + Net Total: + [[ formatLang(o.amount_untaxed) ]] + [[ o.currency_id.code ]] - - - - - Taxes: - - - [[ formatLang(o.amount_tax) ]] - - - [[ o.currency_id.code ]] - + Taxes: + [[ formatLang(o.amount_tax) ]] + [[ o.currency_id.code ]] - - - - - Total: - - - [[ formatLang(o.amount_total) ]] - - - [[ o.currency_id.code ]] - + Total: + [[ formatLang(o.amount_total) ]] + [[ o.currency_id.code ]] @@ -462,25 +357,13 @@ - - - - - Tax - - - Base - - - Amount - + Tax + Base + Amount - - - @@ -488,15 +371,9 @@ [[ repeatIn(o.tax_line,'t') ]] - - [[ t.name ]] - - - [[ formatLang(t.base) ]] - - - [[ t.tax_code_id.notprintable and removeParentNode('blockTable') or '' ]][[ formatLang(t.amount) ]] - + [[ t.name ]] + [[ formatLang(t.base) ]] + [[ t.tax_code_id.notprintable and removeParentNode('blockTable') or '' ]][[ formatLang(t.amount) ]] @@ -505,21 +382,9 @@ - - - - - - - - - - - - - - - + + + @@ -527,23 +392,13 @@ - - - - - - - - - - + + - - [[ format(o.comment or removeParentNode('blockTable')) ]] - + [[ format(o.comment or removeParentNode('blockTable')) ]] @@ -551,9 +406,7 @@ - - [[ format((o.payment_term and o.payment_term.note) or removeParentNode('blockTable')) ]] - + [[ format((o.payment_term and o.payment_term.note) or removeParentNode('blockTable')) ]] diff --git a/addons/account/report/partner_balance.rml b/addons/account/report/partner_balance.rml index a096b5a2412..86dc57d2d7d 100644 --- a/addons/account/report/partner_balance.rml +++ b/addons/account/report/partner_balance.rml @@ -57,11 +57,33 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -88,21 +110,16 @@ - - - - - - - - + + + - - - + + + @@ -110,7 +127,7 @@ - + @@ -289,95 +306,41 @@ fontName="Times-Italic" leading="5" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0" /> - + - - [[ setTag('tr','tr',{'style':'Line1'}) ]] Code - - - Partner name - - - Débit - - - Crédit - - - Balance - - - In dispute - + Code + (Account/Partner) Name + Debit + Credit + Balance + In dispute - - [[ setTag('tr','tr',{'style':'Line2'}) ]] Grand total - - - - - - [[ formatLang(sum_debit(data)) ]] - - - [[ formatLang(sum_credit(data)) ]] - - - [[ formatLang((solde_debit(data)-solde_credit(data))) ]] - - - [[ formatLang(sum_litige(data)) ]] - + Grand total + + [[ formatLang(sum_debit(data)) ]] + [[ formatLang(sum_credit(data)) ]] + [[ formatLang((solde_debit(data)-solde_credit(data))) ]] + [[ formatLang(sum_litige(data)) ]] - - - [[ repeatIn(lines(data), 'a') ]][[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ a['ref'] ]] [[ a['type']==3 and a['code'] ]] - - - [[ a['type']==3 and ( setTag('tr','tr',{'style':'TrLevel0'})) ]] [[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]] [[ a['type']==1 and ( setTag('blockTable','blockTable',{'style':'LineLevel1'})) ]] [[ a['name'] ]] - - - - [[ (a['type']==3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica-Bold'}) ]] [[ formatLang(a['debit']) ]] - [[ (a['type']!=3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica'}) ]] [[ formatLang(a['debit']) ]] - - - - - [[ (a['type']==3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica-Bold'}) ]] [[ formatLang(a['credit']) ]] - [[ (a['type']!=3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica'}) ]] [[ formatLang(a['credit']) ]] - - - - - [[ (a['type']==3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica-Bold'}) ]] [[ formatLang(a['balance']) ]] - [[ (a['type']!=3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica'}) ]] [[ formatLang(a['balance']) ]] - - - - - [[ (a['type']==3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica-Bold'}) ]] [[ formatLang(a['enlitige'] or 0.00) ]] - [[ (a['type']!=3 or removeParentNode('font')) and setTag('para','para',{'fontName':'Helvetica'}) ]] [[ formatLang(a['enlitige'] or 0.00) ]] - - + Balance + + [[ formatLang(solde_debit(data)) ]] + [[ formatLang(solde_credit(data)) ]] + + + + + [[ repeatIn(lines(data), 'a') ]][[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]][[ a['ref'] ]] [[ a['type']==3 and a['code'] ]] + [[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]][[ a['name'] ]] + [[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]][[ formatLang(a['debit']) ]] + [[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]][[ formatLang(a['credit']) ]] + [[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]][[ formatLang(a['balance']) ]] + [[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]][[ formatLang(a['enlitige'] or 0.00) ]] diff --git a/addons/account/report/tax_report.py b/addons/account/report/tax_report.py index d82f9ab99bd..abbef9ab238 100644 --- a/addons/account/report/tax_report.py +++ b/addons/account/report/tax_report.py @@ -57,8 +57,8 @@ 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=False, parent=False, level=0): - res = self._get_codes(based_on,parent,level,period_list) + def _get_lines(self, based_on,period_list,company_id, parent=False, level=0): + res = self._get_codes(based_on,company_id,parent,level,period_list) if period_list[0][2] : res = self._add_codes(based_on,res,period_list) @@ -157,15 +157,15 @@ class tax_report(rml_parse.rml_parse): i+=1 return res - def _get_codes(self, based_on, parent=False, level=0,period_list=[]): + def _get_codes(self,based_on, company_id, parent=False, level=0,period_list=[]): tc = self.pool.get('account.tax.code') - ids = tc.search(self.cr, self.uid, [('parent_id','=',parent)]) + ids = tc.search(self.cr, self.uid, [('parent_id','=',parent),('company_id','=',company_id)]) res = [] for code in tc.browse(self.cr, self.uid, ids, {'based_on': based_on}): res.append(('.'*2*level,code)) - res += self._get_codes(based_on, code.id, level+1) + res += self._get_codes(based_on, company_id, code.id, level+1) return res def _add_codes(self,based_on, account_list=[],period_list=[]): diff --git a/addons/account/report/tax_report.rml b/addons/account/report/tax_report.rml index 9cdba22c43f..eecf76f7551 100644 --- a/addons/account/report/tax_report.rml +++ b/addons/account/report/tax_report.rml @@ -54,10 +54,10 @@ - - - - + + + + @@ -88,7 +88,7 @@ - + @@ -116,61 +116,20 @@ - - - - - - - - Code - - - Debit - - - Credit - - - Tax Amount - - - - - - - [[ repeatIn(get_lines(data['form']['based_on'],data['form']['periods'],data['form']['company_id']), 'o') ]] - - [[ '...'*len(o['level']) ]] - [[o['type']==1 and ( setTag('para','para',{'fontName':'Helvetica-Bold'}))]] - - [[ o['code'] ]] [[ o['name'] ]] - - - - - - [[ len(o['level'])>3 and removeParentNode('font') ]][[ formatLang(o['debit']) ]] - [[ len(o['level'])<4 and removeParentNode('font') ]][[ formatLang(o['debit']) ]] - - - - [[ len(o['level'])>3 and removeParentNode('font') ]][[ formatLang(o['credit'])]] - [[ len(o['level'])<4 and removeParentNode('font') ]][[ formatLang(o['credit'])]] - - - - - [[ len(o['level'])>3 and removeParentNode('font') ]][[ formatLang(o['tax_amount']) ]] - [[ len(o['level'])<4 and removeParentNode('font') ]][[ formatLang(o['tax_amount']) ]] - - - - - - - - - + + + + Tax Name + Debit + Credit + Tax Amount + + + [[ repeatIn(get_lines(data['form']['based_on'],data['form']['periods'],data['form']['company_id']), 'o') ]][[ '...'*len(o['level']) ]] [[o['type']==1 and ( setTag('para','para',{'fontName':'Helvetica-Bold'}))]][[ o['code'] ]] [[ o['name'] ]] + [[ len(o['level'])<3 and setTag('para','para',{'fontName':"Helvetica-Bold"}) ]][[ formatLang(o['debit']) ]] + [[ len(o['level'])<3 and setTag('para','para',{'fontName':"Helvetica-Bold"}) ]][[ formatLang(o['credit'])]] + [[ len(o['level'])<3 and setTag('para','para',{'fontName':"Helvetica-Bold"}) ]][[ formatLang(o['tax_amount']) ]] + + diff --git a/addons/account/report/third_party_ledger.py b/addons/account/report/third_party_ledger.py index 3004beddd7e..9828fdfbd63 100644 --- a/addons/account/report/third_party_ledger.py +++ b/addons/account/report/third_party_ledger.py @@ -447,4 +447,8 @@ report_sxw.report_sxw('report.account.third_party_ledger', 'res.partner', 'addons/account/report/third_party_ledger.rml',parser=third_party_ledger, header=False) +report_sxw.report_sxw('report.account.third_party_ledger_other', 'res.partner', + 'addons/account/report/third_party_ledger_other.rml',parser=third_party_ledger, + header=False) + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/report/third_party_ledger.rml b/addons/account/report/third_party_ledger.rml index 91a9b67d7ca..82d14a6ef94 100644 --- a/addons/account/report/third_party_ledger.rml +++ b/addons/account/report/third_party_ledger.rml @@ -124,117 +124,54 @@ - - - [[ data['form']['page_split'] == True or removeParentNode('para') ]] - [[ repeatIn(objects, 'p') ]] [[ setLang(p.partner_id.lang) ]] - - + [[ repeatIn(objects, 'p') ]] [[ setLang(p.partner_id.lang) ]] - - - Date - - - JNRL - - - Ref. - - - Entry label - - - Debit - - - Credit - - - Balance - - - + Date + JNRL + Ref. + Entry label + Debit + Credit + Balance - + - - Balance brought forward - - - [[ formatLang((sum_debit(data))) ]] - - - [[ formatLang((sum_credit(data))) ]] - - - [[ formatLang((sum_debit(data) - sum_credit(data))) ]] - + Balance brought forward + [[ formatLang((sum_debit(data))) ]] + [[ formatLang((sum_credit(data))) ]] + [[ formatLang((sum_debit(data) - sum_credit(data))) ]] - - [[ data['form']['page_split'] == False or removeParentNode('para') ]] - [[ repeatIn(objects, 'p') ]] - - - [[ p.ref ]] - [[ p.name ]] - - - - - - [[ formatLang((sum_debit_partner(p,data))) ]] - - - [[ formatLang((sum_credit_partner(p,data))) ]] - - - [[ formatLang((sum_debit_partner(p,data) - sum_credit_partner(p,data))) ]] - + [[ p.ref ]] - [[ p.name ]] + + [[ formatLang((sum_debit_partner(p,data))) ]] + [[ formatLang((sum_credit_partner(p,data))) ]] + [[ formatLang((sum_debit_partner(p,data) - sum_credit_partner(p,data))) ]] - - [[ repeatIn(lines(p,data), 'line') ]][[ formatLang(line['date'],date=True) ]] - - - [[ line['code'] ]] - - - [[ line['ref'] ]] / [[ line['name'] ]] - - - - - - [[ formatLang((line['debit'])) ]] - - - [[ formatLang((line['credit'])) ]] - - - [[ formatLang((line['progress'])) ]] - + [[ repeatIn(lines(p,data), 'line') ]][[ formatLang(line['date'],date=True) ]] + [[ line['code'] ]] + [[ line['ref'] ]] / [[ line['name'] ]] + + [[ formatLang((line['debit'])) ]] + [[ formatLang((line['credit'])) ]] + [[ formatLang((line['progress'])) ]] - - - - - \ No newline at end of file diff --git a/addons/account/report/third_party_ledger_other.rml b/addons/account/report/third_party_ledger_other.rml new file mode 100644 index 00000000000..36a208d1206 --- /dev/null +++ b/addons/account/report/third_party_ledger_other.rml @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Date + JNRL + Ref. + Entry label + Debit + Credit + Balance + + + + + + Balance brought forward + [[ formatLang((sum_debit(data))) ]] + [[ formatLang((sum_credit(data))) ]] + [[ formatLang((sum_debit(data) - sum_credit(data))) ]] + + + + + + + [[ repeatIn(objects, 'p') ]] + + + [[ p.ref ]] - [[ p.name ]] + + [[ formatLang((sum_debit_partner(p,data))) ]] + [[ formatLang((sum_credit_partner(p,data))) ]] + [[ formatLang((sum_debit_partner(p,data) - sum_credit_partner(p,data))) ]] + + + + + [[ repeatIn(lines(p,data), 'line') ]][[ formatLang(line['date'],date=True) ]] + [[ line['code'] ]] + [[ line['ref'] ]] / [[ line['name'] ]] + + [[ formatLang((line['debit'])) ]] + [[ formatLang((line['credit'])) ]] + [[ formatLang((line['progress'])) ]] + + + + + + + \ No newline at end of file diff --git a/addons/account/wizard/wizard_third_party_ledger.py b/addons/account/wizard/wizard_third_party_ledger.py index 8d7a46868ed..be83d6d615f 100755 --- a/addons/account/wizard/wizard_third_party_ledger.py +++ b/addons/account/wizard/wizard_third_party_ledger.py @@ -105,6 +105,12 @@ class wizard_report(wizard.interface): data['form']['soldeinit'] = True return data['form'] + def _check(self, cr, uid, data, context): + if data['form']['page_split']==True: + return 'report' + else: + return 'report_other' + def _check_date(self, cr, uid, data, context): sql = """ @@ -134,12 +140,21 @@ class wizard_report(wizard.interface): states = { 'init': { 'actions': [_get_defaults], - 'result': {'type':'form', 'arch':period_form, 'fields':period_fields, 'state':[('end','Cancel','gtk-cancel'),('report','Print','gtk-print')]} + 'result': {'type':'form', 'arch':period_form, 'fields':period_fields, 'state':[('end','Cancel','gtk-cancel'),('checkreport','Print','gtk-print')]} + }, + 'checkreport': { + 'actions': [], + 'result': {'type':'choice','next_state':_check} }, 'report': { 'actions': [_check_state], 'result': {'type':'print', 'report':'account.third_party_ledger', 'state':'end'} + }, + 'report_other': { + 'actions': [_check_state], + 'result': {'type':'print', 'report':'account.third_party_ledger_other', 'state':'end'} } + } wizard_report('account.third_party_ledger.report')