From d52b5353dd4823da70afaf598c1d94efb19821ab Mon Sep 17 00:00:00 2001 From: wilsongomez Date: Tue, 22 Mar 2022 09:06:54 -0500 Subject: [PATCH] minor fix --- auditory_report.fods | 358 ++++++++++++++++++++----------------------- payroll_auditory.py | 2 +- 2 files changed, 168 insertions(+), 192 deletions(-) diff --git a/auditory_report.fods b/auditory_report.fods index ea1eff4..df22938 100644 --- a/auditory_report.fods +++ b/auditory_report.fods @@ -1,7 +1,7 @@ - lenovo2022-02-22T11:13:552022-03-18T14:28:12.90087163421PT3H56M10SLibreOffice/7.2.5.2$Linux_X86_64 LibreOffice_project/20$Build-2 + lenovo2022-02-22T11:13:552022-03-22T08:53:20.53095822922PT3H58M56SLibreOffice/7.1.1.2$Linux_X86_64 LibreOffice_project/fe0b08f4af1bacafe4c7ecc87ce55bb426164676 0 @@ -67,14 +67,14 @@ false - 5 - 10 + 18 + 20 0 0 0 0 2 - 0 + 15 0 0 0 @@ -130,15 +130,25 @@ - true - true - true - 0 - true true - false + true true false + 1270 + true + 1 + 12632256 + true + true + true + lQH+/1NBVDIzVFVTRQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ1VQUzpTQVQyM1RVU0UAAAAAAAAAAAAAAAAAAAAAAAAWAAMAsgAAAAAAAAAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9U0FUMjNUVVNFCm9yaWVudGF0aW9uPVBvcnRyYWl0CmNvcGllcz0xCmNvbGxhdGU9ZmFsc2UKbWFyZ2luZGFqdXN0bWVudD0wLDAsMCwwCmNvbG9yZGVwdGg9MjQKcHNsZXZlbD0wCnBkZmRldmljZT0xCmNvbG9yZGV2aWNlPTAKUFBEQ29udGV4RGF0YQpQYWdlU2l6ZTpMZXR0ZXIAABIAQ09NUEFUX0RVUExFWF9NT0RFEwBEdXBsZXhNb2RlOjpVbmtub3du + 1270 + 7 + false + true + true + 1 + true es @@ -148,32 +158,22 @@ - 12632256 - true - true - false - false - true - true - false - 3 false + true + false + true + true SAT23TUSE false - lgH+/1NBVDIzVFVTRQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ1VQUzpTQVQyM1RVU0UAAAAAAAAAAAAAAAAAAAAAAAAWAAMAswAAAAAAAAAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9U0FUMjNUVVNFCm9yaWVudGF0aW9uPVBvcnRyYWl0CmNvcGllcz0xCmNvbGxhdGU9ZmFsc2UKbWFyZ2luYWRqdXN0bWVudD0wLDAsMCwwCmNvbG9yZGVwdGg9MjQKcHNsZXZlbD0wCnBkZmRldmljZT0xCmNvbG9yZGV2aWNlPTAKUFBEQ29udGV4dERhdGEKUGFnZVNpemU6TGV0dGVyAAASAENPTVBBVF9EVVBMRVhfTU9ERRMARHVwbGV4TW9kZTo6VW5rbm93bg== - false - 1270 - 1270 - 1 - 1 - true - false - true - true + 0 + 3 true - true - 7 + false + false + false true + false + true Sheet1 @@ -204,14 +204,14 @@ + - - + @@ -913,143 +913,146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - + + @@ -1063,9 +1066,6 @@ - - - / @@ -1073,16 +1073,6 @@ / - - - - - - - - - - @@ -1179,69 +1169,58 @@ - - - - - - - - - - - - ??? - Page 1 - - + + + + @@ -1274,16 +1253,13 @@ + - - - - - + - + company.party.name @@ -1308,7 +1284,7 @@ - + Número de Documento* @@ -1480,7 +1456,7 @@ rec['other_discounts'] - rec['net_payment'] + rec['net_payment'] rec['tax_basis'] diff --git a/payroll_auditory.py b/payroll_auditory.py index fcae0b7..21862ac 100644 --- a/payroll_auditory.py +++ b/payroll_auditory.py @@ -218,7 +218,7 @@ class PayrollAuditoryReport(Report): salary_constitute = wage['salary_constitute'] definition = wage['definition'] basic_benefit_exc = ['lic', 'sal', 'vac', 'inc'] - amount = line['amount'] + amount = int(line['amount']) if concept in concepts_amount: res[key][concept] += [amount]