diff --git a/addons/account/report/voucher_print.rml b/addons/account/report/voucher_print.rml index ac380c0a5a5..08e2f378c6a 100644 --- a/addons/account/report/voucher_print.rml +++ b/addons/account/report/voucher_print.rml @@ -2,7 +2,7 @@ @@ -10,37 +10,80 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + @@ -50,35 +93,19 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - + @@ -130,72 +157,62 @@ + + - [[ repeatIn(objects,'voucher') ]] - [[ company.name ]] - [[ company.partner_id.address and company.partner_id.address[0].street ]] - [[ company.partner_id.address and company.partner_id.address[0].zip ]] [[ company.partner_id.address and company.partner_id.address[0].city ]] - [[ company.partner_id.address and company.partner_id.address[0].country_id and company.partner_id.address[0].country_id.name ]] - [[ company.partner_id.address and company.partner_id.address[0].phone ]] - [[ company.partner_id.address and company.partner_id.address[0].email ]] - - + + [[ repeatIn(objects,'voucher') ]] - [[ voucher.journal_id.name ]] - - - - + - Name: + Type: - [[ voucher.name ]] + [[ voucher.journal_id.name ]] - - - + Name: - Dated : - - - [[ formatLang(voucher.date, date=True) or '' ]] - - - - - State : - - - PRO-FORMA [[ ((voucher.state == 'proforma') or removeParentNode('para')) and '' ]] - Draft[[ ((voucher.state == 'draft') or removeParentNode('para')) and '' ]] - Canceled [[ ((voucher.state == 'cancel') or removeParentNode('para')) and '' ]] - Posted [[ ((voucher.state == 'posted') or removeParentNode('para')) and '' ]] - - - - - - - - Ref. : - - - [[ voucher.ref]] + [[ voucher.name ]] - + + + + Date: + + + [[ formatLang(voucher.date , date=True) or '' ]] + + + State: + + + PRO-FORMA [[ ((voucher.state == 'proforma') or removeParentNode('para')) and '' ]] + Draft[[ ((voucher.state == 'draft') or removeParentNode('para')) and '' ]] + Canceled [[ ((voucher.state == 'cancel') or removeParentNode('para')) and '' ]] + Posted [[ ((voucher.state == 'posted') or removeParentNode('para')) and '' ]] + + + Ref. : + + + [[ voucher.ref]] + + + + - + - + Particulars @@ -213,7 +230,7 @@
[[ repeatIn(voucher.line_id,'line_id') ]] - + [[ (line_id.partner_id and line_id.partner_id.name) or 'Account']] @@ -242,7 +259,7 @@ - [[ line_id.name ]]-[[voucher.ref]] + [[ line_id.name ]]-[[voucher.ref]] @@ -260,13 +277,73 @@
- + - + - Through : + Through : + + + + + + + + + + + + + + + [[ voucher.narration or '']] + + + + + + + + + + + + + + + On Account of : + + + + + + + + + + + + + + + [[ voucher.line_id and voucher.line_id.name and voucher.line_id.name[1] or removeParentNode('para') ]] + + + + + + + + + + + + + + + Amount (in words) : @@ -281,82 +358,27 @@ - [[ voucher.narration or '']] + [[ convert(voucher.amount) ]] - + - + + + + + + - On Account of : - - - - - - - - - - - - - - - [[ voucher.line_id and voucher.line_id.name and voucher.line_id.name[1] or removeParentNode('para') ]] - - - - - - - - - - - - - - - Amount (in words) : - - - - - - - - - - - - - - - [[ convert(voucher.amount) ]] - - - - - - - - - - - - - - - + @@ -368,57 +390,57 @@ - + - + - + - + - + - + - + - + - + - Receiver's Signature + Receiver's Signature - + - + - Authorised Signatory + Authorised Signatory diff --git a/addons/account_voucher/report/report_voucher.py b/addons/account_voucher/report/report_voucher.py index a3f3bb0380d..8c7b1ccbbea 100644 --- a/addons/account_voucher/report/report_voucher.py +++ b/addons/account_voucher/report/report_voucher.py @@ -61,5 +61,5 @@ report_sxw.report_sxw( 'report.voucher.cash_receipt.drcr', 'account.voucher', 'addons/account_voucher/report/report_voucher.rml', - parser=report_voucher,header=False + parser=report_voucher,header="external" ) diff --git a/addons/account_voucher/report/report_voucher.rml b/addons/account_voucher/report/report_voucher.rml index 23cab480414..cec3972358a 100755 --- a/addons/account_voucher/report/report_voucher.rml +++ b/addons/account_voucher/report/report_voucher.rml @@ -2,7 +2,7 @@ @@ -10,11 +10,73 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + @@ -26,22 +88,6 @@ - - - - - - - - - - - - - - - - @@ -51,31 +97,19 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -92,13 +126,13 @@ - + - - + + @@ -133,81 +167,73 @@ - [[ repeatIn(objects,'voucher') ]] - [[ company.name ]] - [[ company.partner_id.address and company.partner_id.address[0].street ]] - [[ company.partner_id.address and company.partner_id.address[0].zip ]] [[ company.partner_id.address and company.partner_id.address[0].city ]] - [[ company.partner_id.address and company.partner_id.address[0].country_id and company.partner_id.address[0].country_id.name ]] - [[ company.partner_id.address and company.partner_id.address[0].phone ]] - [[ company.partner_id.address and company.partner_id.address[0].email ]] - + [[ repeatIn(objects,'voucher') ]] + - Cash Receipt Voucher [[ (voucher.type == 'rec_voucher' or removeParentNode('para')) and '' ]] - Cash Payment Voucher [[ (voucher.type == 'pay_voucher' or removeParentNode('para')) and '' ]] - Bank Receipt Voucher [[ (voucher.type == 'bank_rec_voucher' or removeParentNode('para')) and '' ]] - Bank Payment Voucher [[ (voucher.type == 'bank_pay_voucher' or removeParentNode('para')) and '' ]] - - - - + - No. + Type: - [[ voucher.number ]] + [[ voucher.type ]] - - - + Number: - Dated : + [[ voucher.number ]] - [[ formatLang(voucher.date, date=True) or '' ]] - - - - - State : + Date: - PRO-FORMA [[ ((voucher.state == 'proforma') or removeParentNode('para')) and '' ]] - Draft[[ ((voucher.state == 'draft') or removeParentNode('para')) and '' ]] - Canceled [[ ((voucher.state == 'cancel') or removeParentNode('para')) and '' ]] - Posted [[ ((voucher.state == 'posted') or removeParentNode('para')) and '' ]] - - - - - - - - Ref. : - - - [[ voucher.reference ]] + [[ formatLang(voucher.date , date=True) or '' ]] - - - - - - - + - Particulars + State: - Debit + PRO-FORMA [[ ((voucher.state == 'proforma') or removeParentNode('para')) and '' ]] + Draft[[ ((voucher.state == 'draft') or removeParentNode('para')) and '' ]] + Canceled [[ ((voucher.state == 'cancel') or removeParentNode('para')) and '' ]] + Posted [[ ((voucher.state == 'posted') or removeParentNode('para')) and '' ]] - Credit + Ref: + + + [[ voucher.reference or '' ]] + + + Account: + + + [[ voucher.account_id.name ]] + + + + + + + + + + + + + Particulars + + + Debit + + + Credit @@ -216,12 +242,10 @@
[[ repeatIn(voucher.move_ids,'move_ids') ]] - + - - [[ (move_ids.partner_id and move_ids.partner_id.name) or 'Account']] - + [[ (move_ids.partner_id and move_ids.partner_id.name) or 'Account']] [[ formatLang(move_ids.debit) ]] @@ -232,9 +256,7 @@ - - [[ move_ids.account_id.name ]] - + [[ move_ids.account_id.name ]] @@ -249,7 +271,7 @@ - [[ move_ids.name ]] - [[ voucher.reference ]] + [[ move_ids.name ]] - [[ get_ref(voucher.id,move_ids) ]] @@ -267,165 +289,167 @@
- + - + - Through : + Through : - + - + - [[ voucher.narration or '']] + [[ voucher.narration or '']] - + - + - On Account of : + On Account of : - + - + - [[ voucher.name ]] + [[ voucher.name ]] - + - + - Amount (in words) : + Amount (in words) : - + - + - [[ convert(voucher.amount,voucher.currency_id.name) ]] + [[ convert(voucher.amount,voucher.currency_id.name) ]] - + - + - - - - - - - - [[ debit(voucher.move_ids)]] - - - [[ credit(voucher.move_ids) ]] - - - + - + - + + + [[ debit(voucher.move_ids)]] + + + [[ credit(voucher.move_ids) ]] + + + + + + + + + + - + - + - + - + - + - Receiver's Signature + Receiver's Signature - + - + - Authorised Signatory + Authorised Signatory diff --git a/addons/account_voucher/report/report_voucher_amount.py b/addons/account_voucher/report/report_voucher_amount.py index 2cb113ae4ed..b691ca638f0 100644 --- a/addons/account_voucher/report/report_voucher_amount.py +++ b/addons/account_voucher/report/report_voucher_amount.py @@ -40,5 +40,5 @@ report_sxw.report_sxw( 'report.voucher.cash_amount', 'account.voucher', 'addons/account_voucher/report/report_voucher_amount.rml', - parser=report_voucher_amount,header=False + parser=report_voucher_amount,header="external" ) diff --git a/addons/account_voucher/report/report_voucher_amount.rml b/addons/account_voucher/report/report_voucher_amount.rml index 71e18a23a69..c23c94a792d 100755 --- a/addons/account_voucher/report/report_voucher_amount.rml +++ b/addons/account_voucher/report/report_voucher_amount.rml @@ -2,7 +2,7 @@ @@ -10,9 +10,51 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -23,21 +65,21 @@ - - - - - + - + + + + + - - + + @@ -48,30 +90,11 @@ - + - - - - - - - - - - - - - - - - - - - - - - + + + @@ -79,7 +102,7 @@ - + @@ -126,98 +149,65 @@ + - [[ repeatIn(objects,'voucher') ]] - [[ company.name ]] - [[ company.partner_id.address and company.partner_id.address[0].street ]] - [[ company.partner_id.address and company.partner_id.address[0].zip ]] [[ company.partner_id.address and company.partner_id.address[0].city ]] - [[ company.partner_id.address and company.partner_id.address[0].country_id and company.partner_id.address[0].country_id.name ]] - [[ company.partner_id.address and company.partner_id.address[0].phone ]] - [[ company.partner_id.address and company.partner_id.address[0].email ]] - - - - Cash Receipt Voucher [[ (voucher.type == 'rec_voucher' or removeParentNode('para')) and '' ]] - Cash Payment Voucher [[ (voucher.type == 'pay_voucher' or removeParentNode('para')) and '' ]] - Bank Receipt Voucher [[ (voucher.type == 'bank_rec_voucher' or removeParentNode('para')) and '' ]] - Bank Payment Voucher [[ (voucher.type == 'bank_pay_voucher' or removeParentNode('para')) and '' ]] - - - - + [[ repeatIn(objects,'voucher') ]] + - No. + Type: - [[ voucher.number ]] + [[ voucher.type ]] - - - + Number: - Dated : + [[ voucher.number ]] - [[ formatLang(voucher.date, date=True) or '' ]] - - - - - State : + Date: - PRO-FORMA [[ ((voucher.state == 'proforma') or removeParentNode('para')) and '' ]] - Draft[[ ((voucher.state == 'draft') or removeParentNode('para')) and '' ]] - Canceled [[ ((voucher.state == 'cancel') or removeParentNode('para')) and '' ]] - Posted [[ ((voucher.state == 'posted') or removeParentNode('para')) and '' ]] - - - - - - - - Ref. : - - - [[ voucher.reference ]] - - - - - Account : - - - [[ voucher.account_id.name ]] - - - - - - - - - - - - - - - + [[ formatLang(voucher.date , date=True) or '' ]] - + + + + State: + + + PRO-FORMA [[ ((voucher.state == 'proforma') or removeParentNode('para')) and '' ]] + Draft[[ ((voucher.state == 'draft') or removeParentNode('para')) and '' ]] + Canceled [[ ((voucher.state == 'cancel') or removeParentNode('para')) and '' ]] + Posted [[ ((voucher.state == 'posted') or removeParentNode('para')) and '' ]] + + + Ref: + + + [[ voucher.reference ]] + + + Account: + + + [[ voucher.account_id.name ]] + + + + - + - + Particulars @@ -227,190 +217,183 @@ - - - - - - -
- [[ repeatIn(voucher.line_ids,'line_ids') ]] - - - - [[ line_ids.partner_id and line_ids.partner_id.name or '' ]] - - - [[ line_ids.amount ]] - - - - - [[ line_ids.account_id.name ]] - - - - - - - - - - [[ line_ids.ref ]] [[ line_ids.amount ]] - - - - - - - - - - [[ line_ids.type ]] - - - - - - - - - + + + +
+ [[ repeatIn(voucher.payment_ids,'payment_ids') ]] + + + + [[ payment_ids.partner_id and payment_ids.partner_id.name or '' ]] + + + [[ payment_ids.amount ]] + + + + + [[ payment_ids.account_id.name ]] + + + -
- + + + + + [[ payment_ids.ref ]] [[ payment_ids.amount ]] + + + + + + + + + + [[ payment_ids.type ]] + + + + + + + + + + + +
+ + + + + + + Through : + + + - + + + + + [[ voucher.narration or '' ]] + + + + + + + + + + On Account of : + + + + + + + + + + [[ voucher.name ]] + + + + + + + + + + Amount (in words) : + + + + + + + + + + [[ convert(voucher.amount,voucher.currency_id.name) ]] + + + - + + + + - - Through : - - - - - [[ voucher.narration or '' ]] - - - - - - - - - - On Account of : - - - - - - - - - - [[ voucher.name ]] - - - - - - - - - - Amount (in words) : - - - - - - - - - - [[ convert(voucher.amount,voucher.currency_id.name) ]] - - - - - - - - - - - - - [[ voucher.amount ]] - + - + - + - + - - - - + - + - + - + - Receiver's Signature + Receiver's Signature - + - + - Authorised Signatory + Authorised Signatory