pyslog 0.1.0.dev14__tar.gz → 0.1.0.dev16__tar.gz

{pyslog-0.1.0.dev14 → pyslog-0.1.0.dev16}/PKG-INFO

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

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

{pyslog-0.1.0.dev14 → pyslog-0.1.0.dev16}/src/pyslog/eslog2/generator.py

@@ -219,8 +219,8 @@ def generate_eslog_invoice(
             FTX=[doc_field],
             SG1=[],
             SG2=[
+                eslog_seller,
                 eslog_buyer,
-                eslog_seller
             ],
             SG7=[
                 ESLOG_G_SG7(
@@ -311,18 +311,18 @@ def generate_eslog_invoice(
                 D_1082=str(index + 1),
                 C_C212=ESLOG_C_C212(
                     D_7140=item.standard_identifier,
-                    D_7143=item.standard_identifier_identification_scheme_identifier,
-                ),
+                    D_7143=item.standard_identifier_identification_scheme_identifier.value if item.standard_identifier_identification_scheme_identifier else None,
+                ) if item.standard_identifier else None,
             ),
             S_PIA=[
-                ESLOG_S_PIA( ## ni nujno. Potem dodaj še en PIA za buyer identifier (segment 78)
+                ESLOG_S_PIA(
                     D_4347="5",
                     C_C212=ESLOG_C_C212(
                         D_7140=item.sellers_item_identifier,
                         D_7143="SA",
                     ),
                 )
-            ],
+            ] if item.sellers_item_identifier else [],
             S_IMD=[
                 ESLOG_S_IMD(  # short description
                     D_7077="F",

{pyslog-0.1.0.dev14 → pyslog-0.1.0.dev16}/src/pyslog/eslog2/models/_xml.py

@@ -133,17 +133,17 @@ class ESLOG_G_SG8(BaseXmlModel, tag="G_SG8"):
     S_DTM: list[ESLOG_S_DTM] = element(tag="S_DTM")
     S_PAI: ESLOG_S_PAI | None = element(tag="S_PAI", default=None)
 
-class ESLOG_C_C212(BaseXmlModel, tag="C_C212"):
-    D_7140: str = element(name="D_7140")
-    D_7143: str = element(name="D_7143")
+class ESLOG_C_C212(BaseXmlModel, tag="C_C212", skip_empty=True):
+    D_7140: str | None = element(name="D_7140", default=None)
+    D_7143: str | None = element(name="D_7143", default=None)
 
 class ESLOG_S_LIN(BaseXmlModel, tag="S_LIN"):
     D_1082: str = element(name="D_1082")
-    C_C212: ESLOG_C_C212 = element(tag="C_C212")
+    C_C212: ESLOG_C_C212 | None = element(tag="C_C212", default=None)
 
 class ESLOG_S_PIA(BaseXmlModel, tag="S_PIA"):
     D_4347: str = element(name="D_4347")
-    C_C212: ESLOG_C_C212 = element(tag="C_C212")
+    C_C212: ESLOG_C_C212 | None = element(tag="C_C212", default=None)
 
 class ESLOG_C_C273(BaseXmlModel, tag="C_C273"):
     D_7008: str = element(name="D_7008")

{pyslog-0.1.0.dev14 → pyslog-0.1.0.dev16}/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