OneTeam/oc-facho
16
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Amount implementa truncate_as_string para forzar truncado de Decimal

Browse Source 
FossilOrigin-Name: e65c80a4d6956aff8cd80f3ee35cad827ffbd5c965a1fb651ab07424e6b22f31
This commit is contained in:
bit4bit 2020-11-11 01:58:01 +00:00
parent f648188834
commit bcf5120d82
3 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
facho/fe/fe.py
View File

@ -185,14 +185,14 @@ class DianXMLExtensionCUFE(DianXMLExtensionCUDFE):
'%s' % build_vars['NumFac'], '%s' % build_vars['NumFac'],
'%s' % build_vars['FecFac'], '%s' % build_vars['FecFac'],
'%s' % build_vars['HoraFac'], '%s' % build_vars['HoraFac'],
form.Amount(build_vars['ValorBruto']).format('%.02f'), form.Amount(build_vars['ValorBruto']).truncate_as_string(2),
CodImpuesto1, CodImpuesto1,
form.Amount(build_vars['ValorImpuestoPara'].get(CodImpuesto1, 0.0)).format('%.02f'), build_vars['ValorImpuestoPara'].get(CodImpuesto1, form.Amount(0.0)).truncate_as_string(2),
CodImpuesto2, CodImpuesto2,
form.Amount(build_vars['ValorImpuestoPara'].get(CodImpuesto2, 0.0)).format('%.02f'), build_vars['ValorImpuestoPara'].get(CodImpuesto2, form.Amount(0.0)).truncate_as_string(2),
CodImpuesto3, CodImpuesto3,
form.Amount(build_vars['ValorImpuestoPara'].get(CodImpuesto3, 0.0)).format('%.02f'), build_vars['ValorImpuestoPara'].get(CodImpuesto3, form.Amount(0.0)).truncate_as_string(2),
form.Amount(build_vars['ValorTotalPagar']).format('%.02f'), build_vars['ValorTotalPagar'].truncate_as_string(2),
'%s' % build_vars['NitOFE'], '%s' % build_vars['NitOFE'],
'%s' % build_vars['NumAdq'], '%s' % build_vars['NumAdq'],
'%s' % build_vars['ClTec'], '%s' % build_vars['ClTec'],
@ -222,14 +222,14 @@ class DianXMLExtensionCUDE(DianXMLExtensionCUDFE):
'%s' % build_vars['NumFac'], '%s' % build_vars['NumFac'],
'%s' % build_vars['FecFac'], '%s' % build_vars['FecFac'],
'%s' % build_vars['HoraFac'], '%s' % build_vars['HoraFac'],
form.Amount(build_vars['ValorBruto']).format('%.02f'), form.Amount(build_vars['ValorBruto']).truncate_as_string(2),
CodImpuesto1, CodImpuesto1,
form.Amount(build_vars['ValorImpuestoPara'].get(CodImpuesto1, 0.0)).format('%.02f'), form.Amount(build_vars['ValorImpuestoPara'].get(CodImpuesto1, 0.0)).truncate_as_string(2),
CodImpuesto2, CodImpuesto2,
form.Amount(build_vars['ValorImpuestoPara'].get(CodImpuesto2, 0.0)).format('%.02f'), form.Amount(build_vars['ValorImpuestoPara'].get(CodImpuesto2, 0.0)).truncate_as_string(2),
CodImpuesto3, CodImpuesto3,
form.Amount(build_vars['ValorImpuestoPara'].get(CodImpuesto3, 0.0)).format('%.02f'), form.Amount(build_vars['ValorImpuestoPara'].get(CodImpuesto3, 0.0)).truncate_as_string(2),
form.Amount(build_vars['ValorTotalPagar']).format('%.02f'), form.Amount(build_vars['ValorTotalPagar']).truncate_as_string(2),
'%s' % build_vars['NitOFE'], '%s' % build_vars['NitOFE'],
'%s' % build_vars['NumAdq'], '%s' % build_vars['NumAdq'],
'%s' % build_vars['Software-PIN'], '%s' % build_vars['Software-PIN'],

14
facho/fe/form/__init__.py
View File

@ -53,7 +53,7 @@ class AmountCollection(Collection):
return total return total
class Amount: class Amount:
def __init__(self, amount: int or float or Amount, currency: Currency = Currency('COP')): def __init__(self, amount: int or float or str or Amount, currency: Currency = Currency('COP')):
#DIAN 1.7.-2020: 1.2.3.1 #DIAN 1.7.-2020: 1.2.3.1
if isinstance(amount, Amount): if isinstance(amount, Amount):
@ -63,7 +63,7 @@ class Amount:
self.amount = amount.amount self.amount = amount.amount
self.currency = amount.currency self.currency = amount.currency
else: else:
if amount < 0: if float(amount) < 0:
raise ValueError('amount must be positive >= 0') raise ValueError('amount must be positive >= 0')
self.amount = Decimal(amount, decimal.Context(prec=DECIMAL_PRECISION, self.amount = Decimal(amount, decimal.Context(prec=DECIMAL_PRECISION,
@ -75,14 +75,13 @@ class Amount:
return Amount(val, currency=self.currency) return Amount(val, currency=self.currency)
def round(self, prec): def round(self, prec):
#return Amount(self.amount.quantize(Decimal('1.' + '0' * prec), rounding=decimal.ROUND_HALF_EVEN)) return Amount(round(self.amount, prec), currency=self.currency)
return Amount(round(self.amount, prec))
def __round__(self, prec): def __round__(self, prec):
return round(self.amount, prec) return round(self.amount, prec)
def __str__(self): def __str__(self):
return '%.06f' % self.amount return str(self.float())
def __lt__(self, other): def __lt__(self, other):
if not self.is_same_currency(other): if not self.is_same_currency(other):
@ -122,8 +121,9 @@ class Amount:
def is_same_currency(self, other): def is_same_currency(self, other):
return self.currency == other.currency return self.currency == other.currency
def format(self, formatter): def truncate_as_string(self, prec):
return formatter % self.float() parts = str(self.float()).split('.', 1)
return '%s.%s' % (parts[0], parts[1][0:prec].ljust(prec,'0'))
def float(self): def float(self):
return float(round(self.amount, DECIMAL_PRECISION)) return float(round(self.amount, DECIMAL_PRECISION))

9
tests/test_amount.py
View File

@ -31,3 +31,12 @@ def test_round():
assert str(form.Amount(1.1560).round(2)) == str(form.Amount(1.15)) assert str(form.Amount(1.1560).round(2)) == str(form.Amount(1.15))
# 5, y el segundo dígito siguiente al dígito menos significativo es impar Incrementar el dígito menos significativo # 5, y el segundo dígito siguiente al dígito menos significativo es impar Incrementar el dígito menos significativo
assert form.Amount(1.1569).round(2) == form.Amount(1.157) assert form.Amount(1.1569).round(2) == form.Amount(1.157)
def test_amount_truncate():
assert form.Amount(1.1569).truncate_as_string(2) == '1.15'
assert form.Amount(587.0700).truncate_as_string(2) == '587.07'
assert form.Amount(14705.8800).truncate_as_string(2) == '14705.88'
assert form.Amount(9423.7000).truncate_as_string(2) == '9423.70'
assert form.Amount(10084.03).truncate_as_string(2) == '10084.03'
assert form.Amount(10000.02245).truncate_as_string(2) == '10000.02'
assert form.Amount(10000.02357).truncate_as_string(2) == '10000.02'