diff --git a/regimes/pl/extensions.go b/regimes/pl/extensions.go index 69051c20..80de224a 100644 --- a/regimes/pl/extensions.go +++ b/regimes/pl/extensions.go @@ -7,7 +7,7 @@ import ( // Regime extension codes for local electronic formats. const ( - ExtKeyKSeFVATZero = "pl-ksef-vat-zero" + ExtKeyKSeFVATRegion = "pl-ksef-vat-region" ExtKeyKSeFVATSpecial = "pl-ksef-vat-special" ExtKeyKSeFEffectiveDate = "pl-ksef-effective-date" ) @@ -34,34 +34,43 @@ var extensionKeys = []*cbc.KeyDefinition{ }, }, { - Key: ExtKeyKSeFVATZero, + Key: ExtKeyKSeFVATRegion, Name: i18n.String{ - i18n.EN: "Zero VAT Extensions for KSeF", + i18n.EN: "Region VAT Extensions for KSeF", }, - Keys: []*cbc.KeyDefinition{ + Codes: []*cbc.CodeDefinition{ { - Key: "wdt", + Code: "EU", Name: i18n.String{ - i18n.EN: "WDT", - i18n.PL: "WDT", + i18n.EN: "EU", + i18n.PL: "EU", + }, + Desc: i18n.String{ + i18n.EN: "Inter european trade", + i18n.PL: "Handel wewnątrzwspólnotowy.", }, - // TODO: description required }, { - Key: "domestic", + Code: "domestic", Name: i18n.String{ i18n.EN: "Domestic", i18n.PL: "Krajowy", }, - // TODO: description required + Desc: i18n.String{ + i18n.EN: "Domestic trade", + i18n.PL: "Handel wewnątrzkrajowy.", + }, }, { - Key: "export", + Code: "non-EU", Name: i18n.String{ - i18n.EN: "Export", - i18n.PL: "Eksport", + i18n.EN: "non-EU", + i18n.PL: "Poza UE", + }, + Desc: i18n.String{ + i18n.EN: "Trading with countries outside the EU", + i18n.PL: "Handel z krajami z poza unii europejskiej.", }, - // TODO: description required }, }, }, diff --git a/regimes/pl/tax_categories.go b/regimes/pl/tax_categories.go index 41d506b8..35c34edd 100644 --- a/regimes/pl/tax_categories.go +++ b/regimes/pl/tax_categories.go @@ -10,8 +10,7 @@ import ( // Tax rates specific to Poland. const ( - TaxRateNotPursuant cbc.Key = "np" - TaxRateNotPursuantArt100 cbc.Key = "np-art100sec1point4" + TaxRateNotPursuant cbc.Key = "np" ) var taxCategories = []*tax.Category{ @@ -90,7 +89,7 @@ var taxCategories = []*tax.Category{ }, }, Extensions: []cbc.Key{ - ExtKeyKSeFVATZero, + ExtKeyKSeFVATRegion, }, }, { @@ -99,8 +98,7 @@ var taxCategories = []*tax.Category{ i18n.EN: "Exempt", i18n.PL: "Zwolnione", }, - Exempt: true, - Extensions: []cbc.Key{}, + Exempt: true, }, { Key: tax.RateSpecial, @@ -111,27 +109,23 @@ var taxCategories = []*tax.Category{ Extensions: []cbc.Key{ ExtKeyKSeFVATSpecial, }, - }, - - /* - * Still working on refactoring these... - { - Key: TaxRateNotPursuant, - Name: i18n.String{ - i18n.EN: "Not pursuant, pursuant to art100 section 1 point4", - i18n.PL: "Niepodlegające opodatkowaniu na postawie wyłączeniem art100 sekcja 1 punkt 4", + Values: []*tax.RateValue{ + { + Percent: num.MakePercentage(40, 3), }, - Exempt: true, }, - { - Key: TaxRateNotPursuantArt100, - Name: i18n.String{ - i18n.EN: "Not pursuant excluding art100 section 1 point4", - i18n.PL: "Niepodlegające opodatkowaniu z wyłączeniem art100 sekcja 1 punkt 4", - }, - Exempt: true, + }, + { + Key: TaxRateNotPursuant, + Name: i18n.String{ + i18n.EN: "Not pursuant", + i18n.PL: "Niepodlegające opodatkowaniu", }, - */ + Exempt: true, + Extensions: []cbc.Key{ + ExtKeyKSeFVATRegion, + }, + }, }, }, }