diff --git a/report/close_statement.fodt b/report/close_statement.fodt index a320e0a..e42deac 100644 --- a/report/close_statement.fodt +++ b/report/close_statement.fodt @@ -1,10 +1,10 @@ - LibreOffice/7.4.7.2$Linux_X86_64 LibreOffice_project/40$Build-22008-06-07T15:28:222009-01-10T16:03:331PT0S + LibreOffice/7.5.6.2$Linux_X86_64 LibreOffice_project/50$Build-22008-06-07T15:28:222009-01-10T16:03:331PT0S - 2625 + 6519 0 19602 8786 @@ -13,12 +13,12 @@ view2 - 2145 - 7507 + 2732 + 8498 0 - 2625 + 6519 19600 - 11409 + 15304 0 0 false @@ -26,116 +26,119 @@ false false false + false + false - false - false - false + true + false true - true + false true - true - true + false false 0 - false - false + true + false + false + false false - false + false true + true true - false false - false + + false false - false + false + false + false true - true true false - false - false false false + false false false - false true - false - false - true - false - false - false - true - 0 - 1 - true - false - - high-resolution - false - - - false - false - true - false - false - true - true - false - true - - true - 3109300 - - true - false - true - true - 0 - - false - false - false - false false - true - 0 - false - false - false - false - true - false - false - false - - false - false - true - false - false - false - false - false - false - false - false - false + false 204959 - false - false - false - false + false + + true + false + false + 3138130 + true + false + false + false + 1 + true + true + false + false + false + false + true + true + true + true false - false + true + 0 + true - true + true + false + false + + 0 + true + false + false + false + high-resolution false + true + false + false + false + false + false + false + false + true + + true + false + true + false + + false + false + false + false + false + false + false + false + false + false + false + false + false + false + 0 + true + false + + true @@ -150,8 +153,9 @@ - - + + + @@ -162,7 +166,7 @@ - + @@ -182,7 +186,7 @@ - + @@ -208,7 +212,7 @@ - + @@ -268,7 +272,7 @@ - + @@ -311,16 +315,16 @@ - + $ - + - $ - + @@ -408,25 +412,6 @@ - - - - - - - - - - - - - - - - - - - @@ -536,6 +521,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -649,24 +671,37 @@ + + + + - - - - + + + + + - + - + - + - + - + + + + + + + + + @@ -1879,55 +1914,60 @@ NIT: 901575528 Fecha: <date> - <if test="range_pos"> + <if test="range_pos"> - Facturas Pos: <range_pos[-1]>/ <range_pos[0]> + Facturas Pos: <range_pos[-1]>/ <range_pos[0]> - </if> - <if test="range_fe"> + </if> + <if test="range_fe"> - Facturas Fe: <range_fe[-1]>/ <range_fe[0]> + Facturas Fe: <range_fe[-1]>/ <range_fe[0]> - </if> - - Ventas Diarias - - - - - Base + </if> + Ventas Diarias + + + + + Base - - Impuestos + + Base Gravada - - Total + + Impuestos + + + Total - - - <format_currency(untaxed_amount, lang=None, currency=currency)> + + + <format_currency(untaxed_amount, lang=None, currency=currency)> - - <format_currency(tax_amount, lang=None, currency=currency)> + + <format_currency(untaxed_amount_for_tax, lang=None, currency=currency)> - + + <format_currency(tax_amount, lang=None, currency=currency)> + + <format_currency(total_amount, lang=None, currency=currency)> - - Declaración Diaria: + + Declaración Diaria: diff --git a/report_close_statement.py b/report_close_statement.py index 41c66e9..bdece44 100644 --- a/report_close_statement.py +++ b/report_close_statement.py @@ -157,7 +157,6 @@ class CashRegister(Report): if not today_sales: raise UserError(str("No se han encontrado ventas para este día.")) - return untaxed_amount = 0 tax_amount = 0 @@ -174,6 +173,7 @@ class CashRegister(Report): amount_tips.append(info_pizzas_sold['amount_tip']) total_amount += sale.total_amount + untaxed_amount_for_tax = round((tax_amount * 100)/Decimal('8.0'), 2) statements = cls._get_statements_by_date(data['date']) if statements: @@ -205,6 +205,7 @@ class CashRegister(Report): report_context['amount_w_tax_pizzas'] = sum(amount_w_tax_pizzas) report_context['tips'] = sum(amount_tips) report_context['untaxed_amount'] = untaxed_amount + report_context['untaxed_amount_for_tax'] = untaxed_amount_for_tax report_context['tax_amount'] = tax_amount report_context['total_amount'] = total_amount report_context['number_pizzas_sold'] = total_pizzas