OpenERP CLEARCORP Addons

Merge lp:~juan-munoz-clearcorp/openerp-ccorp-addons/ccorp_addons_feature2 into lp:openerp-ccorp-addons/6.1

  1. ccorp_addons_feature2
  2. Merge into 6.1
Proposed by Juan Felipe Muñoz Ramos
Status: Merged
Merge reported by: Carlos Vásquez (ClearCorp)
Merged at revision: not available
Proposed branch: lp:~juan-munoz-clearcorp/openerp-ccorp-addons/ccorp_addons_feature2
Merge into: lp:openerp-ccorp-addons/6.1
Diff against target: 37 lines (+7/-1)
3 files modified
account_voucher_check/i18n/es_CR.po (+5/-0)
account_voucher_check/report/check_voucher.mako (+1/-0)
ccorp_payment_receipt/report/payment_receipt.mako (+1/-1)
To merge this branch: bzr merge lp:~juan-munoz-clearcorp/openerp-ccorp-addons/ccorp_addons_feature2
Reviewer Review Type Date Requested Status
ClearCorp development team Pending
Review via email: mp+101795@code.launchpad.net

Description of the change

[FIX] account_voucher_check check.mako

To post a comment you must log in.
lp:~juan-munoz-clearcorp/openerp-ccorp-addons/ccorp_addons_feature2 updated
536. By Juan Felipe Muñoz Ramos

[FIX] change check report

537. By Juan Felipe Muñoz Ramos

[FIX] change check report

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account_voucher_check/i18n/es_CR.po'
2--- account_voucher_check/i18n/es_CR.po 2012-01-04 20:07:15 +0000
3+++ account_voucher_check/i18n/es_CR.po 2012-04-12 20:53:17 +0000
4@@ -79,3 +79,8 @@
5 #: report:report.account.voucher.layout_ccorp:1
6 msgid "Date"
7 msgstr "FECHA"
8+
9+#. module: ccorp_payment_receipt
10+#: report:addons/ccorp_payment_receipt/report/payment_receipt.mako:23
11+msgid "In words"
12+msgstr "EN LETRAS"
13
14=== modified file 'account_voucher_check/report/check_voucher.mako'
15--- account_voucher_check/report/check_voucher.mako 2012-01-12 23:26:52 +0000
16+++ account_voucher_check/report/check_voucher.mako 2012-04-12 20:53:17 +0000
17@@ -35,6 +35,7 @@
18 %endif
19 </div>
20 </div>
21+ </br>
22 <div id = "accounts">
23 <table width = "100%" id = "table_account" cellpadding = "0" cellspacing = "0">
24 <thead><tr><th>&nbsp;</th><th>&nbsp;</th><th>&nbsp;</th><th>&nbsp;</th></tr></thead>
25
26=== modified file 'ccorp_payment_receipt/report/payment_receipt.mako'
27--- ccorp_payment_receipt/report/payment_receipt.mako 2012-04-11 18:25:09 +0000
28+++ ccorp_payment_receipt/report/payment_receipt.mako 2012-04-12 20:53:17 +0000
29@@ -20,7 +20,7 @@
30 <span class="text_doct">${_("The amount of")}:</span> <span class = "amount_text">${check.currency_id.symbol_prefix or ''|entity } ${formatLang(check.amount)} ${check.currency_id.symbol_suffix or ''|entity }</span>
31 </div>
32 <div class = "detail">
33- <span class="text_doct">${_("In words ")}:</span> <span class = "amount_text">${get_text(check.amount,check.currency_id,check.partner_id.lang) or ''|entity}</span>
34+ <span class="text_doct">${_("In words")}:</span> <span class = "amount_text">${get_text(check.amount,check.currency_id,check.partner_id.lang) or ''|entity}</span>
35 </div>
36 <div class = "detail">
37 <span class="text_doct">${_("Concept of")}:</span> <span class="text_font">${check.name or ''|entity}</span>

Subscribers

People subscribed via source and target branches