pyslog 0.1.0.dev7__tar.gz → 0.1.0.dev8__tar.gz

{pyslog-0.1.0.dev7 → pyslog-0.1.0.dev8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyslog
-Version: 0.1.0.dev7
+Version: 0.1.0.dev8
 Summary: Python e-SLOG library. Simplifies the generation of Slovenian e-SLOG electronic documents.
 Keywords: eslog,eracun,e-racun,e-invoice
 Author: Gregor Gabrovšek

{pyslog-0.1.0.dev7 → pyslog-0.1.0.dev8}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pyslog"
-version = "0.1.0.dev7"
+version = "0.1.0.dev8"
 description = "Python e-SLOG library. Simplifies the generation of Slovenian e-SLOG electronic documents."
 license = "MIT"
 authors = [

{pyslog-0.1.0.dev7 → pyslog-0.1.0.dev8}/src/pyslog/eslog2/generator.py

@@ -4,7 +4,10 @@ from pyslog.eslog2.models import (
 )
 from pyslog.eslog2.models._xml import *
 
-def generate_eslog_invoice(invoice: Invoice) -> str:
+def generate_eslog_invoice(
+    invoice: Invoice,
+    pretty_print: bool = False,
+) -> str:
     eslog_buyer = ESLOG_G_SG2(
         S_NAD=ESLOG_S_NAD(
             D_3035="BY",
@@ -91,7 +94,11 @@ def generate_eslog_invoice(invoice: Invoice) -> str:
                 )
             ),
         ],
-        G_SG5=[
+        G_SG5=[]
+    )
+
+    if invoice.seller.contact_person_name:
+        eslog_seller.G_SG5 = [
             ESLOG_G_SG5(
                 S_CTA=ESLOG_S_CTA(
                     D_3139="SU",
@@ -101,7 +108,6 @@ def generate_eslog_invoice(invoice: Invoice) -> str:
                 )
             )
         ]
-    )
 
     if invoice.seller.address_line_2 is not None:
         eslog_seller.S_NAD.C_C059.D_3042_2 = invoice.seller.address_line_2
@@ -171,6 +177,7 @@ def generate_eslog_invoice(invoice: Invoice) -> str:
                     )
                 )
             ],
+            SG8=[],
             SG26=[],
             UNS=ESLOG_S_UNS(
                 D_0081="D"
@@ -287,14 +294,6 @@ def generate_eslog_invoice(invoice: Invoice) -> str:
                         )
                     )
                 ),
-                ESLOG_G_SG27(
-                    S_MOA=ESLOG_S_MOA(
-                        C_C516=ESLOG_C_C516(
-                            D_5025="38",
-                            D_5004=item.total_monetary_amount_including_vat,
-                        )
-                    )
-                ),
             ],
             G_SG29=[
                 ESLOG_G_SG29(
@@ -307,16 +306,6 @@ def generate_eslog_invoice(invoice: Invoice) -> str:
                         )
                     )
                 ),
-                ESLOG_G_SG29(
-                    S_PRI=ESLOG_S_PRI(
-                        C_C509=ESLOG_C_C509(
-                            D_5125="AAB",
-                            D_5118=item.item_gross_price,
-                            D_5284=item.item_price_base_quantity,
-                            D_6411=item.item_price_base_quantity_unit_of_measure_code,
-                        )
-                    )
-                ),
             ],
             G_SG30=[],
             G_SG34=[
@@ -338,8 +327,46 @@ def generate_eslog_invoice(invoice: Invoice) -> str:
             ],
             G_SG39=[],
         )
+        if item.total_monetary_amount_including_vat:
+            eslog_item.G_SG27.append(
+                ESLOG_G_SG27(
+                    S_MOA=ESLOG_S_MOA(
+                        C_C516=ESLOG_C_C516(
+                            D_5025="38",
+                            D_5004=item.total_monetary_amount_including_vat,
+                        )
+                    )
+                )
+            )
+
+        if item.item_gross_price:
+            eslog_item.G_SG29.append(
+                ESLOG_G_SG29(
+                    S_PRI=ESLOG_S_PRI(
+                        C_C509=ESLOG_C_C509(
+                            D_5125="AAB",
+                            D_5118=item.item_gross_price,
+                            D_5284=item.item_price_base_quantity,
+                            D_6411=item.item_price_base_quantity_unit_of_measure_code,
+                        )
+                    )
+                )
+            )
+
         eslog_invoice.M_INVOIC.SG26.append(eslog_item)
 
