Updating regimes and schemas

invopop · Dec 20, 2023 · be4d1d7 · be4d1d7
1 parent 0ddd805
commit be4d1d7
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 45 deletions.
diff --git a/data/regimes/es.json b/data/regimes/es.json
@@ -175,6 +175,9 @@
         "en": "TicketBAI Product Key",
         "es": "Clave de Producto TicketBAI"
       },
+      "desc": {
+        "en": "Product keys are used by TicketBAI to differentiate between -exported- goods\nand services. It may be useful to classify all products regardless of wether\nthey are exported or not.\n\nThere is an additional exception case for goods that are resold without modification\nwhen the supplier is in the simplified tax regime. For must purposes this special\ncase can be ignored."
+      },
       "keys": [
         {
           "key": "goods",
@@ -189,6 +192,13 @@
             "en": "Provision of services",
             "es": "Prestacion de servicios"
           }
+        },
+        {
+          "key": "resale",
+          "name": {
+            "en": "Resale of goods without modification by vendor in the simplified regime",
+            "es": "Reventa de bienes sin modificación por vendedor en regimen simplificado"
+          }
         }
       ]
     },
@@ -198,75 +208,69 @@
         "en": "TicketBAI Exemption code",
         "es": "Código de Exención de TicketBAI"
       },
+      "desc": {
+        "en": "Codes used by TicketBAI for both \"exempt\" and \"not-subject\"\ntransactions. In the TicketBAI format these are separated,\nbut in order to simplify GOBL and be more closely aligned with\nother countries we've combined them into one."
+      },
       "codes": [
         {
           "code": "E1",
           "name": {
-            "en": "Exempt pursuant to Article 20 of the Foral VAT Law",
-            "es": "Exenta por el artículo 20 de la Norma Foral del IVA"
+            "en": "Exempt: pursuant to Article 20 of the Foral VAT Law",
+            "es": "Exenta: por el artículo 20 de la Norma Foral del IVA"
           }
         },
         {
           "code": "E2",
           "name": {
-            "en": "Exempt pursuant to Article 21 of the Foral VAT Law",
-            "es": "Exenta por el artículo 21 de la Norma Foral del IVA"
+            "en": "Exempt: pursuant to Article 21 of the Foral VAT Law",
+            "es": "Exenta: por el artículo 21 de la Norma Foral del IVA"
           }
         },
         {
           "code": "E3",
           "name": {
-            "en": "Exempt pursuant to Article 22 of the Foral VAT Law",
-            "es": "Exenta por el artículo 22 de la Norma Foral del IVA"
+            "en": "Exempt: pursuant to Article 22 of the Foral VAT Law",
+            "es": "Exenta: por el artículo 22 de la Norma Foral del IVA"
           }
         },
         {
           "code": "E4",
           "name": {
-            "en": "Exempt pursuant to Articles 23 and 24 of the Foral VAT Law",
-            "es": "Exenta por el artículos 23 y 24 de la Norma Foral del IVA"
+            "en": "Exempt: pursuant to Articles 23 and 24 of the Foral VAT Law",
+            "es": "Exenta: por el artículos 23 y 24 de la Norma Foral del IVA"
           }
         },
         {
           "code": "E5",
           "name": {
-            "en": "Exempt pursuant to Article 25 of the Foral VAT law",
-            "es": "Exenta por el artículo 25 de la Norma Foral del IVA"
+            "en": "Exempt: pursuant to Article 25 of the Foral VAT law",
+            "es": "Exenta: por el artículo 25 de la Norma Foral del IVA"
           }
         },
         {
           "code": "E6",
           "name": {
-            "en": "Exempt pursuant to other reasons",
-            "es": "Exenta por otra causa"
+            "en": "Exempt: pursuant to other reasons",
+            "es": "Exenta: por otra causa"
+          }
+        },
+        {
+          "code": "OT",
+          "name": {
+            "en": "Not subject: pursuant to Article 7 of the VAT Law. Other cases of non-subject.",
+            "es": "No sujeto: por el artículo 7 de la Ley del IVA. Otros supuestos de no sujeción."
+          }
+        },
+        {
+          "code": "RL",
+          "name": {
+            "en": "Not subject: pursuant to localization rules.",
+            "es": "No sujeto: por reglas de localización."
           }
         }
       ]
     }
   ],
-  "item_keys": [
-    {
-      "key": "resale",
-      "name": {
-        "en": "Resale of goods without modification by vendor in the simplified regime",
-        "es": "Reventa de bienes sin modificación por vendedor en regimen simplificado"
-      }
-    },
-    {
-      "key": "services",
-      "name": {
-        "en": "Provision of services",
-        "es": "Prestacion de servicios"
-      }
-    },
-    {
-      "key": "goods",
-      "name": {
-        "en": "Delivery of goods",
-        "es": "Entrega de bienes"
-      }
-    }
-  ],
   "scenarios": [
     {
       "schema": "bill/invoice",
@@ -870,6 +874,9 @@
           ]
         }
       ],
+      "extensions": [
+        "es-tbai-product"
+      ],
       "map": {
         "facturae-tax-type-code": "01"
       }

diff --git a/data/regimes/pl.json b/data/regimes/pl.json
@@ -80,6 +80,10 @@
           "name": {
             "en": "Taxi Rate",
             "pl": "Ryczałt dla taksówek"
+          },
+          "desc": {
+            "en": "Special flat rate for taxi drivers.",
+            "pl": "Specjalna stawka ryczałtu dla taksówkarzy."
           }
         }
       ]

diff --git a/data/schemas/tax/regime.json b/data/schemas/tax/regime.json
@@ -33,7 +33,7 @@
         "rate_required": {
           "type": "boolean",
           "title": "Rate Required",
-          "description": "RateRequired when true implies that when a tax combo is defined using\nthis category that one of the rates must be defined."
+          "description": "RateRequired when true implies that when a tax combo is defined using\nthis category that one of the rate's keys must be defined. This is\nnormally needed for regimes that categorize taxes in local document\nformats as opposed to grouping by percentage values."
         },
         "rates": {
           "items": {
@@ -49,7 +49,7 @@
           },
           "type": "array",
           "title": "Extensions",
-          "description": "Extensions defines a list of keys for codes to use as an alternative to choosing a\nrate for the tax category. Every key must be defined in the Regime's extensions\ntable."
+          "description": "Extensions defines a list of extension keys that may be used or required\nas an alternative or alongside choosing a rate for the tax category.\nEvery key must be defined in the Regime's extensions table."
         },
         "map": {
           "$ref": "https://gobl.org/draft-0/cbc/code-map",
@@ -363,14 +363,6 @@
           "title": "Payment Means",
           "description": "PaymentMeansKeys specific for the regime that extend the original\nbase payment means keys."
         },
-        "item_keys": {
-          "items": {
-            "$ref": "#/$defs/KeyDefinition"
-          },
-          "type": "array",
-          "title": "Item Keys",
-          "description": "ItemKeys specific for the regime that need to be added to `org.Item` data\nin line rows."
-        },
         "inbox_keys": {
           "items": {
             "$ref": "#/$defs/KeyDefinition"