Merge pull request #20 from CristianoMafraJunior/brazil_fiscal_report…

…_duplica_fix

Fix format w_dup_text + Install qpdf + Fields PIS e COFINS

.github/workflows/tests.yml

@@ -24,6 +24,8 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python }}
+      - name: Install qpdf ⚙️
+        run: sudo apt-get update --allow-releaseinfo-change && sudo apt-get install qpdf
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip setuptools fpdf2 phonenumbers python-barcode pytest  pytest-cov

README.md

@@ -150,6 +150,16 @@ Here is a breakdown of all the configuration options available in ``DanfeConfig`
        config.font_type = FontType.COURIER
         ```
    - **Default**: ``TIMES``
+
+8. **Display PIS COFINS**
+   - **Type**: ``Bool``
+   - **Values**: ``True``, ``False``
+   - **Description**: Displays PIS and COFINS taxes in the DANFE totals.
+   - **Example**::
+        ```python
+       config.display_pis_cofins = True
+        ```
+   - **Default**: ``False``
 ### Usage Example with Customization
 
 Here’s how to set up a ``DanfeConfig`` object with a full set of customizations::

brazilfiscalreport/danfe/config.py

@@ -50,3 +50,4 @@ class DanfeConfig:
     tax_configuration: TaxConfiguration = TaxConfiguration.STANDARD_ICMS_IPI
     invoice_display: InvoiceDisplay = InvoiceDisplay.FULL_DETAILS
     font_type: FontType = FontType.TIMES
+    display_pis_cofins: bool = False

brazilfiscalreport/danfe/danfe.py

@@ -58,6 +58,7 @@ def __init__(self, xml, config: DanfeConfig = None):
         self.price_precision = config.decimal_config.price_precision
         self.quantity_precision = config.decimal_config.quantity_precision
         self.invoice_display = config.invoice_display
+        self.display_pis_cofins = config.display_pis_cofins
 
         root = ET.fromstring(xml)
         self.inf_nfe = root.find(f"{URL}infNFe")
@@ -1044,7 +1045,7 @@ def _draw_billing(self):
             valor = format_number(valor, 2)
             dup_text = f"{num}  {venc}  {valor}"
             dups_text.append(dup_text)
-            w_dup_text = self.get_string_width(dup_text)
+            w_dup_text = self.get_string_width(dup_text) + 2
             max_width = max(max_width, w_dup_text)
 
         # Calculates the number of `duplicatas` that can fit in one line,
@@ -1084,12 +1085,14 @@ def _draw_taxes(self):
         v_icms = format_number(extract_text(self.totais, "vICMS"), precision=2)
         v_bcst = format_number(extract_text(self.totais, "vBCST"), precision=2)
         v_st = format_number(extract_text(self.totais, "vST"), precision=2)
+        v_pis = format_number(extract_text(self.totais, "vPIS"), precision=2)
         v_prod = format_number(extract_text(self.totais, "vProd"), precision=2)
         v_frete = format_number(extract_text(self.totais, "vFrete"), precision=2)
         v_seg = format_number(extract_text(self.totais, "vSeg"), precision=2)
         v_desc = format_number(extract_text(self.totais, "vDesc"), precision=2)
         v_outro = format_number(extract_text(self.totais, "vOutro"), precision=2)
         v_ipi = format_number(extract_text(self.totais, "vIPI"), precision=2)
+        v_confins = format_number(extract_text(self.totais, "vCOFINS"), precision=2)
         v_nf = format_number(extract_text(self.totais, "vNF"), precision=2)
         v_tot_trib = format_number(extract_text(self.totais, "vTotTrib"), precision=2)
 
@@ -1143,6 +1146,19 @@ def _draw_taxes(self):
                 w=0, description="VALOR TOTAL DA NOTA", content=v_nf, type="number"
             ),
         ]
+        if self.display_pis_cofins:
+            fields_line1.insert(
+                -1,
+                BaseFieldInfo(
+                    w=0, description="VALOR DO PIS", content=v_pis, type="number"
+                ),
+            )
+            fields_line2.insert(
+                -1,
+                BaseFieldInfo(
+                    w=0, description="VALOR DO COFINS", content=v_confins, type="number"
+                ),
+            )
         block_impostos.add_fields([fields_line1, fields_line2])
         block_impostos.render()
 

tests/test_danfe.py

@@ -121,3 +121,13 @@ def test_danfe_duplicatas_only(tmp_path, load_danfe):
     danfe = load_danfe("nfe_overload.xml", config=config)
     pdf_path = get_pdf_output_path("danfe", "danfe_duplicatas_only")
     assert_pdf_equal(danfe, pdf_path, tmp_path)
+
+
+def test_danfe_pis_config(tmp_path, load_danfe):
+    config = DanfeConfig(
+        margins=Margins(top=2, right=2, bottom=2, left=2),
+        display_pis_cofins=True,
+    )
+    danfe = load_danfe("nfe_test_1.xml", config=config)
+    pdf_path = get_pdf_output_path("danfe", "danfe_pis_confins")
+    assert_pdf_equal(danfe, pdf_path, tmp_path)