+    if invoice.payment_due_date:
+        eslog_invoice.M_INVOIC.SG8.append(
+            ESLOG_G_SG8(
+                S_PAT=ESLOG_S_PAT(D_4279="1"),
+                S_DTM=[
+                    ESLOG_S_DTM(
+                        C_C507=ESLOG_C_C507(D_2005="13", D_2380=invoice.payment_due_date)
+                    )
+                ]
+            )
+        )
+
     if invoice.value_added_tax_point_date:
         eslog_invoice.M_INVOIC.DTM.append(
             ESLOG_S_DTM(
@@ -492,6 +519,7 @@ def generate_eslog_invoice(invoice: Invoice) -> str:
 
 
     xml_string = eslog_invoice.to_xml(
+        pretty_print=pretty_print,
         encoding="unicode",
     )
     return xml_string

{pyslog-0.1.0.dev7 → pyslog-0.1.0.dev8}/src/pyslog/eslog2/models/_xml.py

@@ -119,6 +119,13 @@ class ESLOG_S_CUX(BaseXmlModel, tag="S_CUX"):
 class ESLOG_G_SG7(BaseXmlModel, tag="G_SG7"):
     S_CUX: ESLOG_S_CUX = element(tag="S_CUX")
 
+class ESLOG_S_PAT(BaseXmlModel, tag="S_PAT"):
+    D_4279: str = element(name="D_4279")
+
+class ESLOG_G_SG8(BaseXmlModel, tag="G_SG8"):
+    S_PAT: ESLOG_S_PAT = element(tag="S_PAT")
+    S_DTM: list[ESLOG_S_DTM] = element(tag="S_DTM")
+
 class ESLOG_C_C212(BaseXmlModel, tag="C_C212"):
     D_7140: str = element(name="D_7140")
     D_7143: str = element(name="D_7143")
@@ -238,6 +245,7 @@ class ESLOG_M_INVOIC(BaseXmlModel, tag="M_INVOIC"):
     SG1: list[ESLOG_G_SG1] = element(tag="G_SG1")
     SG2: list[ESLOG_G_SG2] = element(tag="G_SG2")
     SG7: list[ESLOG_G_SG7] = element(tag="G_SG7")
+    SG8: list[ESLOG_G_SG8] = element(tag="G_SG8")
     SG26: list[ESLOG_G_SG26] = element(tag="G_SG26")
     UNS: ESLOG_S_UNS = element(tag="S_UNS")
     SG50: list[ESLOG_G_SG50] = element(tag="G_SG50")

{pyslog-0.1.0.dev7 → pyslog-0.1.0.dev8}/src/pyslog/eslog2/models/invoice.py

@@ -16,7 +16,7 @@ class VATBreakdown(BaseModel):
     taxable_amount: str = Field(description="VAT category taxable amount (BT-116). The sum of all Invoice line net amounts that are subject to a specific VAT category code and VAT category rate, minus all allowances on document level, plus all charges on document level.")
     tax_amount: str = Field(description="VAT category tax amount (BT-117). The total VAT amount for a given VAT category.")
     vat_category_code: VATCategoryCode = Field(description="VAT category code (BT-118). The code that applies to the VAT category.")
-    vat_category_rate: str | None = Field(default=None, description="VAT category rate (BT-119). The VAT rate, represented as a percentage that applies for the relevant VAT category.")
+    vat_category_rate: str = Field(default=None, description="VAT category rate (BT-119). The VAT rate, represented as a percentage that applies for the relevant VAT category.")
 
 class BusinessEntity(BaseModel):
     identifier: str | None = Field(default=None, description="Buyer identifier (BT-46)")
@@ -61,6 +61,7 @@ class Invoice(BaseModel):
     invoice_number: str
     invoice_issue_date: str
     value_added_tax_point_date: str | None = Field(default=None, description="Value added tax point date (BT-7). The date when the VAT becomes accountable for the Seller and for the Buyer in so far as that date can be determined and differs from the date of issue of the invoice, according to the VAT directive.")
+    payment_due_date: str | None = Field(default=None, description="Payment due date (BT-9). The date on which the payment is due.")
     value_added_tax_point_date_code: VATPointDateCode | None = Field(default=None, description="Value added tax point date code (BT-8), DESC:The code of the date when the VAT becomes accountable for the Seller and for the Buyer.")
     actual_delivery_date: str | None = Field(default=None, description="Actual delivery date (BT-72). The date on which the delivery is made.")
     invoicing_period_start_date: str | None = Field(default=None, description="Invoicing period start date (BT-73). The date on which the invoicing period starts.")