pyslog 0.1.0.dev11__tar.gz → 0.1.0.dev15__tar.gz

{pyslog-0.1.0.dev11 → pyslog-0.1.0.dev15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyslog
-Version: 0.1.0.dev11
+Version: 0.1.0.dev15
 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.dev11 → pyslog-0.1.0.dev15}/pyproject.toml

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

{pyslog-0.1.0.dev11 → pyslog-0.1.0.dev15}/src/pyslog/eslog2/generator.py

@@ -11,10 +11,10 @@ def generate_eslog_invoice(
     eslog_buyer = ESLOG_G_SG2(
         S_NAD=ESLOG_S_NAD(
             D_3035="BY",
-            # C_C082=ESLOG_C_C082(
-            #     D_3039=invoice.buyer.identifier,
-            #     D_1131=invoice.buyer.identifier_identification_scheme_identifier
-            # ),
+            C_C082=ESLOG_C_C082(
+                D_3039=invoice.buyer.identifier,
+                D_1131=invoice.buyer.identifier_identification_scheme_identifier
+            ) if invoice.buyer.identifier else None,
             C_C080=ESLOG_C_C080(
                 D_3036=invoice.buyer.name,
                 D_3036_2=invoice.buyer.trading_name
@@ -25,9 +25,56 @@ def generate_eslog_invoice(
                 D_3042_3=invoice.buyer.address_line_3
             ),
             D_3207=invoice.buyer.country_code,
-        )
+        ),
+        G_SG3=[],
+        G_SG5=[]
     )
 
+    if invoice.buyer.vat_registration_number:
+        eslog_buyer.G_SG3.append(
+            ESLOG_G_SG3(
+                S_RFF=ESLOG_S_RFF(
+                    C_C506=ESLOG_C_C506(
+                        D_1153="VA",
+                        D_1154=invoice.buyer.vat_registration_number
+                    )
+                )
+            )
+        )
+        eslog_buyer.G_SG3.append(
+            ESLOG_G_SG3(
+                S_RFF=ESLOG_S_RFF(
+                    C_C506=ESLOG_C_C506(
+                        D_1153="AHP",
+                        D_1154=invoice.buyer.vat_registration_number
+                    )
+                )
+            )
+        )
+    if invoice.buyer.maticna:
+        eslog_buyer.G_SG3.append(
+            ESLOG_G_SG3(
+                S_RFF=ESLOG_S_RFF(
+                    C_C506=ESLOG_C_C506(
+                        D_1153="0199",
+                        D_1154=invoice.buyer.maticna
+                    )
+                )
+            )
+        )
+
+    if invoice.buyer.contact_person_name:
+        eslog_buyer.G_SG5 = [
+            ESLOG_G_SG5(
+                S_CTA=ESLOG_S_CTA(
+                    D_3139="BU",
+                    C_C056=ESLOG_C_C056(
+                        D_3412=invoice.buyer.contact_person_name
+                    )
+                )
+            )
+        ]
+
     if invoice.buyer.address_line_2 is not None:
         eslog_buyer.S_NAD.C_C059.D_3042_2 = invoice.buyer.address_line_2
     if invoice.buyer.address_line_3 is not None:
@@ -44,10 +91,10 @@ def generate_eslog_invoice(
     eslog_seller = ESLOG_G_SG2(
         S_NAD=ESLOG_S_NAD(
             D_3035="SE",
-            # C_C082=ESLOG_C_C082(
-            #     D_3039=invoice.seller.identifier,
-            #     D_1131=invoice.seller.identifier_identification_scheme_identifier
-            # ),
+            C_C082=ESLOG_C_C082(
+                D_3039=invoice.seller.identifier,
+                D_1131=invoice.seller.identifier_identification_scheme_identifier
+            ) if invoice.seller.identifier else None,
             C_C080=ESLOG_C_C080(
                 D_3036=invoice.seller.name,
                 D_3036_2=invoice.seller.trading_name
@@ -68,7 +115,12 @@ def generate_eslog_invoice(
                 D_3433=invoice.seller.bic
             )
         ),
-        G_SG3=[
+        G_SG3=[],
+        G_SG5=[]
+    )
+
+    if invoice.seller.vat_registration_number:
+        eslog_seller.G_SG3.append(
             ESLOG_G_SG3(
                 S_RFF=ESLOG_S_RFF(
                     C_C506=ESLOG_C_C506(
@@ -76,7 +128,9 @@ def generate_eslog_invoice(
                         D_1154=invoice.seller.vat_registration_number
                     )
                 )
-            ),
+            )
+        )
+        eslog_seller.G_SG3.append(
             ESLOG_G_SG3(
                 S_RFF=ESLOG_S_RFF(
                     C_C506=ESLOG_C_C506(
@@ -84,7 +138,10 @@ def generate_eslog_invoice(
                         D_1154=invoice.seller.vat_registration_number
                     )
                 )
-            ),
+            )
+        )
+    if invoice.seller.maticna:
+        eslog_seller.G_SG3.append(
             ESLOG_G_SG3(
                 S_RFF=ESLOG_S_RFF(
                     C_C506=ESLOG_C_C506(
@@ -92,10 +149,8 @@ def generate_eslog_invoice(
                         D_1154=invoice.seller.maticna
                     )
                 )
-            ),
-        ],
-        G_SG5=[]
-    )
+            )
+        )
 
     if invoice.seller.contact_person_name:
         eslog_seller.G_SG5 = [
@@ -164,8 +219,8 @@ def generate_eslog_invoice(
             FTX=[doc_field],
             SG1=[],
             SG2=[
+                eslog_seller,
                 eslog_buyer,
-                eslog_seller
             ],
             SG7=[
                 ESLOG_G_SG7(

{pyslog-0.1.0.dev11 → pyslog-0.1.0.dev15}/src/pyslog/eslog2/models/invoice.py

@@ -48,9 +48,9 @@ class BusinessEntity(BaseModel):
 
 
 class Item(BaseModel):
-    standard_identifier: str = Field(description="Item standard identifier(BT-157) An item identifier based on a registered scheme.")
-    standard_identifier_identification_scheme_identifier: ItemIdentificationScheme = Field(description="Item standard identifier identification scheme identifier (BT-157-1). The identification scheme identifier of the Item standard identifier. Use code list ISO/IEC 6523 — Identifier scheme code")
-    sellers_item_identifier: str = Field(description="Item sellers item identifier (BT-155). The identifier assigned by the Seller for the item.")
+    standard_identifier: str | None = Field(default=None, description="Item standard identifier(BT-157) An item identifier based on a registered scheme.")
+    standard_identifier_identification_scheme_identifier: ItemIdentificationScheme | None = Field(default=None, description="Item standard identifier identification scheme identifier (BT-157-1). The identification scheme identifier of the Item standard identifier. Use code list ISO/IEC 6523 — Identifier scheme code")
+    sellers_item_identifier: str | None = Field(default=None, description="Item sellers item identifier (BT-155). The identifier assigned by the Seller for the item.")
     name: str = Field(description="Item name (BT-153). The name of the item.")
     quantity: str  = Field(description="Invoiced quantity (BT-129). The quantity of items (goods or services) that is charged in the Invoice line.")
     quantity_unit_of_measure: str = Field(description="Invoiced quantity unit of measure (BT-130). The unit of measure that applies to the invoiced quantity. Use code list UN/ECE Recommendation N°20 and UN/ECE Recommendation N°21 — Unit codes")  ## TODO Validation, mapping