clearcorp team mailing list archive
-
clearcorp team
-
Mailing list archive
-
Message #00104
lp:~juan-munoz-clearcorp/openerp-ccorp-addons/ccorp_addons_feature into lp:openerp-ccorp-addons/6.1
Juan Felipe Muñoz Ramos has proposed merging lp:~juan-munoz-clearcorp/openerp-ccorp-addons/ccorp_addons_feature into lp:openerp-ccorp-addons/6.1.
Requested reviews:
CLEARCORP development team (clearcorp)
For more details, see:
https://code.launchpad.net/~juan-munoz-clearcorp/openerp-ccorp-addons/ccorp_addons_feature/+merge/101636
account_voucher_check
account_payment_receipt
base_currency_symbol
--
https://code.launchpad.net/~juan-munoz-clearcorp/openerp-ccorp-addons/ccorp_addons_feature/+merge/101636
Your team CLEARCORP development team is requested to review the proposed merge of lp:~juan-munoz-clearcorp/openerp-ccorp-addons/ccorp_addons_feature into lp:openerp-ccorp-addons/6.1.
=== renamed directory 'TODO-6.1/account_voucher_check' => 'account_voucher_check'
=== modified file 'account_voucher_check/report/amount_to_text.py'
--- TODO-6.1/account_voucher_check/report/amount_to_text.py 2012-01-06 20:57:23 +0000
+++ account_voucher_check/report/amount_to_text.py 2012-04-11 19:24:25 +0000
@@ -1,7 +1,7 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
-from tools import debug
+#from tools import #debug
UNIDADES = (
'',
'UN ',
@@ -48,9 +48,11 @@
'NOVECIENTOS '
)
-def number_to_text_es(number_in,currency,join_dec=' y ',separator=',',decimal_point='.'):
+def number_to_text_es(number_in,currency,join_dec=' Y ',separator=',',decimal_point='.'):
converted = ''
+ if currency == False:
+ currency = ''
if type(number_in) != 'str':
number = str(number_in)
@@ -64,7 +66,7 @@
except ValueError:
print 'The separator used for the thousands its not supported'
- debug(number_str)
+ #debug(number_str)
try:
number_int, number_dec = number_str.split(decimal_point)
=== modified file 'account_voucher_check/report/check_voucher.py'
--- TODO-6.1/account_voucher_check/report/check_voucher.py 2012-01-04 22:04:48 +0000
+++ account_voucher_check/report/check_voucher.py 2012-04-11 19:24:25 +0000
@@ -37,7 +37,7 @@
from report import report_sxw
from amount_to_text import number_to_text_es
import locale
-from tools import debug
+#from tools import #debug
class check_voucher(report_sxw.rml_parse):
@@ -61,8 +61,8 @@
obj_lang = lang_pool.browse(self.cr,self.uid,id_lang)[0]
separator = obj_lang and obj_lang.thousands_sep or separator
decimal_point = obj_lang and obj_lang.decimal_point or decimal_point
- debug(separator)
- debug(decimal_point)
+ #debug(separator)
+ #debug(decimal_point)
res = number_to_text_es(amount,currency.currency_name,separator=separator,decimal_point=decimal_point)
return res
=== renamed directory 'TODO-6.1/base_currency_symbol' => 'base_currency_symbol'
=== renamed directory 'TODO-6.1/base_import_exchange_rates' => 'base_import_exchange_rates'
=== renamed directory 'TODO-6.1/ccorp_payment_receipt' => 'ccorp_payment_receipt'
=== modified file 'ccorp_payment_receipt/i18n/es_CR.po'
--- TODO-6.1/ccorp_payment_receipt/i18n/es_CR.po 2012-01-06 19:01:48 +0000
+++ ccorp_payment_receipt/i18n/es_CR.po 2012-04-11 19:24:25 +0000
@@ -82,5 +82,5 @@
#. module: ccorp_payment_receipt
#: report:report.account.voucher.layout_ccorp:1
-msgid "In words the amount of"
-msgstr "EN LETRAS LA SUMA DE"
+msgid "In words"
+msgstr "EN LETRAS"
=== modified file 'ccorp_payment_receipt/report/amount_to_text.py'
--- TODO-6.1/ccorp_payment_receipt/report/amount_to_text.py 2012-01-06 20:57:23 +0000
+++ ccorp_payment_receipt/report/amount_to_text.py 2012-04-11 19:24:25 +0000
@@ -1,7 +1,7 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
-from tools import debug
+#from tools import #debug
UNIDADES = (
'',
'UN ',
@@ -48,9 +48,11 @@
'NOVECIENTOS '
)
-def number_to_text_es(number_in,currency,join_dec=' y ',separator=',',decimal_point='.'):
+def number_to_text_es(number_in,currency,join_dec=' Y ',separator=',',decimal_point='.'):
converted = ''
+ if currency == False:
+ currency = ''
if type(number_in) != 'str':
number = str(number_in)
@@ -64,7 +66,7 @@
except ValueError:
print 'The separator used for the thousands its not supported'
- debug(number_str)
+ #debug(number_str)
try:
number_int, number_dec = number_str.split(decimal_point)
=== modified file 'ccorp_payment_receipt/report/payment_receipt.mako'
--- TODO-6.1/ccorp_payment_receipt/report/payment_receipt.mako 2012-01-06 19:20:17 +0000
+++ ccorp_payment_receipt/report/payment_receipt.mako 2012-04-11 19:24:25 +0000
@@ -20,7 +20,7 @@
<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>
</div>
<div class = "detail">
- <span class="text_doct">${_("In words the amount of")}:</span> <span class = "amount_text">${get_text(check.amount,check.currency_id,check.partner_id.lang) or ''|entity}</span>
+ <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>
</div>
<div class = "detail">
<span class="text_doct">${_("Concept of")}:</span> <span class="text_font">${check.name or ''|entity}</span>
@@ -29,11 +29,11 @@
<span class="text_doct">${_("Observations")}:</span> <span class = "text_font"> ${check.narration or ''|entity}</span>
</div>
</div>
- <hr/>
+ <!--hr/-->
<table id = "validation">
<tr>
<td class = "line">
- <hr/>
+ <!--hr/-->
</td>
<td class = "payment_method">
%if check.journal_id.type == 'cash':
Follow ups
