From 1a846106dd077b68bc1eba138998571cf9cef856 Mon Sep 17 00:00:00 2001
From: NicoleNG18 <nicole.georgieva18@abv.bg>
Date: Fri, 13 Feb 2026 14:44:34 +0200
Subject: [PATCH] regenerate module

---
 codbex-invoices/codbex-invoices.edm           |  44 +--
 codbex-invoices/codbex-invoices.gen           | 278 ++++++++++++++++
 codbex-invoices/codbex-invoices.model         |  22 ++
 .../CustomerPayment/CustomerPaymentService.ts |  12 +-
 .../PurchaseInvoiceItemService.ts             |  14 +-
 .../PurchaseInvoicePaymentService.ts          |  14 +-
 .../PurchaseInvoice/PurchaseInvoiceService.ts |  14 +-
 .../api/SalesInvoice/DeductionService.ts      |  14 +-
 .../SalesInvoice/SalesInvoiceItemService.ts   |  14 +-
 .../SalesInvoicePaymentService.ts             |  14 +-
 .../api/SalesInvoice/SalesInvoiceService.ts   |  14 +-
 .../api/Settings/PaymentMethodService.ts      |  12 +-
 .../Settings/PurchaseInvoiceStatusService.ts  |  14 +-
 .../Settings/PurchaseInvoiceTypeService.ts    |  14 +-
 .../api/Settings/SalesInvoiceStatusService.ts |  14 +-
 .../api/Settings/SalesInvoiceTypeService.ts   |  14 +-
 .../api/Settings/SentMethodService.ts         |  12 +-
 .../SupplierPayment/SupplierPaymentService.ts |  12 +-
 .../codbex-invoices/api/utils/HttpUtils.ts    |   4 +-
 .../CustomerPaymentRepository.ts              |  14 +-
 .../PurchaseInvoiceItemRepository.ts          |  14 +-
 .../PurchaseInvoicePaymentRepository.ts       |  14 +-
 .../PurchaseInvoiceRepository.ts              |  14 +-
 .../dao/SalesInvoice/DeductionRepository.ts   |  14 +-
 .../SalesInvoiceItemRepository.ts             |  14 +-
 .../SalesInvoicePaymentRepository.ts          |  14 +-
 .../SalesInvoice/SalesInvoiceRepository.ts    |  14 +-
 .../dao/Settings/PaymentMethodRepository.ts   |  14 +-
 .../PurchaseInvoiceStatusRepository.ts        |  14 +-
 .../Settings/PurchaseInvoiceTypeRepository.ts |  14 +-
 .../Settings/SalesInvoiceStatusRepository.ts  |  14 +-
 .../Settings/SalesInvoiceTypeRepository.ts    |  14 +-
 .../dao/Settings/SentMethodRepository.ts      |  14 +-
 .../SupplierPaymentRepository.ts              |  14 +-
 .../PurchaseInvoiceItem/controller.js         |  24 +-
 .../dialog-filter/index.html                  |  46 +--
 .../PurchaseInvoiceItem/dialog-filter/view.js |   4 +-
 .../dialog-window/controller.js               |  24 +-
 .../dialog-window/index.html                  |  44 +--
 .../PurchaseInvoiceItem/dialog-window/view.js |   2 +-
 .../PurchaseInvoiceItem/index.html            |  36 +--
 .../PurchaseInvoiceItem/view.js               |   2 +-
 .../PurchaseInvoicePayment/controller.js      |  24 +-
 .../dialog-filter/index.html                  |  18 +-
 .../dialog-filter/view.js                     |   4 +-
 .../dialog-window/controller.js               |  24 +-
 .../dialog-window/index.html                  |  16 +-
 .../dialog-window/view.js                     |   2 +-
 .../PurchaseInvoicePayment/index.html         |  24 +-
 .../PurchaseInvoicePayment/view.js            |   2 +-
 .../PurchaseInvoice/controller.js             |  36 +--
 .../PurchaseInvoice/dialog-filter/index.html  | 148 ++++-----
 .../PurchaseInvoice/dialog-filter/view.js     |   4 +-
 .../dialog-window/controller.js               |  36 +--
 .../PurchaseInvoice/dialog-window/index.html  | 130 ++++----
 .../PurchaseInvoice/dialog-window/view.js     |   2 +-
 .../PurchaseInvoice/index.html                |  16 +-
 .../main-details/controller.js                |  40 +--
 .../PurchaseInvoice/main-details/index.html   | 162 +++++-----
 .../PurchaseInvoice/main-details/view.js      |   2 +-
 .../PurchaseInvoice/PurchaseInvoice/view.js   |   2 +-
 .../ui/PurchaseInvoice/index.html             |   4 +-
 .../ui/PurchaseInvoice/perspective.js         |   2 +-
 .../SalesInvoice/Deduction/controller.js      |  22 +-
 .../Deduction/dialog-filter/index.html        |  14 +-
 .../Deduction/dialog-filter/view.js           |   4 +-
 .../Deduction/dialog-window/controller.js     |  24 +-
 .../Deduction/dialog-window/index.html        |  12 +-
 .../Deduction/dialog-window/view.js           |   2 +-
 .../SalesInvoice/Deduction/index.html         |  22 +-
 .../SalesInvoice/Deduction/view.js            |   2 +-
 .../SalesInvoiceItem/controller.js            |  24 +-
 .../SalesInvoiceItem/dialog-filter/index.html |  46 +--
 .../SalesInvoiceItem/dialog-filter/view.js    |   4 +-
 .../dialog-window/controller.js               |  24 +-
 .../SalesInvoiceItem/dialog-window/index.html |  44 +--
 .../SalesInvoiceItem/dialog-window/view.js    |   2 +-
 .../SalesInvoice/SalesInvoiceItem/index.html  |  36 +--
 .../SalesInvoice/SalesInvoiceItem/view.js     |   2 +-
 .../SalesInvoicePayment/controller.js         |  24 +-
 .../dialog-filter/index.html                  |  18 +-
 .../SalesInvoicePayment/dialog-filter/view.js |   4 +-
 .../dialog-window/controller.js               |  24 +-
 .../dialog-window/index.html                  |  16 +-
 .../SalesInvoicePayment/dialog-window/view.js |   2 +-
 .../SalesInvoicePayment/index.html            |  24 +-
 .../SalesInvoice/SalesInvoicePayment/view.js  |   2 +-
 .../SalesInvoice/SalesInvoice/controller.js   |  36 +--
 .../SalesInvoice/dialog-filter/index.html     | 142 ++++-----
 .../SalesInvoice/dialog-filter/view.js        |   4 +-
 .../SalesInvoice/dialog-window/controller.js  |  36 +--
 .../SalesInvoice/dialog-window/index.html     | 124 ++++----
 .../SalesInvoice/dialog-window/view.js        |   2 +-
 .../ui/SalesInvoice/SalesInvoice/index.html   |  16 +-
 .../SalesInvoice/main-details/controller.js   |  40 +--
 .../SalesInvoice/main-details/index.html      | 156 ++++-----
 .../SalesInvoice/main-details/view.js         |   2 +-
 .../ui/SalesInvoice/SalesInvoice/view.js      |   2 +-
 .../ui/SalesInvoice/index.html                |   4 +-
 .../ui/SalesInvoice/perspective.js            |   2 +-
 .../PurchaseInvoiceStatus/controller.js       |  20 +-
 .../dialog-filter/controller.js               |   2 +-
 .../dialog-filter/index.html                  |  14 +-
 .../dialog-filter/view.js                     |   4 +-
 .../dialog-window/controller.js               |  20 +-
 .../dialog-window/index.html                  |  12 +-
 .../dialog-window/view.js                     |   2 +-
 .../Settings/PurchaseInvoiceStatus/index.html |  20 +-
 .../ui/Settings/PurchaseInvoiceStatus/view.js |   2 +-
 .../PurchaseInvoiceType/controller.js         |  20 +-
 .../dialog-filter/controller.js               |   2 +-
 .../dialog-filter/index.html                  |  20 +-
 .../PurchaseInvoiceType/dialog-filter/view.js |   4 +-
 .../dialog-window/controller.js               |  20 +-
 .../dialog-window/index.html                  |  18 +-
 .../PurchaseInvoiceType/dialog-window/view.js |   2 +-
 .../Settings/PurchaseInvoiceType/index.html   |  22 +-
 .../ui/Settings/PurchaseInvoiceType/view.js   |   2 +-
 .../Settings/SalesInvoiceStatus/controller.js |  20 +-
 .../dialog-filter/controller.js               |   2 +-
 .../dialog-filter/index.html                  |  14 +-
 .../SalesInvoiceStatus/dialog-filter/view.js  |   4 +-
 .../dialog-window/controller.js               |  20 +-
 .../dialog-window/index.html                  |  12 +-
 .../SalesInvoiceStatus/dialog-window/view.js  |   2 +-
 .../ui/Settings/SalesInvoiceStatus/index.html |  20 +-
 .../ui/Settings/SalesInvoiceStatus/view.js    |   2 +-
 .../Settings/SalesInvoiceType/controller.js   |  20 +-
 .../dialog-filter/controller.js               |   2 +-
 .../SalesInvoiceType/dialog-filter/index.html |  20 +-
 .../SalesInvoiceType/dialog-filter/view.js    |   4 +-
 .../dialog-window/controller.js               |  20 +-
 .../SalesInvoiceType/dialog-window/index.html |  18 +-
 .../SalesInvoiceType/dialog-window/view.js    |   2 +-
 .../ui/Settings/SalesInvoiceType/index.html   |  22 +-
 .../ui/Settings/SalesInvoiceType/view.js      |   2 +-
 .../en-US/codbex-invoices.model.json          | 300 ++++++++++++++++++
 137 files changed, 2003 insertions(+), 1313 deletions(-)
 create mode 100644 codbex-invoices/translations/en-US/codbex-invoices.model.json

diff --git a/codbex-invoices/codbex-invoices.edm b/codbex-invoices/codbex-invoices.edm
index 580dd96..71610cf 100644
--- a/codbex-invoices/codbex-invoices.edm
+++ b/codbex-invoices/codbex-invoices.edm
@@ -1,6 +1,6 @@
 <model>
  <entities>
-  <entity name="SalesInvoiceItem" dataName="SALESINVOICEITEM" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}_SALESINVOICEITEM&quot;" dataQuery="" type="DEPENDENT" title="SalesInvoiceItem" caption="Manage entity SalesInvoiceItem" description="Manage entity SalesInvoiceItem" tooltip="SalesInvoiceItem" icon="/services/web/resources/unicons/file.svg" menuKey="salesinvoiceitem" menuLabel="SalesInvoiceItem" menuIndex="100" layoutType="MANAGE_DETAILS" perspectiveName="SalesInvoice" perspectiveLabel="SalesInvoice" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/invoice.svg" perspectiveOrder="200" perspectiveNavId="sales-navigation-group" perspectiveRole="" generateReport="false" generateDefaultRoles="true" roleRead="codbex-invoices.salesinvoice.SalesInvoiceItemReadOnly" roleWrite="codbex-invoices.salesinvoice.SalesInvoiceItemFullAccess">
+  <entity name="SalesInvoiceItem" dataName="SALESINVOICEITEM" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}_SALESINVOICEITEM&quot;" dataQuery="" type="DEPENDENT" title="SalesInvoiceItem" caption="Manage entity SalesInvoiceItem" description="Manage entity SalesInvoiceItem" tooltip="SalesInvoiceItem" icon="/services/web/resources/unicons/file.svg" menuKey="salesinvoiceitem" menuLabel="SalesInvoiceItem" menuIndex="100" layoutType="MANAGE_DETAILS" perspectiveName="SalesInvoice" perspectiveLabel="SalesInvoice" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/invoice.svg" perspectiveOrder="200" perspectiveNavId="sales-navigation-group" perspectiveRole="" generateReport="false" multilingual="false" generateDefaultRoles="true" roleRead="codbex-invoices.salesinvoice.SalesInvoiceItemReadOnly" roleWrite="codbex-invoices.salesinvoice.SalesInvoiceItemFullAccess">
     <property name="Id" description="" tooltip="" dataName="SALESINVOICEITEM_ID" dataType="INTEGER" dataNullable="false" dataPrimaryKey="true" dataAutoIncrement="true" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
     <property name="SalesInvoice" description="" tooltip="" dataName="SALESINVOICEITEM_SALESINVOICE" dataType="INTEGER" dataNullable="false" isRequiredProperty="true" relationshipType="COMPOSITION" relationshipCardinality="1_n" relationshipName="Items" widgetType="DROPDOWN" widgetSize="" widgetLength="20" widgetIsMajor="true" widgetDropDownKey="Id" widgetDropDownValue="Number"></property>
     <property name="Name" description="" tooltip="" dataName="SALESINVOICEITEM_NAME" dataType="VARCHAR" dataLength="300" dataNullable="false" isRequiredProperty="true" widgetType="TEXTBOX" widgetSize="" widgetLength="300" widgetIsMajor="true"></property>
@@ -12,7 +12,7 @@
     <property name="VAT" description="" tooltip="" dataName="SALESINVOICEITEM_VAT" dataType="DECIMAL" dataNullable="false" dataPrecision="16" dataScale="2" dataLength="16" isCalculatedProperty="true" calculatedPropertyExpressionCreate="entity[&quot;Net&quot;] * entity[&quot;VATRate&quot;] / 100" calculatedPropertyExpressionUpdate="entity[&quot;Net&quot;] * entity[&quot;VATRate&quot;] / 100" widgetType="NUMBER" widgetSize="" widgetLength="18" widgetIsMajor="true"></property>
     <property name="Gross" description="" tooltip="" dataName="SALESINVOICEITEM_GROSS" dataType="DECIMAL" dataNullable="false" dataPrecision="16" dataScale="2" dataLength="16" isCalculatedProperty="true" calculatedPropertyExpressionCreate="entity[&quot;Net&quot;] + entity[&quot;VAT&quot;]" calculatedPropertyExpressionUpdate="entity[&quot;Net&quot;] + entity[&quot;VAT&quot;]" widgetType="NUMBER" widgetSize="" widgetLength="18" widgetIsMajor="true"></property>
   </entity>
-  <entity name="SalesInvoice" dataName="SALESINVOICE" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}_SALESINVOICE&quot;" dataQuery="" type="PRIMARY" title="SalesInvoice" caption="Manage entity SalesInvoice" description="Manage entity SalesInvoice" tooltip="SalesInvoice" icon="/services/web/resources/unicons/file.svg" menuKey="salesinvoice" menuLabel="SalesInvoice" menuIndex="100" layoutType="MANAGE_MASTER" perspectiveName="SalesInvoice" perspectiveLabel="SalesInvoice" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/invoice.svg" perspectiveOrder="200" perspectiveNavId="sales-navigation-group" perspectiveRole="" generateReport="false" generateDefaultRoles="true" roleRead="codbex-invoices.salesinvoice.SalesInvoiceReadOnly" roleWrite="codbex-invoices.salesinvoice.SalesInvoiceFullAccess" importsCode="aW1wb3J0IHsgTnVtYmVyR2VuZXJhdG9yU2VydmljZSB9IGZyb20gIi9jb2RiZXgtbnVtYmVyLWdlbmVyYXRvci9zZXJ2aWNlL2dlbmVyYXRvciI7">
+  <entity name="SalesInvoice" dataName="SALESINVOICE" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}_SALESINVOICE&quot;" dataQuery="" type="PRIMARY" title="SalesInvoice" caption="Manage entity SalesInvoice" description="Manage entity SalesInvoice" tooltip="SalesInvoice" icon="/services/web/resources/unicons/file.svg" menuKey="salesinvoice" menuLabel="SalesInvoice" menuIndex="100" layoutType="MANAGE_MASTER" perspectiveName="SalesInvoice" perspectiveLabel="SalesInvoice" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/invoice.svg" perspectiveOrder="200" perspectiveNavId="sales-navigation-group" perspectiveRole="" generateReport="false" multilingual="false" generateDefaultRoles="true" roleRead="codbex-invoices.salesinvoice.SalesInvoiceReadOnly" roleWrite="codbex-invoices.salesinvoice.SalesInvoiceFullAccess" importsCode="aW1wb3J0IHsgTnVtYmVyR2VuZXJhdG9yU2VydmljZSB9IGZyb20gIi9jb2RiZXgtbnVtYmVyLWdlbmVyYXRvci9zZXJ2aWNlL2dlbmVyYXRvciI7">
     <property name="Id" description="" tooltip="" dataName="SALESINVOICE_ID" dataType="INTEGER" dataNullable="false" dataPrimaryKey="true" dataAutoIncrement="true" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
     <property name="Number" description="" tooltip="" dataName="SALESINVOICE_NUMBER" dataType="VARCHAR" dataOrderBy="DESC" dataLength="20" dataNullable="true" isCalculatedProperty="true" calculatedPropertyExpressionCreate="new NumberGeneratorService().generate(5)" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
     <property name="Type" description="" tooltip="" dataName="SALESINVOICE_TYPE" dataType="INTEGER" dataNullable="true" widgetType="DROPDOWN" widgetSize="" widgetLength="20" widgetIsMajor="true" widgetDropDownKey="Id" widgetDropDownValue="Name"></property>
@@ -41,7 +41,7 @@
   </entity>
   <relation name="SalesInvoiceItem_SalesInvoice" type="relation" entity="SalesInvoiceItem" relationName="SalesInvoiceItem_SalesInvoice" relationshipEntityPerspectiveName="SalesInvoice" relationshipEntityPerspectiveLabel="Entities" property="SalesInvoice" referenced="SalesInvoice" referencedProperty="Id">
   </relation>
-  <entity name="PurchaseInvoice" dataName="PURCHASEINVOICE" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}_PURCHASEINVOICE&quot;" dataQuery="" type="PRIMARY" title="PurchaseInvoice" caption="Manage entity PurchaseInvoice" description="Manage entity PurchaseInvoice" tooltip="PurchaseInvoice" icon="/services/web/resources/unicons/file.svg" menuKey="purchaseinvoice" menuLabel="PurchaseInvoice" menuIndex="100" layoutType="MANAGE_MASTER" perspectiveName="PurchaseInvoice" perspectiveLabel="PurchaseInvoice" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/receipt.svg" perspectiveOrder="200" perspectiveNavId="purchasing-navigation-group" perspectiveRole="" generateReport="false" generateDefaultRoles="true" roleRead="codbex-invoices.purchaseinvoice.PurchaseInvoiceReadOnly" roleWrite="codbex-invoices.purchaseinvoice.PurchaseInvoiceFullAccess" importsCode="aW1wb3J0IHsgTnVtYmVyR2VuZXJhdG9yU2VydmljZSB9IGZyb20gIi9jb2RiZXgtbnVtYmVyLWdlbmVyYXRvci9zZXJ2aWNlL2dlbmVyYXRvciI7">
+  <entity name="PurchaseInvoice" dataName="PURCHASEINVOICE" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}_PURCHASEINVOICE&quot;" dataQuery="" type="PRIMARY" title="PurchaseInvoice" caption="Manage entity PurchaseInvoice" description="Manage entity PurchaseInvoice" tooltip="PurchaseInvoice" icon="/services/web/resources/unicons/file.svg" menuKey="purchaseinvoice" menuLabel="PurchaseInvoice" menuIndex="100" layoutType="MANAGE_MASTER" perspectiveName="PurchaseInvoice" perspectiveLabel="PurchaseInvoice" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/receipt.svg" perspectiveOrder="200" perspectiveNavId="purchasing-navigation-group" perspectiveRole="" generateReport="false" multilingual="false" generateDefaultRoles="true" roleRead="codbex-invoices.purchaseinvoice.PurchaseInvoiceReadOnly" roleWrite="codbex-invoices.purchaseinvoice.PurchaseInvoiceFullAccess" importsCode="aW1wb3J0IHsgTnVtYmVyR2VuZXJhdG9yU2VydmljZSB9IGZyb20gIi9jb2RiZXgtbnVtYmVyLWdlbmVyYXRvci9zZXJ2aWNlL2dlbmVyYXRvciI7">
     <property name="Id" description="" tooltip="" dataName="PURCHASEINVOICE_ID" dataType="INTEGER" dataNullable="false" dataPrimaryKey="true" dataAutoIncrement="true" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
     <property name="Number" description="" tooltip="" dataName="PURCHASEINVOICE_NUMBER" dataType="VARCHAR" dataOrderBy="DESC" dataLength="20" dataNullable="true" isCalculatedProperty="true" calculatedPropertyExpressionCreate="new NumberGeneratorService().generate(12)" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
     <property name="OriginalNumber" description="" tooltip="" dataName="PURCHASEINVOICE_ORIGINALNUMBER" dataType="VARCHAR" dataLength="20" dataNullable="true" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
@@ -69,7 +69,7 @@
     <property name="Process" description="" tooltip="" dataName="PURCHASEINVOICE_PROCESS" dataType="VARCHAR" dataLength="36" dataNullable="true" isCalculatedProperty="true" widgetType="TEXTBOX" widgetSize="" widgetLength="36" widgetIsMajor="true"></property>
     <property name="Reference" description="" tooltip="" dataName="PURCHASEINVOICE_REFERENCE" dataType="VARCHAR" dataLength="36" dataNullable="true" widgetType="TEXTBOX" widgetSize="" widgetLength="36" widgetIsMajor="true"></property>
   </entity>
-  <entity name="PurchaseInvoiceItem" dataName="PURCHASEINVOICEITEM" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}_PURCHASEINVOICEITEM&quot;" dataQuery="" type="DEPENDENT" title="PurchaseInvoiceItem" caption="Manage entity PurchaseInvoiceItem" description="Manage entity PurchaseInvoiceItem" tooltip="PurchaseInvoiceItem" icon="/services/web/resources/unicons/file.svg" menuKey="purchaseinvoiceitem" menuLabel="PurchaseInvoiceItem" menuIndex="100" layoutType="MANAGE_DETAILS" perspectiveName="PurchaseInvoice" perspectiveLabel="PurchaseInvoice" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/receipt.svg" perspectiveOrder="200" perspectiveNavId="purchasing-navigation-group" perspectiveRole="" generateReport="false" generateDefaultRoles="true" roleRead="codbex-invoices.purchaseinvoice.PurchaseInvoiceItemReadOnly" roleWrite="codbex-invoices.purchaseinvoice.PurchaseInvoiceItemFullAccess">
+  <entity name="PurchaseInvoiceItem" dataName="PURCHASEINVOICEITEM" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}_PURCHASEINVOICEITEM&quot;" dataQuery="" type="DEPENDENT" title="PurchaseInvoiceItem" caption="Manage entity PurchaseInvoiceItem" description="Manage entity PurchaseInvoiceItem" tooltip="PurchaseInvoiceItem" icon="/services/web/resources/unicons/file.svg" menuKey="purchaseinvoiceitem" menuLabel="PurchaseInvoiceItem" menuIndex="100" layoutType="MANAGE_DETAILS" perspectiveName="PurchaseInvoice" perspectiveLabel="PurchaseInvoice" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/receipt.svg" perspectiveOrder="200" perspectiveNavId="purchasing-navigation-group" perspectiveRole="" generateReport="false" multilingual="false" generateDefaultRoles="true" roleRead="codbex-invoices.purchaseinvoice.PurchaseInvoiceItemReadOnly" roleWrite="codbex-invoices.purchaseinvoice.PurchaseInvoiceItemFullAccess">
     <property name="Id" description="" tooltip="" dataName="PURCHASEINVOICEITEM_ID" dataType="INTEGER" dataNullable="true" dataPrimaryKey="true" dataAutoIncrement="true" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
     <property name="PurchaseInvoice" description="" tooltip="" dataName="PURCHASEINVOICEITEM_PURCHASEINVOICE" dataType="INTEGER" dataNullable="false" relationshipType="COMPOSITION" relationshipCardinality="1_n" relationshipName="Items" widgetType="DROPDOWN" widgetSize="" widgetLength="20" widgetIsMajor="true" widgetDropDownKey="Id" widgetDropDownValue="Number"></property>
     <property name="Name" description="" tooltip="" dataName="PURCHASEINVOICEITEM_NAME" dataType="VARCHAR" dataLength="300" dataNullable="false" isRequiredProperty="true" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
@@ -83,19 +83,19 @@
   </entity>
   <relation name="PurchaseInvoiceItem_PurchaseInvoice" type="relation" entity="PurchaseInvoiceItem" relationName="PurchaseInvoiceItem_PurchaseInvoice" relationshipEntityPerspectiveName="PurchaseInvoice" relationshipEntityPerspectiveLabel="Entities" property="PurchaseInvoice" referenced="PurchaseInvoice" referencedProperty="Id">
   </relation>
-  <entity name="SalesInvoiceStatus" dataName="SALESINVOICESTATUS" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}SALESINVOICESTATUS&quot;" dataQuery="" type="SETTING" title="SalesInvoiceStatus" caption="Manage entity SalesInvoiceStatus" description="Manage entity SalesInvoiceStatus" tooltip="SalesInvoiceStatus" icon="/services/web/resources/unicons/file.svg" menuKey="salesinvoicestatus" menuLabel="SalesInvoiceStatus" menuIndex="100" layoutType="MANAGE" perspectiveName="Settings" perspectiveLabel="Entities" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/copy.svg" perspectiveOrder="100" perspectiveNavId="" perspectiveRole="" generateReport="false" generateDefaultRoles="true" feedUsername="YWRtaW4=" feedPassword="YWRtaW4=" roleRead="codbex-invoices.settings.SalesInvoiceStatusReadOnly" roleWrite="codbex-invoices.settings.SalesInvoiceStatusFullAccess">
+  <entity name="SalesInvoiceStatus" dataName="SALESINVOICESTATUS" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}SALESINVOICESTATUS&quot;" dataQuery="" type="SETTING" title="SalesInvoiceStatus" caption="Manage entity SalesInvoiceStatus" description="Manage entity SalesInvoiceStatus" tooltip="SalesInvoiceStatus" icon="/services/web/resources/unicons/file.svg" menuKey="salesinvoicestatus" menuLabel="SalesInvoiceStatus" menuIndex="100" layoutType="MANAGE" perspectiveName="Settings" perspectiveLabel="Entities" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/copy.svg" perspectiveOrder="100" perspectiveNavId="" perspectiveRole="" generateReport="false" multilingual="false" generateDefaultRoles="true" feedUsername="YWRtaW4=" feedPassword="YWRtaW4=" roleRead="codbex-invoices.settings.SalesInvoiceStatusReadOnly" roleWrite="codbex-invoices.settings.SalesInvoiceStatusFullAccess">
     <property name="Id" description="" tooltip="" dataName="SALESINVOICESTATUS_ID" dataType="INTEGER" dataNullable="true" dataPrimaryKey="true" dataAutoIncrement="true" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
     <property name="Name" description="" tooltip="" dataName="SALESINVOICESTATUS_NAME" dataType="VARCHAR" dataLength="20" dataNullable="true" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
   </entity>
   <relation name="SalesInvoice_SalesInvoiceStatus" type="relation" entity="SalesInvoice" relationName="SalesInvoice_SalesInvoiceStatus" relationshipEntityPerspectiveName="Settings" relationshipEntityPerspectiveLabel="Entities" property="Status" referenced="SalesInvoiceStatus" referencedProperty="Id">
   </relation>
-  <entity name="PurchaseInvoiceStatus" dataName="PURCHASEINVOICESTATUS" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}PURCHASEINVOICESTATUS&quot;" dataQuery="" type="SETTING" title="PurchaseInvoiceStatus" caption="Manage entity PurchaseInvoiceStatus" description="Manage entity PurchaseInvoiceStatus" tooltip="PurchaseInvoiceStatus" icon="/services/web/resources/unicons/file.svg" menuKey="purchaseinvoicestatus" menuLabel="PurchaseInvoiceStatus" menuIndex="100" layoutType="MANAGE" perspectiveName="Settings" perspectiveLabel="Entities" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/copy.svg" perspectiveOrder="100" perspectiveNavId="" perspectiveRole="" generateReport="false" generateDefaultRoles="true" feedUsername="YWRtaW4=" feedPassword="YWRtaW4=" roleRead="codbex-invoices.settings.PurchaseInvoiceStatusReadOnly" roleWrite="codbex-invoices.settings.PurchaseInvoiceStatusFullAccess">
+  <entity name="PurchaseInvoiceStatus" dataName="PURCHASEINVOICESTATUS" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}PURCHASEINVOICESTATUS&quot;" dataQuery="" type="SETTING" title="PurchaseInvoiceStatus" caption="Manage entity PurchaseInvoiceStatus" description="Manage entity PurchaseInvoiceStatus" tooltip="PurchaseInvoiceStatus" icon="/services/web/resources/unicons/file.svg" menuKey="purchaseinvoicestatus" menuLabel="PurchaseInvoiceStatus" menuIndex="100" layoutType="MANAGE" perspectiveName="Settings" perspectiveLabel="Entities" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/copy.svg" perspectiveOrder="100" perspectiveNavId="" perspectiveRole="" generateReport="false" multilingual="false" generateDefaultRoles="true" feedUsername="YWRtaW4=" feedPassword="YWRtaW4=" roleRead="codbex-invoices.settings.PurchaseInvoiceStatusReadOnly" roleWrite="codbex-invoices.settings.PurchaseInvoiceStatusFullAccess">
     <property name="Id" description="" tooltip="" dataName="PURCHASEINVOICESTATUS_ID" dataType="INTEGER" dataNullable="true" dataPrimaryKey="true" dataAutoIncrement="true" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
     <property name="Name" description="" tooltip="" dataName="PURCHASEINVOICESTATUS_NAME" dataType="VARCHAR" dataLength="20" dataNullable="true" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
   </entity>
   <relation name="PurchaseInvoice_PurchaseInvoiceStatus" type="relation" entity="PurchaseInvoice" relationName="PurchaseInvoice_PurchaseInvoiceStatus" relationshipEntityPerspectiveName="Settings" relationshipEntityPerspectiveLabel="Entities" property="Status" referenced="PurchaseInvoiceStatus" referencedProperty="Id">
   </relation>
-  <entity name="Customer" dataName="CUSTOMER" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}CUSTOMER&quot;" dataQuery="" type="PROJECTION" title="Customer" caption="Manage entity Customer" description="Manage entity Customer" tooltip="Customer" icon="/services/web/resources/unicons/file.svg" menuKey="customer" menuLabel="Customer" menuIndex="100" layoutType="MANAGE" perspectiveName="Customers" perspectiveLabel="Entities" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/user-plus.svg" perspectiveOrder="100" perspectiveNavId="" perspectiveRole="" generateReport="false" generateDefaultRoles="false" projectionReferencedModel="/workspace/codbex-partners/codbex-partners.model" projectionReferencedEntity="Customer">
+  <entity name="Customer" dataName="CUSTOMER" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}CUSTOMER&quot;" dataQuery="" type="PROJECTION" title="Customer" caption="Manage entity Customer" description="Manage entity Customer" tooltip="Customer" icon="/services/web/resources/unicons/file.svg" menuKey="customer" menuLabel="Customer" menuIndex="100" layoutType="MANAGE" perspectiveName="Customers" perspectiveLabel="Entities" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/user-plus.svg" perspectiveOrder="100" perspectiveNavId="" perspectiveRole="" generateReport="false" multilingual="false" generateDefaultRoles="false" projectionReferencedModel="/workspace/codbex-partners/codbex-partners.model" projectionReferencedEntity="Customer">
     <property name="Id" description="" tooltip="" dataName="CUSTOMER_ID" dataType="INTEGER" dataNullable="true" dataPrimaryKey="true" dataAutoIncrement="true" calculatedPropertyExpressionCreate="" calculatedPropertyExpressionUpdate="" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
     <property name="Name" description="" tooltip="" dataName="CUSTOMER_NAME" dataType="VARCHAR" dataLength="100" dataNullable="true" calculatedPropertyExpressionCreate="" calculatedPropertyExpressionUpdate="" widgetType="TEXTBOX" widgetSize="" widgetLength="100" widgetIsMajor="true"></property>
     <property name="Address" description="" tooltip="" dataName="CUSTOMER_ADDRESS" dataType="VARCHAR" dataLength="200" dataNullable="true" calculatedPropertyExpressionCreate="" calculatedPropertyExpressionUpdate="" widgetType="TEXTAREA" widgetSize="" widgetLength="200" widgetIsMajor="true"></property>
@@ -110,7 +110,7 @@
   </entity>
   <relation name="SalesInvoice_Customer" type="relation" entity="SalesInvoice" relationName="SalesInvoice_Customer" relationshipEntityPerspectiveName="Customers" relationshipEntityPerspectiveLabel="Entities" property="Customer" referenced="Customer" referencedProperty="Id">
   </relation>
-  <entity name="Supplier" dataName="SUPPLIER" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}SUPPLIER&quot;" dataQuery="" type="PROJECTION" title="Supplier" caption="Manage entity Supplier" description="Manage entity Supplier" tooltip="Supplier" icon="/services/web/resources/unicons/file.svg" menuKey="supplier" menuLabel="Supplier" menuIndex="100" layoutType="MANAGE" perspectiveName="Suppliers" perspectiveLabel="Entities" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/user-minus.svg" perspectiveOrder="200" perspectiveNavId="" perspectiveRole="" generateReport="false" generateDefaultRoles="false" projectionReferencedModel="/workspace/codbex-partners/codbex-partners.model" projectionReferencedEntity="Supplier">
+  <entity name="Supplier" dataName="SUPPLIER" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}SUPPLIER&quot;" dataQuery="" type="PROJECTION" title="Supplier" caption="Manage entity Supplier" description="Manage entity Supplier" tooltip="Supplier" icon="/services/web/resources/unicons/file.svg" menuKey="supplier" menuLabel="Supplier" menuIndex="100" layoutType="MANAGE" perspectiveName="Suppliers" perspectiveLabel="Entities" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/user-minus.svg" perspectiveOrder="200" perspectiveNavId="" perspectiveRole="" generateReport="false" multilingual="false" generateDefaultRoles="false" projectionReferencedModel="/workspace/codbex-partners/codbex-partners.model" projectionReferencedEntity="Supplier">
     <property name="Id" description="" tooltip="" dataName="SUPPLIER_ID" dataType="INTEGER" dataNullable="true" dataPrimaryKey="true" dataAutoIncrement="true" calculatedPropertyExpressionCreate="" calculatedPropertyExpressionUpdate="" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
     <property name="Name" description="" tooltip="" dataName="SUPPLIER_NAME" dataType="VARCHAR" dataLength="100" dataNullable="true" calculatedPropertyExpressionCreate="" calculatedPropertyExpressionUpdate="" widgetType="TEXTBOX" widgetSize="" widgetLength="100" widgetIsMajor="true"></property>
     <property name="Address" description="" tooltip="" dataName="SUPPLIER_ADDRESS" dataType="VARCHAR" dataLength="200" dataNullable="true" calculatedPropertyExpressionCreate="" calculatedPropertyExpressionUpdate="" widgetType="TEXTAREA" widgetSize="" widgetLength="200" widgetIsMajor="true"></property>
@@ -125,7 +125,7 @@
   </entity>
   <relation name="PurchaseInvoice_Supplier" type="relation" entity="PurchaseInvoice" relationName="PurchaseInvoice_Supplier" relationshipEntityPerspectiveName="Suppliers" relationshipEntityPerspectiveLabel="Entities" property="Supplier" referenced="Supplier" referencedProperty="Id">
   </relation>
-  <entity name="Company" dataName="COMPANY" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}COMPANY&quot;" dataQuery="" type="PROJECTION" title="Company" caption="Manage entity Company" description="Manage entity Company" tooltip="Company" icon="/services/web/resources/unicons/file.svg" menuKey="company" menuLabel="Company" menuIndex="100" layoutType="MANAGE" perspectiveName="Companies" perspectiveLabel="Entities" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/university.svg" perspectiveOrder="100" perspectiveNavId="" perspectiveRole="" generateReport="false" generateDefaultRoles="false" projectionReferencedModel="/workspace/codbex-companies/codbex-companies.model" projectionReferencedEntity="Company">
+  <entity name="Company" dataName="COMPANY" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}COMPANY&quot;" dataQuery="" type="PROJECTION" title="Company" caption="Manage entity Company" description="Manage entity Company" tooltip="Company" icon="/services/web/resources/unicons/file.svg" menuKey="company" menuLabel="Company" menuIndex="100" layoutType="MANAGE" perspectiveName="Companies" perspectiveLabel="Entities" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/university.svg" perspectiveOrder="100" perspectiveNavId="" perspectiveRole="" generateReport="false" multilingual="false" generateDefaultRoles="false" projectionReferencedModel="/workspace/codbex-companies/codbex-companies.model" projectionReferencedEntity="Company">
     <property name="Id" description="" tooltip="" dataName="COMPANY_ID" dataType="INTEGER" dataNullable="true" dataPrimaryKey="true" dataAutoIncrement="true" calculatedPropertyExpressionCreate="" calculatedPropertyExpressionUpdate="" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
     <property name="Name" description="" tooltip="" dataName="COMPANY_NAME" dataType="VARCHAR" dataLength="100" dataNullable="true" calculatedPropertyExpressionCreate="" calculatedPropertyExpressionUpdate="" widgetType="TEXTBOX" widgetSize="" widgetLength="100" widgetIsMajor="true"></property>
     <property name="Manager" description="" tooltip="" dataName="COMPANY_MANAGER" dataType="VARCHAR" dataLength="50" dataNullable="true" calculatedPropertyExpressionCreate="" calculatedPropertyExpressionUpdate="" widgetType="TEXTBOX" widgetSize="fd-col-md--6 fd-col--9" widgetLength="50" widgetIsMajor="true"></property>
@@ -142,7 +142,7 @@
   </relation>
   <relation name="PurchaseInvoice_Company" type="relation" entity="PurchaseInvoice" relationName="PurchaseInvoice_Company" relationshipEntityPerspectiveName="Companies" relationshipEntityPerspectiveLabel="Entities" property="Company" referenced="Company" referencedProperty="Id">
   </relation>
-  <entity name="Currency" dataName="CURRENCY" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}CURRENCY&quot;" dataQuery="" type="PROJECTION" title="Currency" caption="Manage entity Currency" description="Manage entity Currency" tooltip="Currency" icon="/services/web/resources/unicons/file.svg" menuKey="currency" menuLabel="Currency" menuIndex="100" layoutType="MANAGE" perspectiveName="Settings" perspectiveLabel="Entities" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/dollar-alt.svg" perspectiveOrder="990" perspectiveNavId="" perspectiveRole="" generateReport="false" generateDefaultRoles="false" projectionReferencedModel="/workspace/codbex-currencies/codbex-currencies.model" projectionReferencedEntity="Currency">
+  <entity name="Currency" dataName="CURRENCY" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}CURRENCY&quot;" dataQuery="" type="PROJECTION" title="Currency" caption="Manage entity Currency" description="Manage entity Currency" tooltip="Currency" icon="/services/web/resources/unicons/file.svg" menuKey="currency" menuLabel="Currency" menuIndex="100" layoutType="MANAGE" perspectiveName="Settings" perspectiveLabel="Entities" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/dollar-alt.svg" perspectiveOrder="990" perspectiveNavId="" perspectiveRole="" generateReport="false" multilingual="false" generateDefaultRoles="false" projectionReferencedModel="/workspace/codbex-currencies/codbex-currencies.model" projectionReferencedEntity="Currency">
     <property name="Id" description="" tooltip="" dataName="CURRENCY_ID" dataType="INTEGER" dataNullable="true" dataPrimaryKey="true" dataAutoIncrement="true" calculatedPropertyExpressionCreate="" calculatedPropertyExpressionUpdate="" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
     <property name="Code" description="" tooltip="" dataName="CURRENCY_CODE" dataType="VARCHAR" dataLength="3" dataNullable="true" calculatedPropertyExpressionCreate="" calculatedPropertyExpressionUpdate="" widgetType="TEXTBOX" widgetSize="fd-col-md--2 fd-col--3" widgetLength="3" widgetIsMajor="true"></property>
     <property name="Name" description="" tooltip="" dataName="CURRENCY_NAME" dataType="VARCHAR" dataLength="127" dataNullable="true" calculatedPropertyExpressionCreate="" calculatedPropertyExpressionUpdate="" widgetType="TEXTBOX" widgetSize="fd-col-md--6 fd-col--9" widgetLength="20" widgetIsMajor="true"></property>
@@ -155,7 +155,7 @@
   </relation>
   <relation name="PurchaseInvoice_Currency" type="relation" entity="PurchaseInvoice" relationName="PurchaseInvoice_Currency" relationshipEntityPerspectiveName="Settings" relationshipEntityPerspectiveLabel="Entities" property="Currency" referenced="Currency" referencedProperty="Id">
   </relation>
-  <entity name="Employee" dataName="EMPLOYEE" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}EMPLOYEE&quot;" dataQuery="" type="PROJECTION" title="Employee" caption="Manage entity Employee" description="Manage entity Employee" tooltip="Employee" icon="/services/web/resources/unicons/file.svg" menuKey="employee" menuLabel="Employee" menuIndex="100" layoutType="MANAGE" perspectiveName="Employees" perspectiveLabel="Entities" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/users-alt.svg" perspectiveOrder="101" perspectiveNavId="" perspectiveRole="" generateReport="false" generateDefaultRoles="false" projectionReferencedModel="/workspace/codbex-employees/codbex-employees.model" projectionReferencedEntity="Employee">
+  <entity name="Employee" dataName="EMPLOYEE" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}EMPLOYEE&quot;" dataQuery="" type="PROJECTION" title="Employee" caption="Manage entity Employee" description="Manage entity Employee" tooltip="Employee" icon="/services/web/resources/unicons/file.svg" menuKey="employee" menuLabel="Employee" menuIndex="100" layoutType="MANAGE" perspectiveName="Employees" perspectiveLabel="Entities" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/users-alt.svg" perspectiveOrder="101" perspectiveNavId="" perspectiveRole="" generateReport="false" multilingual="false" generateDefaultRoles="false" projectionReferencedModel="/workspace/codbex-employees/codbex-employees.model" projectionReferencedEntity="Employee">
     <property name="Id" description="" tooltip="" dataName="EMPLOYEE_ID" dataType="INTEGER" dataNullable="true" dataPrimaryKey="true" dataAutoIncrement="true" calculatedPropertyExpressionCreate="" calculatedPropertyExpressionUpdate="" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
     <property name="FirstName" description="" tooltip="" dataName="EMPLOYEE_FIRSTNAME" dataType="VARCHAR" dataLength="50" dataNullable="true" calculatedPropertyExpressionCreate="" calculatedPropertyExpressionUpdate="" widgetType="TEXTBOX" widgetSize="fd-col-md--4 fd-col--6" widgetLength="50" widgetLabel="First Name" widgetShortLabel="First Name" widgetIsMajor="true"></property>
     <property name="MiddleName" description="" tooltip="" dataName="EMPLOYEE_MIDDLENAME" dataType="VARCHAR" dataLength="50" dataNullable="true" calculatedPropertyExpressionCreate="" calculatedPropertyExpressionUpdate="" widgetType="TEXTBOX" widgetSize="fd-col-md--4 fd-col--6" widgetLength="50" widgetLabel="Middle Name" widgetShortLabel="Middle Name" widgetIsMajor="true"></property>
@@ -169,7 +169,7 @@
   </relation>
   <relation name="PurchaseInvoice_Employee" type="relation" entity="PurchaseInvoice" relationName="PurchaseInvoice_Employee" relationshipEntityPerspectiveName="Employees" relationshipEntityPerspectiveLabel="Entities" property="Operator" referenced="Employee" referencedProperty="Id">
   </relation>
-  <entity name="SalesInvoicePayment" dataName="SALESINVOICEPAYMENT" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}SALESINVOICEPAYMENT&quot;" dataQuery="" type="DEPENDENT" title="SalesInvoicePayment" caption="Manage entity SalesInvoicePayment" description="Manage entity SalesInvoicePayment" tooltip="SalesInvoicePayment" icon="/services/web/resources/unicons/file.svg" menuKey="salesinvoicepayment" menuLabel="SalesInvoicePayment" menuIndex="100" layoutType="MANAGE_DETAILS" perspectiveName="SalesInvoice" perspectiveLabel="SalesInvoice" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/invoice.svg" perspectiveOrder="200" perspectiveNavId="sales-navigation-group" perspectiveRole="" generateReport="false" generateDefaultRoles="true" roleRead="codbex-invoices.salesinvoice.SalesInvoicePaymentReadOnly" roleWrite="codbex-invoices.salesinvoice.SalesInvoicePaymentFullAccess">
+  <entity name="SalesInvoicePayment" dataName="SALESINVOICEPAYMENT" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}SALESINVOICEPAYMENT&quot;" dataQuery="" type="DEPENDENT" title="SalesInvoicePayment" caption="Manage entity SalesInvoicePayment" description="Manage entity SalesInvoicePayment" tooltip="SalesInvoicePayment" icon="/services/web/resources/unicons/file.svg" menuKey="salesinvoicepayment" menuLabel="SalesInvoicePayment" menuIndex="100" layoutType="MANAGE_DETAILS" perspectiveName="SalesInvoice" perspectiveLabel="SalesInvoice" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/invoice.svg" perspectiveOrder="200" perspectiveNavId="sales-navigation-group" perspectiveRole="" generateReport="false" multilingual="false" generateDefaultRoles="true" roleRead="codbex-invoices.salesinvoice.SalesInvoicePaymentReadOnly" roleWrite="codbex-invoices.salesinvoice.SalesInvoicePaymentFullAccess">
     <property name="Id" description="" tooltip="" dataName="SALESINVOICEPAYMENT_ID" dataType="INTEGER" dataNullable="true" dataPrimaryKey="true" dataAutoIncrement="true" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
     <property name="SalesInvoice" description="" tooltip="" dataName="SALESINVOICEPAYMENT_SALESINVOICE" dataType="INTEGER" dataNullable="true" relationshipType="COMPOSITION" relationshipCardinality="1_n" relationshipName="Payments" widgetType="DROPDOWN" widgetSize="" widgetLength="20" widgetIsMajor="true" widgetDropDownKey="Id" widgetDropDownValue="Name"></property>
     <property name="CustomerPayment" description="" tooltip="" dataName="SALESINVOICEPAYMENT_CUSTOMERPAYMENT" dataType="INTEGER" dataNullable="true" widgetType="DROPDOWN" widgetSize="" widgetLength="20" widgetIsMajor="true" widgetDropDownKey="Id" widgetDropDownValue="Name"></property>
@@ -177,7 +177,7 @@
   </entity>
   <relation name="SalesInvoicePayment_SalesInvoice" type="relation" entity="SalesInvoicePayment" relationName="SalesInvoicePayment_SalesInvoice" relationshipEntityPerspectiveName="SalesInvoice" relationshipEntityPerspectiveLabel="Entities" property="SalesInvoice" referenced="SalesInvoice" referencedProperty="Id">
   </relation>
-  <entity name="PurchaseInvoicePayment" dataName="PURCHASEINVOICEPAYMENT" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}PURCHASEINVOICEPAYMENT&quot;" dataQuery="" type="DEPENDENT" title="PurchaseInvoicePayment" caption="Manage entity PurchaseInvoicePayment" description="Manage entity PurchaseInvoicePayment" tooltip="PurchaseInvoicePayment" icon="/services/web/resources/unicons/file.svg" menuKey="purchaseinvoicepayment" menuLabel="PurchaseInvoicePayment" menuIndex="100" layoutType="MANAGE_DETAILS" perspectiveName="PurchaseInvoice" perspectiveLabel="PurchaseInvoice" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/receipt.svg" perspectiveOrder="200" perspectiveNavId="purchasing-navigation-group" perspectiveRole="" generateReport="false" generateDefaultRoles="true" roleRead="codbex-invoices.purchaseinvoice.PurchaseInvoicePaymentReadOnly" roleWrite="codbex-invoices.purchaseinvoice.PurchaseInvoicePaymentFullAccess">
+  <entity name="PurchaseInvoicePayment" dataName="PURCHASEINVOICEPAYMENT" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}PURCHASEINVOICEPAYMENT&quot;" dataQuery="" type="DEPENDENT" title="PurchaseInvoicePayment" caption="Manage entity PurchaseInvoicePayment" description="Manage entity PurchaseInvoicePayment" tooltip="PurchaseInvoicePayment" icon="/services/web/resources/unicons/file.svg" menuKey="purchaseinvoicepayment" menuLabel="PurchaseInvoicePayment" menuIndex="100" layoutType="MANAGE_DETAILS" perspectiveName="PurchaseInvoice" perspectiveLabel="PurchaseInvoice" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/receipt.svg" perspectiveOrder="200" perspectiveNavId="purchasing-navigation-group" perspectiveRole="" generateReport="false" multilingual="false" generateDefaultRoles="true" roleRead="codbex-invoices.purchaseinvoice.PurchaseInvoicePaymentReadOnly" roleWrite="codbex-invoices.purchaseinvoice.PurchaseInvoicePaymentFullAccess">
     <property name="Id" description="" tooltip="" dataName="PURCHASEINVOICEPAYMENT_ID" dataType="INTEGER" dataNullable="true" dataPrimaryKey="true" dataAutoIncrement="true" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
     <property name="PurchaseInvoice" description="" tooltip="" dataName="PURCHASEINVOICEPAYMENT_PURCHASEINVOICE" dataType="INTEGER" dataNullable="true" relationshipType="COMPOSITION" relationshipCardinality="1_n" relationshipName="Payments" widgetType="DROPDOWN" widgetSize="" widgetLength="20" widgetIsMajor="true" widgetDropDownKey="Id" widgetDropDownValue="Name"></property>
     <property name="SupplierPayment" description="" tooltip="" dataName="PURCHASEINVOICEPAYMENT_SUPPLIERPAYMENT" dataType="INTEGER" dataNullable="true" widgetType="DROPDOWN" widgetSize="" widgetLength="20" widgetIsMajor="true" widgetDropDownKey="Id" widgetDropDownValue="Name"></property>
@@ -185,7 +185,7 @@
   </entity>
   <relation name="PurchaseInvoicePayment_PurchaseInvoice" type="relation" entity="PurchaseInvoicePayment" relationName="PurchaseInvoicePayment_PurchaseInvoice" relationshipEntityPerspectiveName="PurchaseInvoice" relationshipEntityPerspectiveLabel="Entities" property="PurchaseInvoice" referenced="PurchaseInvoice" referencedProperty="Id">
   </relation>
-  <entity name="UoM" dataName="UOM" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}UOM&quot;" dataQuery="" type="PROJECTION" title="UoM" caption="Manage entity UoM" description="Manage entity UoM" tooltip="UoM" icon="/services/web/resources/unicons/file.svg" menuKey="uom" menuLabel="UoM" menuIndex="100" layoutType="MANAGE" perspectiveName="Settings" perspectiveLabel="Entities" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/arrows-resize-v.svg" perspectiveOrder="980" perspectiveNavId="" perspectiveRole="" generateReport="false" generateDefaultRoles="false" projectionReferencedModel="/workspace/codbex-uoms/codbex-uoms.model" projectionReferencedEntity="UoM">
+  <entity name="UoM" dataName="UOM" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}UOM&quot;" dataQuery="" type="PROJECTION" title="UoM" caption="Manage entity UoM" description="Manage entity UoM" tooltip="UoM" icon="/services/web/resources/unicons/file.svg" menuKey="uom" menuLabel="UoM" menuIndex="100" layoutType="MANAGE" perspectiveName="Settings" perspectiveLabel="Entities" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/arrows-resize-v.svg" perspectiveOrder="980" perspectiveNavId="" perspectiveRole="" generateReport="false" multilingual="false" generateDefaultRoles="false" projectionReferencedModel="/workspace/codbex-uoms/codbex-uoms.model" projectionReferencedEntity="UoM">
     <property name="Id" description="" tooltip="" dataName="UOM_ID" dataType="INTEGER" dataNullable="true" dataPrimaryKey="true" dataAutoIncrement="true" calculatedPropertyExpressionCreate="" calculatedPropertyExpressionUpdate="" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
     <property name="Name" description="" tooltip="" dataName="UOM_NAME" dataType="VARCHAR" dataLength="100" dataNullable="true" calculatedPropertyExpressionCreate="" calculatedPropertyExpressionUpdate="" widgetType="TEXTBOX" widgetSize="fd-col-md--4 fd-col--6" widgetLength="100" widgetIsMajor="true"></property>
     <property name="ISO" description="" tooltip="" dataName="UOM_ISO" dataType="VARCHAR" dataLength="20" dataNullable="true" calculatedPropertyExpressionCreate="" calculatedPropertyExpressionUpdate="" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
@@ -200,14 +200,14 @@
   </relation>
   <relation name="PurchaseInvoiceItem_UoM" type="relation" entity="PurchaseInvoiceItem" relationName="PurchaseInvoiceItem_UoM" relationshipEntityPerspectiveName="Settings" relationshipEntityPerspectiveLabel="Entities" property="UoM" referenced="UoM" referencedProperty="Id">
   </relation>
-  <entity name="SalesInvoiceType" dataName="SALESINVOICETYPE" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}SALESINVOICETYPE&quot;" dataQuery="" type="SETTING" title="SalesInvoiceType" caption="Manage entity SalesInvoiceType" description="Manage entity SalesInvoiceType" tooltip="SalesInvoiceType" icon="/services/web/resources/unicons/file.svg" menuKey="salesinvoicetype" menuLabel="SalesInvoiceType" menuIndex="100" layoutType="MANAGE" perspectiveName="Settings" perspectiveLabel="Entities" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/copy.svg" perspectiveOrder="100" perspectiveNavId="" perspectiveRole="" generateReport="false" generateDefaultRoles="true" feedUsername="TXJnb2JsaW5ncw==" feedPassword="Z2hwX0RLcFJzSUZNUnJYSllEWHBhN2NURGpNSWNMbEx5czExMWFkTg==" roleRead="codbex-invoices.settings.SalesInvoiceTypeReadOnly" roleWrite="codbex-invoices.settings.SalesInvoiceTypeFullAccess">
+  <entity name="SalesInvoiceType" dataName="SALESINVOICETYPE" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}SALESINVOICETYPE&quot;" dataQuery="" type="SETTING" title="SalesInvoiceType" caption="Manage entity SalesInvoiceType" description="Manage entity SalesInvoiceType" tooltip="SalesInvoiceType" icon="/services/web/resources/unicons/file.svg" menuKey="salesinvoicetype" menuLabel="SalesInvoiceType" menuIndex="100" layoutType="MANAGE" perspectiveName="Settings" perspectiveLabel="Entities" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/copy.svg" perspectiveOrder="100" perspectiveNavId="" perspectiveRole="" generateReport="false" multilingual="false" generateDefaultRoles="true" feedUsername="TXJnb2JsaW5ncw==" feedPassword="Z2hwX0RLcFJzSUZNUnJYSllEWHBhN2NURGpNSWNMbEx5czExMWFkTg==" roleRead="codbex-invoices.settings.SalesInvoiceTypeReadOnly" roleWrite="codbex-invoices.settings.SalesInvoiceTypeFullAccess">
     <property name="Id" description="" tooltip="" dataName="SALESINVOICETYPE_ID" dataType="INTEGER" dataNullable="true" dataPrimaryKey="true" dataAutoIncrement="true" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
     <property name="Name" description="" tooltip="" dataName="SALESINVOICETYPE_NAME" dataType="VARCHAR" dataLength="20" dataNullable="true" isRequiredProperty="true" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
     <property name="Direction" description="" tooltip="" dataName="SALESINVOICETYPE_DIRECTION" dataType="INTEGER" dataNullable="false" isRequiredProperty="true" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
   </entity>
   <relation name="SalesInvoice_SalesInvoiceType" type="relation" entity="SalesInvoice" relationName="SalesInvoice_SalesInvoiceType" relationshipEntityPerspectiveName="Settings" relationshipEntityPerspectiveLabel="Entities" property="Type" referenced="SalesInvoiceType" referencedProperty="Id">
   </relation>
-  <entity name="SalesOrder" dataName="SALESORDER" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}SALESORDER&quot;" dataQuery="" type="PROJECTION" title="SalesOrder" caption="Manage entity SalesOrder" description="Manage entity SalesOrder" tooltip="SalesOrder" icon="/services/web/resources/unicons/file.svg" menuKey="salesorder" menuLabel="SalesOrder" menuIndex="100" layoutType="MANAGE" perspectiveName="SalesOrder" perspectiveLabel="Sales Order" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/receipt.svg" perspectiveOrder="510" perspectiveNavId="" perspectiveRole="" generateReport="false" generateDefaultRoles="false" projectionReferencedModel="/workspace/codbex-orders/codbex-orders.model" projectionReferencedEntity="SalesOrder">
+  <entity name="SalesOrder" dataName="SALESORDER" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}SALESORDER&quot;" dataQuery="" type="PROJECTION" title="SalesOrder" caption="Manage entity SalesOrder" description="Manage entity SalesOrder" tooltip="SalesOrder" icon="/services/web/resources/unicons/file.svg" menuKey="salesorder" menuLabel="SalesOrder" menuIndex="100" layoutType="MANAGE" perspectiveName="SalesOrder" perspectiveLabel="Sales Order" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/receipt.svg" perspectiveOrder="510" perspectiveNavId="" perspectiveRole="" generateReport="false" multilingual="false" generateDefaultRoles="false" projectionReferencedModel="/workspace/codbex-orders/codbex-orders.model" projectionReferencedEntity="SalesOrder">
     <property name="Id" description="" tooltip="" dataName="SALESORDER_ID" dataType="INTEGER" dataNullable="true" dataPrimaryKey="true" dataAutoIncrement="true" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
     <property name="Number" description="" tooltip="" dataName="SALESORDER_NUMBER" dataType="VARCHAR" dataOrderBy="DESC" dataLength="20" dataNullable="true" isCalculatedProperty="true" calculatedPropertyExpressionCreate="new NumberGeneratorService().generate(4)" widgetType="TEXTBOX" widgetSize="fd-col-md--4 fd-col--6" widgetLength="20" widgetIsMajor="true"></property>
     <property name="Date" description="" tooltip="" dataName="SALESORDER_DATE" dataType="DATE" dataNullable="true" isRequiredProperty="true" widgetType="DATE" widgetSize="fd-col-md--2 fd-col--3" widgetLength="20" widgetIsMajor="true"></property>
@@ -231,19 +231,19 @@
     <property name="Reference" description="" tooltip="" dataName="SALESORDER_REFERENCE" dataType="VARCHAR" dataLength="36" dataNullable="true" widgetType="TEXTBOX" widgetSize="fd-col-md--4 fd-col--6" widgetLength="20" widgetIsMajor="true"></property>
     <property name="Store" description="" tooltip="" dataName="SALESORDER_STORE" dataType="INTEGER" dataNullable="true" isRequiredProperty="true" relationshipName="SalesOrder_Store" widgetType="DROPDOWN" widgetSize="" widgetLength="20" widgetIsMajor="true" widgetDropDownKey="Id" widgetDropDownValue="Name" relationshipEntityPerspectiveName="Stores" relationshipEntityPerspectiveLabel="Stores"></property>
   </entity>
-  <entity name="Deduction" dataName="DEDUCTION" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}DEDUCTION&quot;" dataQuery="" type="DEPENDENT" title="Deduction" caption="Manage entity Deduction" description="Manage entity Deduction" tooltip="Deduction" icon="/services/web/resources/unicons/file.svg" menuKey="deduction" menuLabel="Deduction" menuIndex="100" layoutType="MANAGE_DETAILS" perspectiveName="SalesInvoice" perspectiveLabel="SalesInvoice" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/invoice.svg" perspectiveOrder="200" perspectiveNavId="sales-navigation-group" perspectiveRole="" generateReport="false" generateDefaultRoles="true" roleRead="codbex-invoices.settings.DeductionReadOnly" roleWrite="codbex-invoices.settings.DeductionFullAccess">
+  <entity name="Deduction" dataName="DEDUCTION" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}DEDUCTION&quot;" dataQuery="" type="DEPENDENT" title="Deduction" caption="Manage entity Deduction" description="Manage entity Deduction" tooltip="Deduction" icon="/services/web/resources/unicons/file.svg" menuKey="deduction" menuLabel="Deduction" menuIndex="100" layoutType="MANAGE_DETAILS" perspectiveName="SalesInvoice" perspectiveLabel="SalesInvoice" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/invoice.svg" perspectiveOrder="200" perspectiveNavId="sales-navigation-group" perspectiveRole="" generateReport="false" multilingual="false" generateDefaultRoles="true" roleRead="codbex-invoices.settings.DeductionReadOnly" roleWrite="codbex-invoices.settings.DeductionFullAccess">
     <property name="Id" description="" tooltip="" dataName="DEDUCTION_ID" dataType="INTEGER" dataNullable="true" dataPrimaryKey="true" dataAutoIncrement="true" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
     <property name="DeductionInvoice" description="" tooltip="" dataName="DEDUCTION_DEDUCTIONINVOICE" dataType="INTEGER" dataNullable="true" relationshipType="COMPOSITION" relationshipCardinality="1_n" relationshipName="Deduction" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true" widgetDropDownKey="Id" widgetDropDownValue="Number"></property>
     <property name="AdvanceInvoice" description="" tooltip="" dataName="DEDUCTION_ADVANCEINVOICE" dataType="INTEGER" dataNullable="true" widgetType="DROPDOWN" widgetSize="" widgetLength="20" widgetIsMajor="true" widgetDropDownKey="Id" widgetDropDownValue="Number"></property>
   </entity>
-  <entity name="PurchaseInvoiceType" dataName="PURCHASEINVOICETYPE" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}PURCHASEINVOICETYPE&quot;" dataQuery="" type="SETTING" title="PurchaseInvoiceType" caption="Manage entity PurchaseInvoiceType" description="Manage entity PurchaseInvoiceType" tooltip="PurchaseInvoiceType" icon="/services/web/resources/unicons/file.svg" menuKey="purchaseinvoicetype" menuLabel="PurchaseInvoiceType" menuIndex="100" layoutType="MANAGE" perspectiveName="Settings" perspectiveLabel="Entities" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/copy.svg" perspectiveOrder="100" perspectiveNavId="" perspectiveRole="" generateReport="false" generateDefaultRoles="true" feedUsername="TXJnb2JsaW5ncw==" feedPassword="Z2hwX0RLcFJzSUZNUnJYSllEWHBhN2NURGpNSWNMbEx5czExMWFkTg==" roleRead="codbex-invoices.settings.PurchaseInvoiceTypeReadOnly" roleWrite="codbex-invoices.settings.PurchaseInvoiceTypeFullAccess">
+  <entity name="PurchaseInvoiceType" dataName="PURCHASEINVOICETYPE" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}PURCHASEINVOICETYPE&quot;" dataQuery="" type="SETTING" title="PurchaseInvoiceType" caption="Manage entity PurchaseInvoiceType" description="Manage entity PurchaseInvoiceType" tooltip="PurchaseInvoiceType" icon="/services/web/resources/unicons/file.svg" menuKey="purchaseinvoicetype" menuLabel="PurchaseInvoiceType" menuIndex="100" layoutType="MANAGE" perspectiveName="Settings" perspectiveLabel="Entities" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/copy.svg" perspectiveOrder="100" perspectiveNavId="" perspectiveRole="" generateReport="false" multilingual="false" generateDefaultRoles="true" feedUsername="TXJnb2JsaW5ncw==" feedPassword="Z2hwX0RLcFJzSUZNUnJYSllEWHBhN2NURGpNSWNMbEx5czExMWFkTg==" roleRead="codbex-invoices.settings.PurchaseInvoiceTypeReadOnly" roleWrite="codbex-invoices.settings.PurchaseInvoiceTypeFullAccess">
     <property name="Id" description="" tooltip="" dataName="PURCHASEINVOICETYPE_ID" dataType="INTEGER" dataNullable="true" dataPrimaryKey="true" dataAutoIncrement="true" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
     <property name="Name" description="" tooltip="" dataName="PURCHASEINVOICETYPE_NAME" dataType="VARCHAR" dataLength="20" dataNullable="true" isRequiredProperty="true" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
     <property name="Direction" description="" tooltip="" dataName="PURCHASEINVOICETYPE_DIRECTION" dataType="INTEGER" dataNullable="false" isRequiredProperty="true" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
   </entity>
   <relation name="PurchaseInvoice_PurchaseInvoiceType" type="relation" entity="PurchaseInvoice" relationName="PurchaseInvoice_PurchaseInvoiceType" relationshipEntityPerspectiveName="Settings" relationshipEntityPerspectiveLabel="Entities" property="Type" referenced="PurchaseInvoiceType" referencedProperty="Id">
   </relation>
-  <entity name="PaymentMethod" dataName="PAYMENTMETHOD" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}PAYMENTMETHOD&quot;" dataQuery="" type="COPIED" title="PaymentMethod" caption="Manage entity PaymentMethod" description="Manage entity PaymentMethod" tooltip="PaymentMethod" icon="/services/web/resources/unicons/file.svg" menuKey="paymentmethod" menuLabel="PaymentMethod" menuIndex="100" layoutType="MANAGE" perspectiveName="Settings" perspectiveLabel="PaymentMethod" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/archive.svg" perspectiveOrder="100" perspectiveNavId="" perspectiveRole="" generateReport="false" generateDefaultRoles="false" projectionReferencedModel="/workspace/codbex-methods/codbex-methods.model" projectionReferencedEntity="PaymentMethod">
+  <entity name="PaymentMethod" dataName="PAYMENTMETHOD" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}PAYMENTMETHOD&quot;" dataQuery="" type="COPIED" title="PaymentMethod" caption="Manage entity PaymentMethod" description="Manage entity PaymentMethod" tooltip="PaymentMethod" icon="/services/web/resources/unicons/file.svg" menuKey="paymentmethod" menuLabel="PaymentMethod" menuIndex="100" layoutType="MANAGE" perspectiveName="Settings" perspectiveLabel="PaymentMethod" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/archive.svg" perspectiveOrder="100" perspectiveNavId="" perspectiveRole="" generateReport="false" multilingual="false" generateDefaultRoles="false" projectionReferencedModel="/workspace/codbex-methods/codbex-methods.model" projectionReferencedEntity="PaymentMethod">
     <property name="Id" description="" tooltip="" dataName="PAYMENTMETHOD_ID" dataType="INTEGER" dataNullable="true" dataPrimaryKey="true" dataAutoIncrement="true" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
     <property name="Name" description="" tooltip="" dataName="PAYMENTMETHOD_NAME" dataType="VARCHAR" dataLength="20" dataNullable="true" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
   </entity>
@@ -251,7 +251,7 @@
   </relation>
   <relation name="PurchaseInvoice_PaymentMethod" type="relation" entity="PurchaseInvoice" relationName="PurchaseInvoice_PaymentMethod" relationshipEntityPerspectiveName="Settings" relationshipEntityPerspectiveLabel="PaymentMethod" property="PaymentMethod" referenced="PaymentMethod" referencedProperty="Id">
   </relation>
-  <entity name="SentMethod" dataName="SENTMETHOD" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}SENTMETHOD&quot;" dataQuery="" type="COPIED" title="SentMethod" caption="Manage entity SentMethod" description="Manage entity SentMethod" tooltip="SentMethod" icon="/services/web/resources/unicons/file.svg" menuKey="sentmethod" menuLabel="SentMethod" menuIndex="100" layoutType="MANAGE" perspectiveName="Settings" perspectiveLabel="SentMethod" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/archive.svg" perspectiveOrder="200" perspectiveNavId="" perspectiveRole="" generateReport="false" generateDefaultRoles="false" projectionReferencedModel="/workspace/codbex-methods/codbex-methods.model" projectionReferencedEntity="SentMethod">
+  <entity name="SentMethod" dataName="SENTMETHOD" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}SENTMETHOD&quot;" dataQuery="" type="COPIED" title="SentMethod" caption="Manage entity SentMethod" description="Manage entity SentMethod" tooltip="SentMethod" icon="/services/web/resources/unicons/file.svg" menuKey="sentmethod" menuLabel="SentMethod" menuIndex="100" layoutType="MANAGE" perspectiveName="Settings" perspectiveLabel="SentMethod" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/archive.svg" perspectiveOrder="200" perspectiveNavId="" perspectiveRole="" generateReport="false" multilingual="false" generateDefaultRoles="false" projectionReferencedModel="/workspace/codbex-methods/codbex-methods.model" projectionReferencedEntity="SentMethod">
     <property name="Id" description="" tooltip="" dataName="SENTMETHOD_ID" dataType="INTEGER" dataNullable="true" dataPrimaryKey="true" dataAutoIncrement="true" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
     <property name="Name" description="" tooltip="" dataName="SENTMETHOD_NAME" dataType="VARCHAR" dataLength="20" dataNullable="true" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
   </entity>
@@ -259,7 +259,7 @@
   </relation>
   <relation name="PurchaseInvoice_SentMethod" type="relation" entity="PurchaseInvoice" relationName="PurchaseInvoice_SentMethod" relationshipEntityPerspectiveName="Settings" relationshipEntityPerspectiveLabel="SentMethod" property="SentMethod" referenced="SentMethod" referencedProperty="Id">
   </relation>
-  <entity name="CustomerPayment" dataName="CUSTOMERPAYMENT" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}CUSTOMERPAYMENT&quot;" dataQuery="" type="COPIED" title="CustomerPayment" caption="Manage entity CustomerPayment" description="Manage entity CustomerPayment" tooltip="CustomerPayment" icon="/services/web/resources/unicons/file.svg" menuKey="customerpayment" menuLabel="CustomerPayment" menuIndex="100" layoutType="MANAGE" perspectiveName="CustomerPayment" perspectiveLabel="CustomerPayment" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/usd-square.svg" perspectiveOrder="10" perspectiveNavId="" perspectiveRole="" generateReport="false" generateDefaultRoles="false" projectionReferencedModel="/workspace/codbex-payments/codbex-payments.model" projectionReferencedEntity="CustomerPayment">
+  <entity name="CustomerPayment" dataName="CUSTOMERPAYMENT" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}CUSTOMERPAYMENT&quot;" dataQuery="" type="COPIED" title="CustomerPayment" caption="Manage entity CustomerPayment" description="Manage entity CustomerPayment" tooltip="CustomerPayment" icon="/services/web/resources/unicons/file.svg" menuKey="customerpayment" menuLabel="CustomerPayment" menuIndex="100" layoutType="MANAGE" perspectiveName="CustomerPayment" perspectiveLabel="CustomerPayment" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/usd-square.svg" perspectiveOrder="10" perspectiveNavId="" perspectiveRole="" generateReport="false" multilingual="false" generateDefaultRoles="false" projectionReferencedModel="/workspace/codbex-payments/codbex-payments.model" projectionReferencedEntity="CustomerPayment">
     <property name="Id" description="" tooltip="" dataName="CUSTOMERPAYMENT_ID" dataType="INTEGER" dataNullable="true" dataPrimaryKey="true" dataAutoIncrement="true" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
     <property name="Customer" description="" tooltip="" dataName="CUSTOMERPAYMENT_CUSTOMER" dataType="INTEGER" dataNullable="true" isRequiredProperty="true" relationshipName="CustomerPayment_Customer" widgetType="DROPDOWN" widgetSize="" widgetLength="20" widgetIsMajor="true" widgetDropDownKey="Id" widgetDropDownValue="Name" relationshipEntityPerspectiveName="Customers" relationshipEntityPerspectiveLabel="Customers"></property>
     <property name="Date" description="" tooltip="" dataName="CUSTOMERPAYMENT_DATE" dataType="DATE" dataOrderBy="DESC" dataNullable="true" isRequiredProperty="true" widgetType="DATE" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
@@ -279,7 +279,7 @@
   </entity>
   <relation name="SalesInvoicePayment_CustomerPayment" type="relation" entity="SalesInvoicePayment" relationName="SalesInvoicePayment_CustomerPayment" relationshipEntityPerspectiveName="CustomerPayment" relationshipEntityPerspectiveLabel="CustomerPayment" property="CustomerPayment" referenced="CustomerPayment" referencedProperty="Id">
   </relation>
-  <entity name="SupplierPayment" dataName="SUPPLIERPAYMENT" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}SUPPLIERPAYMENT&quot;" dataQuery="" type="COPIED" title="SupplierPayment" caption="Manage entity SupplierPayment" description="Manage entity SupplierPayment" tooltip="SupplierPayment" icon="/services/web/resources/unicons/file.svg" menuKey="supplierpayment" menuLabel="SupplierPayment" menuIndex="100" layoutType="MANAGE" perspectiveName="SupplierPayment" perspectiveLabel="SupplierPayment" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/box.svg" perspectiveOrder="20" perspectiveNavId="" perspectiveRole="" generateReport="false" generateDefaultRoles="false" projectionReferencedModel="/workspace/codbex-payments/codbex-payments.model" projectionReferencedEntity="SupplierPayment">
+  <entity name="SupplierPayment" dataName="SUPPLIERPAYMENT" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}SUPPLIERPAYMENT&quot;" dataQuery="" type="COPIED" title="SupplierPayment" caption="Manage entity SupplierPayment" description="Manage entity SupplierPayment" tooltip="SupplierPayment" icon="/services/web/resources/unicons/file.svg" menuKey="supplierpayment" menuLabel="SupplierPayment" menuIndex="100" layoutType="MANAGE" perspectiveName="SupplierPayment" perspectiveLabel="SupplierPayment" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/box.svg" perspectiveOrder="20" perspectiveNavId="" perspectiveRole="" generateReport="false" multilingual="false" generateDefaultRoles="false" projectionReferencedModel="/workspace/codbex-payments/codbex-payments.model" projectionReferencedEntity="SupplierPayment">
     <property name="Id" description="" tooltip="" dataName="SUPPLIERPAYMENT_ID" dataType="INTEGER" dataNullable="true" dataPrimaryKey="true" dataAutoIncrement="true" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
     <property name="Supplier" description="" tooltip="" dataName="SUPPLIERPAYMENT_SUPPLIER" dataType="INTEGER" dataNullable="true" relationshipName="SupplierPayment_Supplier" widgetType="DROPDOWN" widgetSize="" widgetLength="20" widgetIsMajor="true" widgetDropDownKey="Id" widgetDropDownValue="Name" relationshipEntityPerspectiveName="Suppliers" relationshipEntityPerspectiveLabel="Suppliers"></property>
     <property name="Date" description="" tooltip="" dataName="SUPPLIERPAYMENT_DATE" dataType="DATE" dataOrderBy="DESC" dataNullable="true" isRequiredProperty="true" widgetType="DATE" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
diff --git a/codbex-invoices/codbex-invoices.gen b/codbex-invoices/codbex-invoices.gen
index b65d4ab..7f293a5 100644
--- a/codbex-invoices/codbex-invoices.gen
+++ b/codbex-invoices/codbex-invoices.gen
@@ -240,6 +240,7 @@
       "role": ""
     }
   },
+  "tprefix": "codbex-invoices-model",
   "models": [
     {
       "properties": [
@@ -262,6 +263,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Id",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -293,6 +295,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "SalesInvoice",
           "widgetDropdownUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/SalesInvoice/SalesInvoiceService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/SalesInvoice/SalesInvoiceController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -317,6 +320,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Name",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -342,6 +346,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Quantity",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "double",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -371,6 +376,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "UoM",
           "widgetDropdownUrl": "/services/ts/codbex-uoms/gen/codbex-uoms/api/Settings/UoMService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-uoms/gen/codbex-uoms/api/Settings/UoMController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -397,6 +403,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Price",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "double",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -425,6 +432,7 @@
           "isRequiredProperty": false,
           "widgetLabel": "Net",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "double",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -451,6 +459,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "VATRate",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "double",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -479,6 +488,7 @@
           "isRequiredProperty": false,
           "widgetLabel": "VAT",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "double",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -507,6 +517,7 @@
           "isRequiredProperty": false,
           "widgetLabel": "Gross",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "double",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -524,6 +535,7 @@
       "menuIndex": "100",
       "menuKey": "salesinvoiceitem",
       "menuLabel": "SalesInvoiceItem",
+      "multilingual": "false",
       "name": "SalesInvoiceItem",
       "perspectiveHeader": "",
       "perspectiveIcon": "/services/web/resources/unicons/invoice.svg",
@@ -574,6 +586,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Id",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -600,6 +613,7 @@
           "isRequiredProperty": false,
           "widgetLabel": "Number",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -631,6 +645,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Type",
           "widgetDropdownUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Settings/SalesInvoiceTypeService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Settings/SalesInvoiceTypeController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -660,6 +675,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Customer",
           "widgetDropdownUrl": "/services/ts/codbex-partners/gen/codbex-partners/api/Customers/CustomerService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-partners/gen/codbex-partners/api/Customers/CustomerController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -683,6 +699,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Date",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "date",
           "dataTypeTypescript": "Date",
           "isDateType": true,
@@ -707,6 +724,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Due",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "date",
           "dataTypeTypescript": "Date",
           "isDateType": true,
@@ -734,6 +752,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Net",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "double",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -763,6 +782,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Currency",
           "widgetDropdownUrl": "/services/ts/codbex-currencies/gen/codbex-currencies/api/Settings/CurrencyService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-currencies/gen/codbex-currencies/api/Settings/CurrencyController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -789,6 +809,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Gross",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "double",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -816,6 +837,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Discount",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "double",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -843,6 +865,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Taxes",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "double",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -869,6 +892,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "VAT",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "double",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -896,6 +920,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Total",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "double",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -923,6 +948,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Paid",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "double",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -947,6 +973,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Conditions",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -978,6 +1005,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "PaymentMethod",
           "widgetDropdownUrl": "/services/ts/codbex-methods/gen/codbex-methods/api/Settings/PaymentMethodService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-methods/gen/codbex-methods/api/Settings/PaymentMethodController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -1007,6 +1035,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "SentMethod",
           "widgetDropdownUrl": "/services/ts/codbex-methods/gen/codbex-methods/api/Settings/SentMethodService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-methods/gen/codbex-methods/api/Settings/SentMethodController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -1036,6 +1065,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Status",
           "widgetDropdownUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Settings/SalesInvoiceStatusService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Settings/SalesInvoiceStatusController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -1065,6 +1095,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Operator",
           "widgetDropdownUrl": "/services/ts/codbex-employees/gen/codbex-employees/api/Employees/EmployeeService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-employees/gen/codbex-employees/api/Employees/EmployeeController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -1089,6 +1120,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Document",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -1120,6 +1152,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Company",
           "widgetDropdownUrl": "/services/ts/codbex-companies/gen/codbex-companies/api/Companies/CompanyService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-companies/gen/codbex-companies/api/Companies/CompanyController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -1145,6 +1178,7 @@
           "isRequiredProperty": false,
           "widgetLabel": "Name",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -1172,6 +1206,7 @@
           "isRequiredProperty": false,
           "widgetLabel": "UUID",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -1198,6 +1233,7 @@
           "isRequiredProperty": false,
           "widgetLabel": "Process",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -1224,6 +1260,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Reference",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -1244,6 +1281,7 @@
       "menuIndex": "100",
       "menuKey": "salesinvoice",
       "menuLabel": "SalesInvoice",
+      "multilingual": "false",
       "name": "SalesInvoice",
       "perspectiveHeader": "",
       "perspectiveIcon": "/services/web/resources/unicons/invoice.svg",
@@ -1319,6 +1357,7 @@
           "isRequiredProperty": false,
           "widgetLabel": "Number",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -1351,6 +1390,7 @@
             "isCalculatedProperty": false,
             "widgetLabel": "Type",
             "widgetDropdownUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Settings/SalesInvoiceTypeService.ts",
+            "widgetDropdownControllerUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Settings/SalesInvoiceTypeController.ts",
             "dataTypeJava": "int",
             "dataTypeTypescript": "number",
             "inputRule": ""
@@ -1380,6 +1420,7 @@
             "isCalculatedProperty": false,
             "widgetLabel": "Customer",
             "widgetDropdownUrl": "/services/ts/codbex-partners/gen/codbex-partners/api/Customers/CustomerService.ts",
+            "widgetDropdownControllerUrl": "/services/ts/codbex-partners/gen/codbex-partners/api/Customers/CustomerController.ts",
             "dataTypeJava": "int",
             "dataTypeTypescript": "number",
             "inputRule": ""
@@ -1403,6 +1444,7 @@
             "isCalculatedProperty": false,
             "widgetLabel": "Date",
             "widgetDropdownUrl": "",
+            "widgetDropdownControllerUrl": "",
             "dataTypeJava": "date",
             "dataTypeTypescript": "Date",
             "isDateType": true,
@@ -1427,6 +1469,7 @@
             "isCalculatedProperty": false,
             "widgetLabel": "Due",
             "widgetDropdownUrl": "",
+            "widgetDropdownControllerUrl": "",
             "dataTypeJava": "date",
             "dataTypeTypescript": "Date",
             "isDateType": true,
@@ -1454,6 +1497,7 @@
             "isCalculatedProperty": false,
             "widgetLabel": "Net",
             "widgetDropdownUrl": "",
+            "widgetDropdownControllerUrl": "",
             "dataTypeJava": "double",
             "dataTypeTypescript": "number",
             "inputRule": ""
@@ -1483,6 +1527,7 @@
             "isCalculatedProperty": false,
             "widgetLabel": "Currency",
             "widgetDropdownUrl": "/services/ts/codbex-currencies/gen/codbex-currencies/api/Settings/CurrencyService.ts",
+            "widgetDropdownControllerUrl": "/services/ts/codbex-currencies/gen/codbex-currencies/api/Settings/CurrencyController.ts",
             "dataTypeJava": "int",
             "dataTypeTypescript": "number",
             "inputRule": ""
@@ -1509,6 +1554,7 @@
             "isCalculatedProperty": false,
             "widgetLabel": "Gross",
             "widgetDropdownUrl": "",
+            "widgetDropdownControllerUrl": "",
             "dataTypeJava": "double",
             "dataTypeTypescript": "number",
             "inputRule": ""
@@ -1536,6 +1582,7 @@
             "isCalculatedProperty": false,
             "widgetLabel": "Discount",
             "widgetDropdownUrl": "",
+            "widgetDropdownControllerUrl": "",
             "dataTypeJava": "double",
             "dataTypeTypescript": "number",
             "inputRule": ""
@@ -1563,6 +1610,7 @@
             "isCalculatedProperty": false,
             "widgetLabel": "Taxes",
             "widgetDropdownUrl": "",
+            "widgetDropdownControllerUrl": "",
             "dataTypeJava": "double",
             "dataTypeTypescript": "number",
             "inputRule": ""
@@ -1589,6 +1637,7 @@
             "isCalculatedProperty": false,
             "widgetLabel": "VAT",
             "widgetDropdownUrl": "",
+            "widgetDropdownControllerUrl": "",
             "dataTypeJava": "double",
             "dataTypeTypescript": "number",
             "inputRule": ""
@@ -1616,6 +1665,7 @@
             "isCalculatedProperty": false,
             "widgetLabel": "Total",
             "widgetDropdownUrl": "",
+            "widgetDropdownControllerUrl": "",
             "dataTypeJava": "double",
             "dataTypeTypescript": "number",
             "inputRule": ""
@@ -1643,6 +1693,7 @@
             "isCalculatedProperty": false,
             "widgetLabel": "Paid",
             "widgetDropdownUrl": "",
+            "widgetDropdownControllerUrl": "",
             "dataTypeJava": "double",
             "dataTypeTypescript": "number",
             "inputRule": ""
@@ -1667,6 +1718,7 @@
             "isCalculatedProperty": false,
             "widgetLabel": "Conditions",
             "widgetDropdownUrl": "",
+            "widgetDropdownControllerUrl": "",
             "dataTypeJava": "string",
             "dataTypeTypescript": "string",
             "minLength": 0,
@@ -1698,6 +1750,7 @@
             "isCalculatedProperty": false,
             "widgetLabel": "PaymentMethod",
             "widgetDropdownUrl": "/services/ts/codbex-methods/gen/codbex-methods/api/Settings/PaymentMethodService.ts",
+            "widgetDropdownControllerUrl": "/services/ts/codbex-methods/gen/codbex-methods/api/Settings/PaymentMethodController.ts",
             "dataTypeJava": "int",
             "dataTypeTypescript": "number",
             "inputRule": ""
@@ -1727,6 +1780,7 @@
             "isCalculatedProperty": false,
             "widgetLabel": "SentMethod",
             "widgetDropdownUrl": "/services/ts/codbex-methods/gen/codbex-methods/api/Settings/SentMethodService.ts",
+            "widgetDropdownControllerUrl": "/services/ts/codbex-methods/gen/codbex-methods/api/Settings/SentMethodController.ts",
             "dataTypeJava": "int",
             "dataTypeTypescript": "number",
             "inputRule": ""
@@ -1756,6 +1810,7 @@
             "isCalculatedProperty": false,
             "widgetLabel": "Status",
             "widgetDropdownUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Settings/SalesInvoiceStatusService.ts",
+            "widgetDropdownControllerUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Settings/SalesInvoiceStatusController.ts",
             "dataTypeJava": "int",
             "dataTypeTypescript": "number",
             "inputRule": ""
@@ -1785,6 +1840,7 @@
             "isCalculatedProperty": false,
             "widgetLabel": "Operator",
             "widgetDropdownUrl": "/services/ts/codbex-employees/gen/codbex-employees/api/Employees/EmployeeService.ts",
+            "widgetDropdownControllerUrl": "/services/ts/codbex-employees/gen/codbex-employees/api/Employees/EmployeeController.ts",
             "dataTypeJava": "int",
             "dataTypeTypescript": "number",
             "inputRule": ""
@@ -1809,6 +1865,7 @@
             "isCalculatedProperty": false,
             "widgetLabel": "Document",
             "widgetDropdownUrl": "",
+            "widgetDropdownControllerUrl": "",
             "dataTypeJava": "string",
             "dataTypeTypescript": "string",
             "minLength": 0,
@@ -1840,6 +1897,7 @@
             "isCalculatedProperty": false,
             "widgetLabel": "Company",
             "widgetDropdownUrl": "/services/ts/codbex-companies/gen/codbex-companies/api/Companies/CompanyService.ts",
+            "widgetDropdownControllerUrl": "/services/ts/codbex-companies/gen/codbex-companies/api/Companies/CompanyController.ts",
             "dataTypeJava": "int",
             "dataTypeTypescript": "number",
             "inputRule": ""
@@ -1865,6 +1923,7 @@
             "isRequiredProperty": false,
             "widgetLabel": "Name",
             "widgetDropdownUrl": "",
+            "widgetDropdownControllerUrl": "",
             "dataTypeJava": "string",
             "dataTypeTypescript": "string",
             "minLength": 0,
@@ -1892,6 +1951,7 @@
             "isRequiredProperty": false,
             "widgetLabel": "UUID",
             "widgetDropdownUrl": "",
+            "widgetDropdownControllerUrl": "",
             "dataTypeJava": "string",
             "dataTypeTypescript": "string",
             "minLength": 0,
@@ -1918,6 +1978,7 @@
             "isRequiredProperty": false,
             "widgetLabel": "Process",
             "widgetDropdownUrl": "",
+            "widgetDropdownControllerUrl": "",
             "dataTypeJava": "string",
             "dataTypeTypescript": "string",
             "minLength": 0,
@@ -1944,6 +2005,7 @@
             "isCalculatedProperty": false,
             "widgetLabel": "Reference",
             "widgetDropdownUrl": "",
+            "widgetDropdownControllerUrl": "",
             "dataTypeJava": "string",
             "dataTypeTypescript": "string",
             "minLength": 0,
@@ -1976,6 +2038,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Id",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -2002,6 +2065,7 @@
           "isRequiredProperty": false,
           "widgetLabel": "Number",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -2028,6 +2092,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "OriginalNumber",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -2059,6 +2124,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Type",
           "widgetDropdownUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Settings/PurchaseInvoiceTypeService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Settings/PurchaseInvoiceTypeController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -2082,6 +2148,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Date",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "date",
           "dataTypeTypescript": "Date",
           "isDateType": true,
@@ -2106,6 +2173,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Due",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "date",
           "dataTypeTypescript": "Date",
           "isDateType": true,
@@ -2136,6 +2204,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Supplier",
           "widgetDropdownUrl": "/services/ts/codbex-partners/gen/codbex-partners/api/Suppliers/SupplierService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-partners/gen/codbex-partners/api/Suppliers/SupplierController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -2162,6 +2231,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Net",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "double",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -2191,6 +2261,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Currency",
           "widgetDropdownUrl": "/services/ts/codbex-currencies/gen/codbex-currencies/api/Settings/CurrencyService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-currencies/gen/codbex-currencies/api/Settings/CurrencyController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -2217,6 +2288,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Gross",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "double",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -2244,6 +2316,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Discount",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "double",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -2271,6 +2344,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Taxes",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "double",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -2297,6 +2371,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "VAT",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "double",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -2324,6 +2399,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Total",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "double",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -2351,6 +2427,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Paid",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "double",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -2375,6 +2452,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Conditions",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -2406,6 +2484,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "PaymentMethod",
           "widgetDropdownUrl": "/services/ts/codbex-methods/gen/codbex-methods/api/Settings/PaymentMethodService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-methods/gen/codbex-methods/api/Settings/PaymentMethodController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -2435,6 +2514,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "SentMethod",
           "widgetDropdownUrl": "/services/ts/codbex-methods/gen/codbex-methods/api/Settings/SentMethodService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-methods/gen/codbex-methods/api/Settings/SentMethodController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -2464,6 +2544,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Status",
           "widgetDropdownUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Settings/PurchaseInvoiceStatusService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Settings/PurchaseInvoiceStatusController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -2493,6 +2574,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Operator",
           "widgetDropdownUrl": "/services/ts/codbex-employees/gen/codbex-employees/api/Employees/EmployeeService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-employees/gen/codbex-employees/api/Employees/EmployeeController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -2517,6 +2599,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Document",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -2548,6 +2631,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Company",
           "widgetDropdownUrl": "/services/ts/codbex-companies/gen/codbex-companies/api/Companies/CompanyService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-companies/gen/codbex-companies/api/Companies/CompanyController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -2573,6 +2657,7 @@
           "isRequiredProperty": false,
           "widgetLabel": "Name",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -2600,6 +2685,7 @@
           "isRequiredProperty": false,
           "widgetLabel": "UUID",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -2626,6 +2712,7 @@
           "isRequiredProperty": false,
           "widgetLabel": "Process",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -2652,6 +2739,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Reference",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -2672,6 +2760,7 @@
       "menuIndex": "100",
       "menuKey": "purchaseinvoice",
       "menuLabel": "PurchaseInvoice",
+      "multilingual": "false",
       "name": "PurchaseInvoice",
       "perspectiveHeader": "",
       "perspectiveIcon": "/services/web/resources/unicons/receipt.svg",
@@ -2747,6 +2836,7 @@
           "isRequiredProperty": false,
           "widgetLabel": "Number",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -2774,6 +2864,7 @@
             "isCalculatedProperty": false,
             "widgetLabel": "OriginalNumber",
             "widgetDropdownUrl": "",
+            "widgetDropdownControllerUrl": "",
             "dataTypeJava": "string",
             "dataTypeTypescript": "string",
             "minLength": 0,
@@ -2805,6 +2896,7 @@
             "isCalculatedProperty": false,
             "widgetLabel": "Type",
             "widgetDropdownUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Settings/PurchaseInvoiceTypeService.ts",
+            "widgetDropdownControllerUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Settings/PurchaseInvoiceTypeController.ts",
             "dataTypeJava": "int",
             "dataTypeTypescript": "number",
             "inputRule": ""
@@ -2828,6 +2920,7 @@
             "isCalculatedProperty": false,
             "widgetLabel": "Date",
             "widgetDropdownUrl": "",
+            "widgetDropdownControllerUrl": "",
             "dataTypeJava": "date",
             "dataTypeTypescript": "Date",
             "isDateType": true,
@@ -2852,6 +2945,7 @@
             "isCalculatedProperty": false,
             "widgetLabel": "Due",
             "widgetDropdownUrl": "",
+            "widgetDropdownControllerUrl": "",
             "dataTypeJava": "date",
             "dataTypeTypescript": "Date",
             "isDateType": true,
@@ -2882,6 +2976,7 @@
             "isCalculatedProperty": false,
             "widgetLabel": "Supplier",
             "widgetDropdownUrl": "/services/ts/codbex-partners/gen/codbex-partners/api/Suppliers/SupplierService.ts",
+            "widgetDropdownControllerUrl": "/services/ts/codbex-partners/gen/codbex-partners/api/Suppliers/SupplierController.ts",
             "dataTypeJava": "int",
             "dataTypeTypescript": "number",
             "inputRule": ""
@@ -2908,6 +3003,7 @@
             "isCalculatedProperty": false,
             "widgetLabel": "Net",
             "widgetDropdownUrl": "",
+            "widgetDropdownControllerUrl": "",
             "dataTypeJava": "double",
             "dataTypeTypescript": "number",
             "inputRule": ""
@@ -2937,6 +3033,7 @@
             "isCalculatedProperty": false,
             "widgetLabel": "Currency",
             "widgetDropdownUrl": "/services/ts/codbex-currencies/gen/codbex-currencies/api/Settings/CurrencyService.ts",
+            "widgetDropdownControllerUrl": "/services/ts/codbex-currencies/gen/codbex-currencies/api/Settings/CurrencyController.ts",
             "dataTypeJava": "int",
             "dataTypeTypescript": "number",
             "inputRule": ""
@@ -2963,6 +3060,7 @@
             "isCalculatedProperty": false,
             "widgetLabel": "Gross",
             "widgetDropdownUrl": "",
+            "widgetDropdownControllerUrl": "",
             "dataTypeJava": "double",
             "dataTypeTypescript": "number",
             "inputRule": ""
@@ -2990,6 +3088,7 @@
             "isCalculatedProperty": false,
             "widgetLabel": "Discount",
             "widgetDropdownUrl": "",
+            "widgetDropdownControllerUrl": "",
             "dataTypeJava": "double",
             "dataTypeTypescript": "number",
             "inputRule": ""
@@ -3017,6 +3116,7 @@
             "isCalculatedProperty": false,
             "widgetLabel": "Taxes",
             "widgetDropdownUrl": "",
+            "widgetDropdownControllerUrl": "",
             "dataTypeJava": "double",
             "dataTypeTypescript": "number",
             "inputRule": ""
@@ -3043,6 +3143,7 @@
             "isCalculatedProperty": false,
             "widgetLabel": "VAT",
             "widgetDropdownUrl": "",
+            "widgetDropdownControllerUrl": "",
             "dataTypeJava": "double",
             "dataTypeTypescript": "number",
             "inputRule": ""
@@ -3070,6 +3171,7 @@
             "isCalculatedProperty": false,
             "widgetLabel": "Total",
             "widgetDropdownUrl": "",
+            "widgetDropdownControllerUrl": "",
             "dataTypeJava": "double",
             "dataTypeTypescript": "number",
             "inputRule": ""
@@ -3097,6 +3199,7 @@
             "isCalculatedProperty": false,
             "widgetLabel": "Paid",
             "widgetDropdownUrl": "",
+            "widgetDropdownControllerUrl": "",
             "dataTypeJava": "double",
             "dataTypeTypescript": "number",
             "inputRule": ""
@@ -3121,6 +3224,7 @@
             "isCalculatedProperty": false,
             "widgetLabel": "Conditions",
             "widgetDropdownUrl": "",
+            "widgetDropdownControllerUrl": "",
             "dataTypeJava": "string",
             "dataTypeTypescript": "string",
             "minLength": 0,
@@ -3152,6 +3256,7 @@
             "isCalculatedProperty": false,
             "widgetLabel": "PaymentMethod",
             "widgetDropdownUrl": "/services/ts/codbex-methods/gen/codbex-methods/api/Settings/PaymentMethodService.ts",
+            "widgetDropdownControllerUrl": "/services/ts/codbex-methods/gen/codbex-methods/api/Settings/PaymentMethodController.ts",
             "dataTypeJava": "int",
             "dataTypeTypescript": "number",
             "inputRule": ""
@@ -3181,6 +3286,7 @@
             "isCalculatedProperty": false,
             "widgetLabel": "SentMethod",
             "widgetDropdownUrl": "/services/ts/codbex-methods/gen/codbex-methods/api/Settings/SentMethodService.ts",
+            "widgetDropdownControllerUrl": "/services/ts/codbex-methods/gen/codbex-methods/api/Settings/SentMethodController.ts",
             "dataTypeJava": "int",
             "dataTypeTypescript": "number",
             "inputRule": ""
@@ -3210,6 +3316,7 @@
             "isCalculatedProperty": false,
             "widgetLabel": "Status",
             "widgetDropdownUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Settings/PurchaseInvoiceStatusService.ts",
+            "widgetDropdownControllerUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Settings/PurchaseInvoiceStatusController.ts",
             "dataTypeJava": "int",
             "dataTypeTypescript": "number",
             "inputRule": ""
@@ -3239,6 +3346,7 @@
             "isCalculatedProperty": false,
             "widgetLabel": "Operator",
             "widgetDropdownUrl": "/services/ts/codbex-employees/gen/codbex-employees/api/Employees/EmployeeService.ts",
+            "widgetDropdownControllerUrl": "/services/ts/codbex-employees/gen/codbex-employees/api/Employees/EmployeeController.ts",
             "dataTypeJava": "int",
             "dataTypeTypescript": "number",
             "inputRule": ""
@@ -3263,6 +3371,7 @@
             "isCalculatedProperty": false,
             "widgetLabel": "Document",
             "widgetDropdownUrl": "",
+            "widgetDropdownControllerUrl": "",
             "dataTypeJava": "string",
             "dataTypeTypescript": "string",
             "minLength": 0,
@@ -3294,6 +3403,7 @@
             "isCalculatedProperty": false,
             "widgetLabel": "Company",
             "widgetDropdownUrl": "/services/ts/codbex-companies/gen/codbex-companies/api/Companies/CompanyService.ts",
+            "widgetDropdownControllerUrl": "/services/ts/codbex-companies/gen/codbex-companies/api/Companies/CompanyController.ts",
             "dataTypeJava": "int",
             "dataTypeTypescript": "number",
             "inputRule": ""
@@ -3319,6 +3429,7 @@
             "isRequiredProperty": false,
             "widgetLabel": "Name",
             "widgetDropdownUrl": "",
+            "widgetDropdownControllerUrl": "",
             "dataTypeJava": "string",
             "dataTypeTypescript": "string",
             "minLength": 0,
@@ -3346,6 +3457,7 @@
             "isRequiredProperty": false,
             "widgetLabel": "UUID",
             "widgetDropdownUrl": "",
+            "widgetDropdownControllerUrl": "",
             "dataTypeJava": "string",
             "dataTypeTypescript": "string",
             "minLength": 0,
@@ -3372,6 +3484,7 @@
             "isRequiredProperty": false,
             "widgetLabel": "Process",
             "widgetDropdownUrl": "",
+            "widgetDropdownControllerUrl": "",
             "dataTypeJava": "string",
             "dataTypeTypescript": "string",
             "minLength": 0,
@@ -3398,6 +3511,7 @@
             "isCalculatedProperty": false,
             "widgetLabel": "Reference",
             "widgetDropdownUrl": "",
+            "widgetDropdownControllerUrl": "",
             "dataTypeJava": "string",
             "dataTypeTypescript": "string",
             "minLength": 0,
@@ -3430,6 +3544,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Id",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -3461,6 +3576,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "PurchaseInvoice",
           "widgetDropdownUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/PurchaseInvoice/PurchaseInvoiceService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/PurchaseInvoice/PurchaseInvoiceController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -3485,6 +3601,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Name",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -3510,6 +3627,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Quantity",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "double",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -3539,6 +3657,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "UoM",
           "widgetDropdownUrl": "/services/ts/codbex-uoms/gen/codbex-uoms/api/Settings/UoMService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-uoms/gen/codbex-uoms/api/Settings/UoMController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -3565,6 +3684,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Price",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "double",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -3593,6 +3713,7 @@
           "isRequiredProperty": false,
           "widgetLabel": "Net",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "double",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -3619,6 +3740,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "VATRate",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "double",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -3647,6 +3769,7 @@
           "isRequiredProperty": false,
           "widgetLabel": "VAT",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "double",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -3675,6 +3798,7 @@
           "isRequiredProperty": false,
           "widgetLabel": "Gross",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "double",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -3692,6 +3816,7 @@
       "menuIndex": "100",
       "menuKey": "purchaseinvoiceitem",
       "menuLabel": "PurchaseInvoiceItem",
+      "multilingual": "false",
       "name": "PurchaseInvoiceItem",
       "perspectiveHeader": "",
       "perspectiveIcon": "/services/web/resources/unicons/receipt.svg",
@@ -3742,6 +3867,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Id",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -3766,6 +3892,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Name",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -3786,6 +3913,7 @@
       "menuIndex": "100",
       "menuKey": "salesinvoicestatus",
       "menuLabel": "SalesInvoiceStatus",
+      "multilingual": "false",
       "name": "SalesInvoiceStatus",
       "perspectiveHeader": "",
       "perspectiveIcon": "/services/web/resources/unicons/copy.svg",
@@ -3826,6 +3954,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Id",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -3850,6 +3979,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Name",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -3870,6 +4000,7 @@
       "menuIndex": "100",
       "menuKey": "purchaseinvoicestatus",
       "menuLabel": "PurchaseInvoiceStatus",
+      "multilingual": "false",
       "name": "PurchaseInvoiceStatus",
       "perspectiveHeader": "",
       "perspectiveIcon": "/services/web/resources/unicons/copy.svg",
@@ -3912,6 +4043,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Id",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -3938,6 +4070,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Name",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -3966,6 +4099,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Address",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -3994,6 +4128,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "PostalCode",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -4022,6 +4157,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Email",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -4050,6 +4186,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Phone",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -4078,6 +4215,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Fax",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -4109,6 +4247,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "City",
           "widgetDropdownUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Cities/undefinedService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Cities/undefinedController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -4138,6 +4277,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Country",
           "widgetDropdownUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/entities/undefinedService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/entities/undefinedController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -4164,6 +4304,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "TIN",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -4192,6 +4333,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "IBAN",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -4211,6 +4353,7 @@
       "menuIndex": "100",
       "menuKey": "customer",
       "menuLabel": "Customer",
+      "multilingual": "false",
       "name": "Customer",
       "perspectiveHeader": "",
       "perspectiveIcon": "/services/web/resources/unicons/user-plus.svg",
@@ -4255,6 +4398,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Id",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -4281,6 +4425,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Name",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -4309,6 +4454,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Address",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -4337,6 +4483,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "PostalCode",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -4365,6 +4512,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Email",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -4393,6 +4541,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Phone",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -4421,6 +4570,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Fax",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -4452,6 +4602,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "City",
           "widgetDropdownUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Cities/undefinedService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Cities/undefinedController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -4481,6 +4632,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Country",
           "widgetDropdownUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/entities/undefinedService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/entities/undefinedController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -4507,6 +4659,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "TIN",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -4535,6 +4688,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "IBAN",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -4554,6 +4708,7 @@
       "menuIndex": "100",
       "menuKey": "supplier",
       "menuLabel": "Supplier",
+      "multilingual": "false",
       "name": "Supplier",
       "perspectiveHeader": "",
       "perspectiveIcon": "/services/web/resources/unicons/user-minus.svg",
@@ -4598,6 +4753,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Id",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -4624,6 +4780,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Name",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -4652,6 +4809,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Manager",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -4680,6 +4838,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Email",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -4708,6 +4867,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Phone",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -4736,6 +4896,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Address",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -4764,6 +4925,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "PostCode",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -4795,6 +4957,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "City",
           "widgetDropdownUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Cities/undefinedService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Cities/undefinedController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -4824,6 +4987,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Country",
           "widgetDropdownUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Countries/undefinedService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Countries/undefinedController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -4850,6 +5014,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "TIN",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -4878,6 +5043,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "IBAN",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -4897,6 +5063,7 @@
       "menuIndex": "100",
       "menuKey": "company",
       "menuLabel": "Company",
+      "multilingual": "false",
       "name": "Company",
       "perspectiveHeader": "",
       "perspectiveIcon": "/services/web/resources/unicons/university.svg",
@@ -4941,6 +5108,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Id",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -4967,6 +5135,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Code",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -4995,6 +5164,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Name",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -5023,6 +5193,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Numeric",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -5050,6 +5221,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Rounding",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -5075,6 +5247,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Base",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "boolean",
           "dataTypeTypescript": "boolean",
           "inputRule": ""
@@ -5100,6 +5273,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Rate",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "double",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -5117,6 +5291,7 @@
       "menuIndex": "100",
       "menuKey": "currency",
       "menuLabel": "Currency",
+      "multilingual": "false",
       "name": "Currency",
       "perspectiveHeader": "",
       "perspectiveIcon": "/services/web/resources/unicons/dollar-alt.svg",
@@ -5160,6 +5335,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Id",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -5187,6 +5363,7 @@
           "isRequiredProperty": false,
           "isCalculatedProperty": false,
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -5216,6 +5393,7 @@
           "isRequiredProperty": false,
           "isCalculatedProperty": false,
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -5245,6 +5423,7 @@
           "isRequiredProperty": false,
           "isCalculatedProperty": false,
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -5274,6 +5453,7 @@
           "isRequiredProperty": false,
           "isCalculatedProperty": false,
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -5303,6 +5483,7 @@
           "isRequiredProperty": false,
           "isCalculatedProperty": false,
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -5335,6 +5516,7 @@
           "isRequiredProperty": false,
           "isCalculatedProperty": false,
           "widgetDropdownUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Organisations/undefinedService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Organisations/undefinedController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -5361,6 +5543,7 @@
           "isRequiredProperty": false,
           "widgetLabel": "Name",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -5380,6 +5563,7 @@
       "menuIndex": "100",
       "menuKey": "employee",
       "menuLabel": "Employee",
+      "multilingual": "false",
       "name": "Employee",
       "perspectiveHeader": "",
       "perspectiveIcon": "/services/web/resources/unicons/users-alt.svg",
@@ -5422,6 +5606,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Id",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -5453,6 +5638,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "SalesInvoice",
           "widgetDropdownUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/SalesInvoice/SalesInvoiceService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/SalesInvoice/SalesInvoiceController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -5482,6 +5668,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "CustomerPayment",
           "widgetDropdownUrl": "/services/ts/codbex-payments/gen/codbex-payments/api/CustomerPayment/CustomerPaymentService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-payments/gen/codbex-payments/api/CustomerPayment/CustomerPaymentController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -5511,6 +5698,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Amount",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "double",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -5528,6 +5716,7 @@
       "menuIndex": "100",
       "menuKey": "salesinvoicepayment",
       "menuLabel": "SalesInvoicePayment",
+      "multilingual": "false",
       "name": "SalesInvoicePayment",
       "perspectiveHeader": "",
       "perspectiveIcon": "/services/web/resources/unicons/invoice.svg",
@@ -5578,6 +5767,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Id",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -5609,6 +5799,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "PurchaseInvoice",
           "widgetDropdownUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/PurchaseInvoice/PurchaseInvoiceService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/PurchaseInvoice/PurchaseInvoiceController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -5638,6 +5829,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "SupplierPayment",
           "widgetDropdownUrl": "/services/ts/codbex-payments/gen/codbex-payments/api/SupplierPayment/SupplierPaymentService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-payments/gen/codbex-payments/api/SupplierPayment/SupplierPaymentController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -5667,6 +5859,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Amount",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "double",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -5684,6 +5877,7 @@
       "menuIndex": "100",
       "menuKey": "purchaseinvoicepayment",
       "menuLabel": "PurchaseInvoicePayment",
+      "multilingual": "false",
       "name": "PurchaseInvoicePayment",
       "perspectiveHeader": "",
       "perspectiveIcon": "/services/web/resources/unicons/receipt.svg",
@@ -5736,6 +5930,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Id",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -5762,6 +5957,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Name",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -5790,6 +5986,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "ISO",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -5818,6 +6015,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "SAP",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -5848,6 +6046,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Dimension",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -5875,6 +6074,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Numerator",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "long",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -5900,6 +6100,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Denominator",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "long",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -5925,6 +6126,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Rounding",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -5950,6 +6152,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Base",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "boolean",
           "dataTypeTypescript": "boolean",
           "inputRule": ""
@@ -5967,6 +6170,7 @@
       "menuIndex": "100",
       "menuKey": "uom",
       "menuLabel": "UoM",
+      "multilingual": "false",
       "name": "UoM",
       "perspectiveHeader": "",
       "perspectiveIcon": "/services/web/resources/unicons/arrows-resize-v.svg",
@@ -6008,6 +6212,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Id",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -6032,6 +6237,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Name",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -6057,6 +6263,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Direction",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -6075,6 +6282,7 @@
       "menuIndex": "100",
       "menuKey": "salesinvoicetype",
       "menuLabel": "SalesInvoiceType",
+      "multilingual": "false",
       "name": "SalesInvoiceType",
       "perspectiveHeader": "",
       "perspectiveIcon": "/services/web/resources/unicons/copy.svg",
@@ -6115,6 +6323,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Id",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -6141,6 +6350,7 @@
           "isRequiredProperty": false,
           "widgetLabel": "Number",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -6166,6 +6376,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Date",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "date",
           "dataTypeTypescript": "Date",
           "isDateType": true,
@@ -6190,6 +6401,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Due",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "date",
           "dataTypeTypescript": "Date",
           "isDateType": true,
@@ -6219,6 +6431,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Customer",
           "widgetDropdownUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Customers/undefinedService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Customers/undefinedController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -6245,6 +6458,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Net",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "double",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -6273,6 +6487,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Currency",
           "widgetDropdownUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Settings/undefinedService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Settings/undefinedController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -6299,6 +6514,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Gross",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "double",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -6325,6 +6541,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Discount",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "double",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -6352,6 +6569,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Taxes",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "double",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -6378,6 +6596,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "VAT",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "double",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -6404,6 +6623,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Total",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "double",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -6431,6 +6651,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Paid",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "double",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -6455,6 +6676,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Conditions",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -6485,6 +6707,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "SentMethod",
           "widgetDropdownUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Methods/undefinedService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Methods/undefinedController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -6513,6 +6736,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "SalesOrderStatus",
           "widgetDropdownUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/OrdersSettings/undefinedService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/OrdersSettings/undefinedController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -6541,6 +6765,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Operator",
           "widgetDropdownUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Employees/undefinedService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Employees/undefinedController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -6569,6 +6794,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Company",
           "widgetDropdownUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Companies/undefinedService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Companies/undefinedController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -6594,6 +6820,7 @@
           "isRequiredProperty": false,
           "widgetLabel": "Name",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -6621,6 +6848,7 @@
           "isRequiredProperty": false,
           "widgetLabel": "UUID",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -6647,6 +6875,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Reference",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -6677,6 +6906,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Store",
           "widgetDropdownUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Stores/undefinedService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Stores/undefinedController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -6694,6 +6924,7 @@
       "menuIndex": "100",
       "menuKey": "salesorder",
       "menuLabel": "SalesOrder",
+      "multilingual": "false",
       "name": "SalesOrder",
       "perspectiveHeader": "",
       "perspectiveIcon": "/services/web/resources/unicons/receipt.svg",
@@ -6739,6 +6970,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Id",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -6770,6 +7002,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "DeductionInvoice",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -6799,6 +7032,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "AdvanceInvoice",
           "widgetDropdownUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/SalesInvoice/SalesInvoiceService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/SalesInvoice/SalesInvoiceController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -6816,6 +7050,7 @@
       "menuIndex": "100",
       "menuKey": "deduction",
       "menuLabel": "Deduction",
+      "multilingual": "false",
       "name": "Deduction",
       "perspectiveHeader": "",
       "perspectiveIcon": "/services/web/resources/unicons/invoice.svg",
@@ -6860,6 +7095,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Id",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -6884,6 +7120,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Name",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -6909,6 +7146,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Direction",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -6927,6 +7165,7 @@
       "menuIndex": "100",
       "menuKey": "purchaseinvoicetype",
       "menuLabel": "PurchaseInvoiceType",
+      "multilingual": "false",
       "name": "PurchaseInvoiceType",
       "perspectiveHeader": "",
       "perspectiveIcon": "/services/web/resources/unicons/copy.svg",
@@ -6967,6 +7206,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Id",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -6991,6 +7231,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Name",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -7010,6 +7251,7 @@
       "menuIndex": "100",
       "menuKey": "paymentmethod",
       "menuLabel": "PaymentMethod",
+      "multilingual": "false",
       "name": "PaymentMethod",
       "perspectiveHeader": "",
       "perspectiveIcon": "/services/web/resources/unicons/archive.svg",
@@ -7051,6 +7293,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Id",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -7075,6 +7318,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Name",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -7094,6 +7338,7 @@
       "menuIndex": "100",
       "menuKey": "sentmethod",
       "menuLabel": "SentMethod",
+      "multilingual": "false",
       "name": "SentMethod",
       "perspectiveHeader": "",
       "perspectiveIcon": "/services/web/resources/unicons/archive.svg",
@@ -7135,6 +7380,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Id",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -7163,6 +7409,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Customer",
           "widgetDropdownUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Customers/undefinedService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Customers/undefinedController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -7187,6 +7434,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Date",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "date",
           "dataTypeTypescript": "Date",
           "isDateType": true,
@@ -7211,6 +7459,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Valor",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "date",
           "dataTypeTypescript": "Date",
           "isDateType": true,
@@ -7236,6 +7485,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "CompanyIBAN",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -7262,6 +7512,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "CounterpartyIBAN",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -7288,6 +7539,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "CounterpartyName",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -7316,6 +7568,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Amount",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "double",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -7344,6 +7597,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Currency",
           "widgetDropdownUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Settings/undefinedService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Settings/undefinedController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -7368,6 +7622,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Reason",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -7394,6 +7649,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Description",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -7424,6 +7680,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Company",
           "widgetDropdownUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Companies/undefinedService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Companies/undefinedController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -7449,6 +7706,7 @@
           "isRequiredProperty": false,
           "widgetLabel": "Name",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -7476,6 +7734,7 @@
           "isRequiredProperty": false,
           "widgetLabel": "UUID",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -7502,6 +7761,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Reference",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -7532,6 +7792,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "PaymentMethod",
           "widgetDropdownUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Methods/undefinedService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Methods/undefinedController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -7549,6 +7810,7 @@
       "menuIndex": "100",
       "menuKey": "customerpayment",
       "menuLabel": "CustomerPayment",
+      "multilingual": "false",
       "name": "CustomerPayment",
       "perspectiveHeader": "",
       "perspectiveIcon": "/services/web/resources/unicons/usd-square.svg",
@@ -7594,6 +7856,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Id",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -7622,6 +7885,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Supplier",
           "widgetDropdownUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Suppliers/undefinedService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Suppliers/undefinedController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -7646,6 +7910,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Date",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "date",
           "dataTypeTypescript": "Date",
           "isDateType": true,
@@ -7670,6 +7935,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Valor",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "date",
           "dataTypeTypescript": "Date",
           "isDateType": true,
@@ -7695,6 +7961,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "CompanyIBAN",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -7721,6 +7988,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "CounterpartyIBAN",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -7747,6 +8015,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "CounterpartyName",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -7775,6 +8044,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Amount",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "double",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -7803,6 +8073,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Currency",
           "widgetDropdownUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Settings/undefinedService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Settings/undefinedController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -7827,6 +8098,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Reason",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -7853,6 +8125,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Description",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -7883,6 +8156,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Company",
           "widgetDropdownUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Companies/undefinedService.ts",
+          "widgetDropdownControllerUrl": "/services/ts/codbex-invoices/gen/codbex-invoices/api/Companies/undefinedController.ts",
           "dataTypeJava": "int",
           "dataTypeTypescript": "number",
           "inputRule": ""
@@ -7908,6 +8182,7 @@
           "isRequiredProperty": false,
           "widgetLabel": "Name",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -7935,6 +8210,7 @@
           "isRequiredProperty": false,
           "widgetLabel": "UUID",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -7961,6 +8237,7 @@
           "isCalculatedProperty": false,
           "widgetLabel": "Reference",
           "widgetDropdownUrl": "",
+          "widgetDropdownControllerUrl": "",
           "dataTypeJava": "string",
           "dataTypeTypescript": "string",
           "minLength": 0,
@@ -7980,6 +8257,7 @@
       "menuIndex": "100",
       "menuKey": "supplierpayment",
       "menuLabel": "SupplierPayment",
+      "multilingual": "false",
       "name": "SupplierPayment",
       "perspectiveHeader": "",
       "perspectiveIcon": "/services/web/resources/unicons/box.svg",
diff --git a/codbex-invoices/codbex-invoices.model b/codbex-invoices/codbex-invoices.model
index 12ade34..adfd947 100644
--- a/codbex-invoices/codbex-invoices.model
+++ b/codbex-invoices/codbex-invoices.model
@@ -182,6 +182,7 @@
                 "menuIndex": "100",
                 "menuKey": "salesinvoiceitem",
                 "menuLabel": "SalesInvoiceItem",
+                "multilingual": "false",
                 "name": "SalesInvoiceItem",
                 "perspectiveHeader": "",
                 "perspectiveIcon": "/services/web/resources/unicons/invoice.svg",
@@ -609,6 +610,7 @@
                 "menuIndex": "100",
                 "menuKey": "salesinvoice",
                 "menuLabel": "SalesInvoice",
+                "multilingual": "false",
                 "name": "SalesInvoice",
                 "perspectiveHeader": "",
                 "perspectiveIcon": "/services/web/resources/unicons/invoice.svg",
@@ -1050,6 +1052,7 @@
                 "menuIndex": "100",
                 "menuKey": "purchaseinvoice",
                 "menuLabel": "PurchaseInvoice",
+                "multilingual": "false",
                 "name": "PurchaseInvoice",
                 "perspectiveHeader": "",
                 "perspectiveIcon": "/services/web/resources/unicons/receipt.svg",
@@ -1244,6 +1247,7 @@
                 "menuIndex": "100",
                 "menuKey": "purchaseinvoiceitem",
                 "menuLabel": "PurchaseInvoiceItem",
+                "multilingual": "false",
                 "name": "PurchaseInvoiceItem",
                 "perspectiveHeader": "",
                 "perspectiveIcon": "/services/web/resources/unicons/receipt.svg",
@@ -1302,6 +1306,7 @@
                 "menuIndex": "100",
                 "menuKey": "salesinvoicestatus",
                 "menuLabel": "SalesInvoiceStatus",
+                "multilingual": "false",
                 "name": "SalesInvoiceStatus",
                 "perspectiveHeader": "",
                 "perspectiveIcon": "/services/web/resources/unicons/copy.svg",
@@ -1360,6 +1365,7 @@
                 "menuIndex": "100",
                 "menuKey": "purchaseinvoicestatus",
                 "menuLabel": "PurchaseInvoiceStatus",
+                "multilingual": "false",
                 "name": "PurchaseInvoiceStatus",
                 "perspectiveHeader": "",
                 "perspectiveIcon": "/services/web/resources/unicons/copy.svg",
@@ -1561,6 +1567,7 @@
                 "menuIndex": "100",
                 "menuKey": "customer",
                 "menuLabel": "Customer",
+                "multilingual": "false",
                 "name": "Customer",
                 "perspectiveHeader": "",
                 "perspectiveIcon": "/services/web/resources/unicons/user-plus.svg",
@@ -1762,6 +1769,7 @@
                 "menuIndex": "100",
                 "menuKey": "supplier",
                 "menuLabel": "Supplier",
+                "multilingual": "false",
                 "name": "Supplier",
                 "perspectiveHeader": "",
                 "perspectiveIcon": "/services/web/resources/unicons/user-minus.svg",
@@ -1963,6 +1971,7 @@
                 "menuIndex": "100",
                 "menuKey": "company",
                 "menuLabel": "Company",
+                "multilingual": "false",
                 "name": "Company",
                 "perspectiveHeader": "",
                 "perspectiveIcon": "/services/web/resources/unicons/university.svg",
@@ -2095,6 +2104,7 @@
                 "menuIndex": "100",
                 "menuKey": "currency",
                 "menuLabel": "Currency",
+                "multilingual": "false",
                 "name": "Currency",
                 "perspectiveHeader": "",
                 "perspectiveIcon": "/services/web/resources/unicons/dollar-alt.svg",
@@ -2261,6 +2271,7 @@
                 "menuIndex": "100",
                 "menuKey": "employee",
                 "menuLabel": "Employee",
+                "multilingual": "false",
                 "name": "Employee",
                 "perspectiveHeader": "",
                 "perspectiveIcon": "/services/web/resources/unicons/users-alt.svg",
@@ -2361,6 +2372,7 @@
                 "menuIndex": "100",
                 "menuKey": "salesinvoicepayment",
                 "menuLabel": "SalesInvoicePayment",
+                "multilingual": "false",
                 "name": "SalesInvoicePayment",
                 "perspectiveHeader": "",
                 "perspectiveIcon": "/services/web/resources/unicons/invoice.svg",
@@ -2461,6 +2473,7 @@
                 "menuIndex": "100",
                 "menuKey": "purchaseinvoicepayment",
                 "menuLabel": "PurchaseInvoicePayment",
+                "multilingual": "false",
                 "name": "PurchaseInvoicePayment",
                 "perspectiveHeader": "",
                 "perspectiveIcon": "/services/web/resources/unicons/receipt.svg",
@@ -2624,6 +2637,7 @@
                 "menuIndex": "100",
                 "menuKey": "uom",
                 "menuLabel": "UoM",
+                "multilingual": "false",
                 "name": "UoM",
                 "perspectiveHeader": "",
                 "perspectiveIcon": "/services/web/resources/unicons/arrows-resize-v.svg",
@@ -2696,6 +2710,7 @@
                 "menuIndex": "100",
                 "menuKey": "salesinvoicetype",
                 "menuLabel": "SalesInvoiceType",
+                "multilingual": "false",
                 "name": "SalesInvoiceType",
                 "perspectiveHeader": "",
                 "perspectiveIcon": "/services/web/resources/unicons/copy.svg",
@@ -3070,6 +3085,7 @@
                 "menuIndex": "100",
                 "menuKey": "salesorder",
                 "menuLabel": "SalesOrder",
+                "multilingual": "false",
                 "name": "SalesOrder",
                 "perspectiveHeader": "",
                 "perspectiveIcon": "/services/web/resources/unicons/receipt.svg",
@@ -3151,6 +3167,7 @@
                 "menuIndex": "100",
                 "menuKey": "deduction",
                 "menuLabel": "Deduction",
+                "multilingual": "false",
                 "name": "Deduction",
                 "perspectiveHeader": "",
                 "perspectiveIcon": "/services/web/resources/unicons/invoice.svg",
@@ -3223,6 +3240,7 @@
                 "menuIndex": "100",
                 "menuKey": "purchaseinvoicetype",
                 "menuLabel": "PurchaseInvoiceType",
+                "multilingual": "false",
                 "name": "PurchaseInvoiceType",
                 "perspectiveHeader": "",
                 "perspectiveIcon": "/services/web/resources/unicons/copy.svg",
@@ -3279,6 +3297,7 @@
                 "menuIndex": "100",
                 "menuKey": "paymentmethod",
                 "menuLabel": "PaymentMethod",
+                "multilingual": "false",
                 "name": "PaymentMethod",
                 "perspectiveHeader": "",
                 "perspectiveIcon": "/services/web/resources/unicons/archive.svg",
@@ -3335,6 +3354,7 @@
                 "menuIndex": "100",
                 "menuKey": "sentmethod",
                 "menuLabel": "SentMethod",
+                "multilingual": "false",
                 "name": "SentMethod",
                 "perspectiveHeader": "",
                 "perspectiveIcon": "/services/web/resources/unicons/archive.svg",
@@ -3601,6 +3621,7 @@
                 "menuIndex": "100",
                 "menuKey": "customerpayment",
                 "menuLabel": "CustomerPayment",
+                "multilingual": "false",
                 "name": "CustomerPayment",
                 "perspectiveHeader": "",
                 "perspectiveIcon": "/services/web/resources/unicons/usd-square.svg",
@@ -3849,6 +3870,7 @@
                 "menuIndex": "100",
                 "menuKey": "supplierpayment",
                 "menuLabel": "SupplierPayment",
+                "multilingual": "false",
                 "name": "SupplierPayment",
                 "perspectiveHeader": "",
                 "perspectiveIcon": "/services/web/resources/unicons/box.svg",
diff --git a/codbex-invoices/gen/codbex-invoices/api/CustomerPayment/CustomerPaymentService.ts b/codbex-invoices/gen/codbex-invoices/api/CustomerPayment/CustomerPaymentService.ts
index 9d053d2..98d06de 100644
--- a/codbex-invoices/gen/codbex-invoices/api/CustomerPayment/CustomerPaymentService.ts
+++ b/codbex-invoices/gen/codbex-invoices/api/CustomerPayment/CustomerPaymentService.ts
@@ -1,5 +1,5 @@
-import { Controller, Get, Post, Put, Delete, response } from "sdk/http"
-import { Extensions } from "sdk/extensions"
+import { Controller, Get, Post, Put, Delete, request, response } from "@aerokit/sdk/http"
+import { Extensions } from "@aerokit/sdk/extensions"
 import { CustomerPaymentRepository, CustomerPaymentEntityOptions } from "../../dao/CustomerPayment/CustomerPaymentRepository";
 import { ValidationError } from "../utils/ValidationError";
 import { HttpUtils } from "../utils/HttpUtils";
@@ -16,7 +16,8 @@ class CustomerPaymentService {
         try {
             const options: CustomerPaymentEntityOptions = {
                 $limit: ctx.queryParameters["$limit"] ? parseInt(ctx.queryParameters["$limit"]) : undefined,
-                $offset: ctx.queryParameters["$offset"] ? parseInt(ctx.queryParameters["$offset"]) : undefined
+                $offset: ctx.queryParameters["$offset"] ? parseInt(ctx.queryParameters["$offset"]) : undefined,
+                $language: request.getLocale().slice(0, 2)
             };
 
             return this.repository.findAll(options);
@@ -69,7 +70,10 @@ class CustomerPaymentService {
     public getById(_: any, ctx: any) {
         try {
             const id = parseInt(ctx.pathParameters.id);
-            const entity = this.repository.findById(id);
+            const options: CustomerPaymentEntityOptions = {
+                $language: request.getLocale().slice(0, 2)
+            };
+            const entity = this.repository.findById(id, options);
             if (entity) {
                 return entity;
             } else {
diff --git a/codbex-invoices/gen/codbex-invoices/api/PurchaseInvoice/PurchaseInvoiceItemService.ts b/codbex-invoices/gen/codbex-invoices/api/PurchaseInvoice/PurchaseInvoiceItemService.ts
index f466f3f..144b11a 100644
--- a/codbex-invoices/gen/codbex-invoices/api/PurchaseInvoice/PurchaseInvoiceItemService.ts
+++ b/codbex-invoices/gen/codbex-invoices/api/PurchaseInvoice/PurchaseInvoiceItemService.ts
@@ -1,7 +1,7 @@
-import { Controller, Get, Post, Put, Delete, response } from "sdk/http"
-import { Extensions } from "sdk/extensions"
+import { Controller, Get, Post, Put, Delete, request, response } from "@aerokit/sdk/http"
+import { Extensions } from "@aerokit/sdk/extensions"
 import { PurchaseInvoiceItemRepository, PurchaseInvoiceItemEntityOptions } from "../../dao/PurchaseInvoice/PurchaseInvoiceItemRepository";
-import { user } from "sdk/security"
+import { user } from "@aerokit/sdk/security"
 import { ForbiddenError } from "../utils/ForbiddenError";
 import { ValidationError } from "../utils/ValidationError";
 import { HttpUtils } from "../utils/HttpUtils";
@@ -19,7 +19,8 @@ class PurchaseInvoiceItemService {
             this.checkPermissions("read");
             const options: PurchaseInvoiceItemEntityOptions = {
                 $limit: ctx.queryParameters["$limit"] ? parseInt(ctx.queryParameters["$limit"]) : undefined,
-                $offset: ctx.queryParameters["$offset"] ? parseInt(ctx.queryParameters["$offset"]) : undefined
+                $offset: ctx.queryParameters["$offset"] ? parseInt(ctx.queryParameters["$offset"]) : undefined,
+                $language: request.getLocale().slice(0, 2)
             };
 
             let PurchaseInvoice = parseInt(ctx.queryParameters.PurchaseInvoice);
@@ -88,7 +89,10 @@ class PurchaseInvoiceItemService {
         try {
             this.checkPermissions("read");
             const id = parseInt(ctx.pathParameters.id);
-            const entity = this.repository.findById(id);
+            const options: PurchaseInvoiceItemEntityOptions = {
+                $language: request.getLocale().slice(0, 2)
+            };
+            const entity = this.repository.findById(id, options);
             if (entity) {
                 return entity;
             } else {
diff --git a/codbex-invoices/gen/codbex-invoices/api/PurchaseInvoice/PurchaseInvoicePaymentService.ts b/codbex-invoices/gen/codbex-invoices/api/PurchaseInvoice/PurchaseInvoicePaymentService.ts
index 824a2c9..3cb8567 100644
--- a/codbex-invoices/gen/codbex-invoices/api/PurchaseInvoice/PurchaseInvoicePaymentService.ts
+++ b/codbex-invoices/gen/codbex-invoices/api/PurchaseInvoice/PurchaseInvoicePaymentService.ts
@@ -1,7 +1,7 @@
-import { Controller, Get, Post, Put, Delete, response } from "sdk/http"
-import { Extensions } from "sdk/extensions"
+import { Controller, Get, Post, Put, Delete, request, response } from "@aerokit/sdk/http"
+import { Extensions } from "@aerokit/sdk/extensions"
 import { PurchaseInvoicePaymentRepository, PurchaseInvoicePaymentEntityOptions } from "../../dao/PurchaseInvoice/PurchaseInvoicePaymentRepository";
-import { user } from "sdk/security"
+import { user } from "@aerokit/sdk/security"
 import { ForbiddenError } from "../utils/ForbiddenError";
 import { ValidationError } from "../utils/ValidationError";
 import { HttpUtils } from "../utils/HttpUtils";
@@ -19,7 +19,8 @@ class PurchaseInvoicePaymentService {
             this.checkPermissions("read");
             const options: PurchaseInvoicePaymentEntityOptions = {
                 $limit: ctx.queryParameters["$limit"] ? parseInt(ctx.queryParameters["$limit"]) : undefined,
-                $offset: ctx.queryParameters["$offset"] ? parseInt(ctx.queryParameters["$offset"]) : undefined
+                $offset: ctx.queryParameters["$offset"] ? parseInt(ctx.queryParameters["$offset"]) : undefined,
+                $language: request.getLocale().slice(0, 2)
             };
 
             let PurchaseInvoice = parseInt(ctx.queryParameters.PurchaseInvoice);
@@ -88,7 +89,10 @@ class PurchaseInvoicePaymentService {
         try {
             this.checkPermissions("read");
             const id = parseInt(ctx.pathParameters.id);
-            const entity = this.repository.findById(id);
+            const options: PurchaseInvoicePaymentEntityOptions = {
+                $language: request.getLocale().slice(0, 2)
+            };
+            const entity = this.repository.findById(id, options);
             if (entity) {
                 return entity;
             } else {
diff --git a/codbex-invoices/gen/codbex-invoices/api/PurchaseInvoice/PurchaseInvoiceService.ts b/codbex-invoices/gen/codbex-invoices/api/PurchaseInvoice/PurchaseInvoiceService.ts
index 8e41b68..263f793 100644
--- a/codbex-invoices/gen/codbex-invoices/api/PurchaseInvoice/PurchaseInvoiceService.ts
+++ b/codbex-invoices/gen/codbex-invoices/api/PurchaseInvoice/PurchaseInvoiceService.ts
@@ -1,7 +1,7 @@
-import { Controller, Get, Post, Put, Delete, response } from "sdk/http"
-import { Extensions } from "sdk/extensions"
+import { Controller, Get, Post, Put, Delete, request, response } from "@aerokit/sdk/http"
+import { Extensions } from "@aerokit/sdk/extensions"
 import { PurchaseInvoiceRepository, PurchaseInvoiceEntityOptions } from "../../dao/PurchaseInvoice/PurchaseInvoiceRepository";
-import { user } from "sdk/security"
+import { user } from "@aerokit/sdk/security"
 import { ForbiddenError } from "../utils/ForbiddenError";
 import { ValidationError } from "../utils/ValidationError";
 import { HttpUtils } from "../utils/HttpUtils";
@@ -21,7 +21,8 @@ class PurchaseInvoiceService {
             this.checkPermissions("read");
             const options: PurchaseInvoiceEntityOptions = {
                 $limit: ctx.queryParameters["$limit"] ? parseInt(ctx.queryParameters["$limit"]) : undefined,
-                $offset: ctx.queryParameters["$offset"] ? parseInt(ctx.queryParameters["$offset"]) : undefined
+                $offset: ctx.queryParameters["$offset"] ? parseInt(ctx.queryParameters["$offset"]) : undefined,
+                $language: request.getLocale().slice(0, 2)
             };
 
             return this.repository.findAll(options);
@@ -79,7 +80,10 @@ class PurchaseInvoiceService {
         try {
             this.checkPermissions("read");
             const id = parseInt(ctx.pathParameters.id);
-            const entity = this.repository.findById(id);
+            const options: PurchaseInvoiceEntityOptions = {
+                $language: request.getLocale().slice(0, 2)
+            };
+            const entity = this.repository.findById(id, options);
             if (entity) {
                 return entity;
             } else {
diff --git a/codbex-invoices/gen/codbex-invoices/api/SalesInvoice/DeductionService.ts b/codbex-invoices/gen/codbex-invoices/api/SalesInvoice/DeductionService.ts
index 049c8f4..139cbbc 100644
--- a/codbex-invoices/gen/codbex-invoices/api/SalesInvoice/DeductionService.ts
+++ b/codbex-invoices/gen/codbex-invoices/api/SalesInvoice/DeductionService.ts
@@ -1,7 +1,7 @@
-import { Controller, Get, Post, Put, Delete, response } from "sdk/http"
-import { Extensions } from "sdk/extensions"
+import { Controller, Get, Post, Put, Delete, request, response } from "@aerokit/sdk/http"
+import { Extensions } from "@aerokit/sdk/extensions"
 import { DeductionRepository, DeductionEntityOptions } from "../../dao/SalesInvoice/DeductionRepository";
-import { user } from "sdk/security"
+import { user } from "@aerokit/sdk/security"
 import { ForbiddenError } from "../utils/ForbiddenError";
 import { ValidationError } from "../utils/ValidationError";
 import { HttpUtils } from "../utils/HttpUtils";
@@ -19,7 +19,8 @@ class DeductionService {
             this.checkPermissions("read");
             const options: DeductionEntityOptions = {
                 $limit: ctx.queryParameters["$limit"] ? parseInt(ctx.queryParameters["$limit"]) : undefined,
-                $offset: ctx.queryParameters["$offset"] ? parseInt(ctx.queryParameters["$offset"]) : undefined
+                $offset: ctx.queryParameters["$offset"] ? parseInt(ctx.queryParameters["$offset"]) : undefined,
+                $language: request.getLocale().slice(0, 2)
             };
 
             let DeductionInvoice = parseInt(ctx.queryParameters.DeductionInvoice);
@@ -88,7 +89,10 @@ class DeductionService {
         try {
             this.checkPermissions("read");
             const id = parseInt(ctx.pathParameters.id);
-            const entity = this.repository.findById(id);
+            const options: DeductionEntityOptions = {
+                $language: request.getLocale().slice(0, 2)
+            };
+            const entity = this.repository.findById(id, options);
             if (entity) {
                 return entity;
             } else {
diff --git a/codbex-invoices/gen/codbex-invoices/api/SalesInvoice/SalesInvoiceItemService.ts b/codbex-invoices/gen/codbex-invoices/api/SalesInvoice/SalesInvoiceItemService.ts
index 6217f78..5e2b6ac 100644
--- a/codbex-invoices/gen/codbex-invoices/api/SalesInvoice/SalesInvoiceItemService.ts
+++ b/codbex-invoices/gen/codbex-invoices/api/SalesInvoice/SalesInvoiceItemService.ts
@@ -1,7 +1,7 @@
-import { Controller, Get, Post, Put, Delete, response } from "sdk/http"
-import { Extensions } from "sdk/extensions"
+import { Controller, Get, Post, Put, Delete, request, response } from "@aerokit/sdk/http"
+import { Extensions } from "@aerokit/sdk/extensions"
 import { SalesInvoiceItemRepository, SalesInvoiceItemEntityOptions } from "../../dao/SalesInvoice/SalesInvoiceItemRepository";
-import { user } from "sdk/security"
+import { user } from "@aerokit/sdk/security"
 import { ForbiddenError } from "../utils/ForbiddenError";
 import { ValidationError } from "../utils/ValidationError";
 import { HttpUtils } from "../utils/HttpUtils";
@@ -19,7 +19,8 @@ class SalesInvoiceItemService {
             this.checkPermissions("read");
             const options: SalesInvoiceItemEntityOptions = {
                 $limit: ctx.queryParameters["$limit"] ? parseInt(ctx.queryParameters["$limit"]) : undefined,
-                $offset: ctx.queryParameters["$offset"] ? parseInt(ctx.queryParameters["$offset"]) : undefined
+                $offset: ctx.queryParameters["$offset"] ? parseInt(ctx.queryParameters["$offset"]) : undefined,
+                $language: request.getLocale().slice(0, 2)
             };
 
             let SalesInvoice = parseInt(ctx.queryParameters.SalesInvoice);
@@ -88,7 +89,10 @@ class SalesInvoiceItemService {
         try {
             this.checkPermissions("read");
             const id = parseInt(ctx.pathParameters.id);
-            const entity = this.repository.findById(id);
+            const options: SalesInvoiceItemEntityOptions = {
+                $language: request.getLocale().slice(0, 2)
+            };
+            const entity = this.repository.findById(id, options);
             if (entity) {
                 return entity;
             } else {
diff --git a/codbex-invoices/gen/codbex-invoices/api/SalesInvoice/SalesInvoicePaymentService.ts b/codbex-invoices/gen/codbex-invoices/api/SalesInvoice/SalesInvoicePaymentService.ts
index 96cdb64..91008ac 100644
--- a/codbex-invoices/gen/codbex-invoices/api/SalesInvoice/SalesInvoicePaymentService.ts
+++ b/codbex-invoices/gen/codbex-invoices/api/SalesInvoice/SalesInvoicePaymentService.ts
@@ -1,7 +1,7 @@
-import { Controller, Get, Post, Put, Delete, response } from "sdk/http"
-import { Extensions } from "sdk/extensions"
+import { Controller, Get, Post, Put, Delete, request, response } from "@aerokit/sdk/http"
+import { Extensions } from "@aerokit/sdk/extensions"
 import { SalesInvoicePaymentRepository, SalesInvoicePaymentEntityOptions } from "../../dao/SalesInvoice/SalesInvoicePaymentRepository";
-import { user } from "sdk/security"
+import { user } from "@aerokit/sdk/security"
 import { ForbiddenError } from "../utils/ForbiddenError";
 import { ValidationError } from "../utils/ValidationError";
 import { HttpUtils } from "../utils/HttpUtils";
@@ -19,7 +19,8 @@ class SalesInvoicePaymentService {
             this.checkPermissions("read");
             const options: SalesInvoicePaymentEntityOptions = {
                 $limit: ctx.queryParameters["$limit"] ? parseInt(ctx.queryParameters["$limit"]) : undefined,
-                $offset: ctx.queryParameters["$offset"] ? parseInt(ctx.queryParameters["$offset"]) : undefined
+                $offset: ctx.queryParameters["$offset"] ? parseInt(ctx.queryParameters["$offset"]) : undefined,
+                $language: request.getLocale().slice(0, 2)
             };
 
             let SalesInvoice = parseInt(ctx.queryParameters.SalesInvoice);
@@ -88,7 +89,10 @@ class SalesInvoicePaymentService {
         try {
             this.checkPermissions("read");
             const id = parseInt(ctx.pathParameters.id);
-            const entity = this.repository.findById(id);
+            const options: SalesInvoicePaymentEntityOptions = {
+                $language: request.getLocale().slice(0, 2)
+            };
+            const entity = this.repository.findById(id, options);
             if (entity) {
                 return entity;
             } else {
diff --git a/codbex-invoices/gen/codbex-invoices/api/SalesInvoice/SalesInvoiceService.ts b/codbex-invoices/gen/codbex-invoices/api/SalesInvoice/SalesInvoiceService.ts
index 636a6d0..581c004 100644
--- a/codbex-invoices/gen/codbex-invoices/api/SalesInvoice/SalesInvoiceService.ts
+++ b/codbex-invoices/gen/codbex-invoices/api/SalesInvoice/SalesInvoiceService.ts
@@ -1,7 +1,7 @@
-import { Controller, Get, Post, Put, Delete, response } from "sdk/http"
-import { Extensions } from "sdk/extensions"
+import { Controller, Get, Post, Put, Delete, request, response } from "@aerokit/sdk/http"
+import { Extensions } from "@aerokit/sdk/extensions"
 import { SalesInvoiceRepository, SalesInvoiceEntityOptions } from "../../dao/SalesInvoice/SalesInvoiceRepository";
-import { user } from "sdk/security"
+import { user } from "@aerokit/sdk/security"
 import { ForbiddenError } from "../utils/ForbiddenError";
 import { ValidationError } from "../utils/ValidationError";
 import { HttpUtils } from "../utils/HttpUtils";
@@ -21,7 +21,8 @@ class SalesInvoiceService {
             this.checkPermissions("read");
             const options: SalesInvoiceEntityOptions = {
                 $limit: ctx.queryParameters["$limit"] ? parseInt(ctx.queryParameters["$limit"]) : undefined,
-                $offset: ctx.queryParameters["$offset"] ? parseInt(ctx.queryParameters["$offset"]) : undefined
+                $offset: ctx.queryParameters["$offset"] ? parseInt(ctx.queryParameters["$offset"]) : undefined,
+                $language: request.getLocale().slice(0, 2)
             };
 
             return this.repository.findAll(options);
@@ -79,7 +80,10 @@ class SalesInvoiceService {
         try {
             this.checkPermissions("read");
             const id = parseInt(ctx.pathParameters.id);
-            const entity = this.repository.findById(id);
+            const options: SalesInvoiceEntityOptions = {
+                $language: request.getLocale().slice(0, 2)
+            };
+            const entity = this.repository.findById(id, options);
             if (entity) {
                 return entity;
             } else {
diff --git a/codbex-invoices/gen/codbex-invoices/api/Settings/PaymentMethodService.ts b/codbex-invoices/gen/codbex-invoices/api/Settings/PaymentMethodService.ts
index 5061091..94c230e 100644
--- a/codbex-invoices/gen/codbex-invoices/api/Settings/PaymentMethodService.ts
+++ b/codbex-invoices/gen/codbex-invoices/api/Settings/PaymentMethodService.ts
@@ -1,5 +1,5 @@
-import { Controller, Get, Post, Put, Delete, response } from "sdk/http"
-import { Extensions } from "sdk/extensions"
+import { Controller, Get, Post, Put, Delete, request, response } from "@aerokit/sdk/http"
+import { Extensions } from "@aerokit/sdk/extensions"
 import { PaymentMethodRepository, PaymentMethodEntityOptions } from "../../dao/Settings/PaymentMethodRepository";
 import { ValidationError } from "../utils/ValidationError";
 import { HttpUtils } from "../utils/HttpUtils";
@@ -16,7 +16,8 @@ class PaymentMethodService {
         try {
             const options: PaymentMethodEntityOptions = {
                 $limit: ctx.queryParameters["$limit"] ? parseInt(ctx.queryParameters["$limit"]) : undefined,
-                $offset: ctx.queryParameters["$offset"] ? parseInt(ctx.queryParameters["$offset"]) : undefined
+                $offset: ctx.queryParameters["$offset"] ? parseInt(ctx.queryParameters["$offset"]) : undefined,
+                $language: request.getLocale().slice(0, 2)
             };
 
             return this.repository.findAll(options);
@@ -69,7 +70,10 @@ class PaymentMethodService {
     public getById(_: any, ctx: any) {
         try {
             const id = parseInt(ctx.pathParameters.id);
-            const entity = this.repository.findById(id);
+            const options: PaymentMethodEntityOptions = {
+                $language: request.getLocale().slice(0, 2)
+            };
+            const entity = this.repository.findById(id, options);
             if (entity) {
                 return entity;
             } else {
diff --git a/codbex-invoices/gen/codbex-invoices/api/Settings/PurchaseInvoiceStatusService.ts b/codbex-invoices/gen/codbex-invoices/api/Settings/PurchaseInvoiceStatusService.ts
index 36e5b30..58ad0d0 100644
--- a/codbex-invoices/gen/codbex-invoices/api/Settings/PurchaseInvoiceStatusService.ts
+++ b/codbex-invoices/gen/codbex-invoices/api/Settings/PurchaseInvoiceStatusService.ts
@@ -1,7 +1,7 @@
-import { Controller, Get, Post, Put, Delete, response } from "sdk/http"
-import { Extensions } from "sdk/extensions"
+import { Controller, Get, Post, Put, Delete, request, response } from "@aerokit/sdk/http"
+import { Extensions } from "@aerokit/sdk/extensions"
 import { PurchaseInvoiceStatusRepository, PurchaseInvoiceStatusEntityOptions } from "../../dao/Settings/PurchaseInvoiceStatusRepository";
-import { user } from "sdk/security"
+import { user } from "@aerokit/sdk/security"
 import { ForbiddenError } from "../utils/ForbiddenError";
 import { ValidationError } from "../utils/ValidationError";
 import { HttpUtils } from "../utils/HttpUtils";
@@ -19,7 +19,8 @@ class PurchaseInvoiceStatusService {
             this.checkPermissions("read");
             const options: PurchaseInvoiceStatusEntityOptions = {
                 $limit: ctx.queryParameters["$limit"] ? parseInt(ctx.queryParameters["$limit"]) : undefined,
-                $offset: ctx.queryParameters["$offset"] ? parseInt(ctx.queryParameters["$offset"]) : undefined
+                $offset: ctx.queryParameters["$offset"] ? parseInt(ctx.queryParameters["$offset"]) : undefined,
+                $language: request.getLocale().slice(0, 2)
             };
 
             return this.repository.findAll(options);
@@ -77,7 +78,10 @@ class PurchaseInvoiceStatusService {
         try {
             this.checkPermissions("read");
             const id = parseInt(ctx.pathParameters.id);
-            const entity = this.repository.findById(id);
+            const options: PurchaseInvoiceStatusEntityOptions = {
+                $language: request.getLocale().slice(0, 2)
+            };
+            const entity = this.repository.findById(id, options);
             if (entity) {
                 return entity;
             } else {
diff --git a/codbex-invoices/gen/codbex-invoices/api/Settings/PurchaseInvoiceTypeService.ts b/codbex-invoices/gen/codbex-invoices/api/Settings/PurchaseInvoiceTypeService.ts
index b1cbdb2..4144b0e 100644
--- a/codbex-invoices/gen/codbex-invoices/api/Settings/PurchaseInvoiceTypeService.ts
+++ b/codbex-invoices/gen/codbex-invoices/api/Settings/PurchaseInvoiceTypeService.ts
@@ -1,7 +1,7 @@
-import { Controller, Get, Post, Put, Delete, response } from "sdk/http"
-import { Extensions } from "sdk/extensions"
+import { Controller, Get, Post, Put, Delete, request, response } from "@aerokit/sdk/http"
+import { Extensions } from "@aerokit/sdk/extensions"
 import { PurchaseInvoiceTypeRepository, PurchaseInvoiceTypeEntityOptions } from "../../dao/Settings/PurchaseInvoiceTypeRepository";
-import { user } from "sdk/security"
+import { user } from "@aerokit/sdk/security"
 import { ForbiddenError } from "../utils/ForbiddenError";
 import { ValidationError } from "../utils/ValidationError";
 import { HttpUtils } from "../utils/HttpUtils";
@@ -19,7 +19,8 @@ class PurchaseInvoiceTypeService {
             this.checkPermissions("read");
             const options: PurchaseInvoiceTypeEntityOptions = {
                 $limit: ctx.queryParameters["$limit"] ? parseInt(ctx.queryParameters["$limit"]) : undefined,
-                $offset: ctx.queryParameters["$offset"] ? parseInt(ctx.queryParameters["$offset"]) : undefined
+                $offset: ctx.queryParameters["$offset"] ? parseInt(ctx.queryParameters["$offset"]) : undefined,
+                $language: request.getLocale().slice(0, 2)
             };
 
             return this.repository.findAll(options);
@@ -77,7 +78,10 @@ class PurchaseInvoiceTypeService {
         try {
             this.checkPermissions("read");
             const id = parseInt(ctx.pathParameters.id);
-            const entity = this.repository.findById(id);
+            const options: PurchaseInvoiceTypeEntityOptions = {
+                $language: request.getLocale().slice(0, 2)
+            };
+            const entity = this.repository.findById(id, options);
             if (entity) {
                 return entity;
             } else {
diff --git a/codbex-invoices/gen/codbex-invoices/api/Settings/SalesInvoiceStatusService.ts b/codbex-invoices/gen/codbex-invoices/api/Settings/SalesInvoiceStatusService.ts
index fa21531..3f114ef 100644
--- a/codbex-invoices/gen/codbex-invoices/api/Settings/SalesInvoiceStatusService.ts
+++ b/codbex-invoices/gen/codbex-invoices/api/Settings/SalesInvoiceStatusService.ts
@@ -1,7 +1,7 @@
-import { Controller, Get, Post, Put, Delete, response } from "sdk/http"
-import { Extensions } from "sdk/extensions"
+import { Controller, Get, Post, Put, Delete, request, response } from "@aerokit/sdk/http"
+import { Extensions } from "@aerokit/sdk/extensions"
 import { SalesInvoiceStatusRepository, SalesInvoiceStatusEntityOptions } from "../../dao/Settings/SalesInvoiceStatusRepository";
-import { user } from "sdk/security"
+import { user } from "@aerokit/sdk/security"
 import { ForbiddenError } from "../utils/ForbiddenError";
 import { ValidationError } from "../utils/ValidationError";
 import { HttpUtils } from "../utils/HttpUtils";
@@ -19,7 +19,8 @@ class SalesInvoiceStatusService {
             this.checkPermissions("read");
             const options: SalesInvoiceStatusEntityOptions = {
                 $limit: ctx.queryParameters["$limit"] ? parseInt(ctx.queryParameters["$limit"]) : undefined,
-                $offset: ctx.queryParameters["$offset"] ? parseInt(ctx.queryParameters["$offset"]) : undefined
+                $offset: ctx.queryParameters["$offset"] ? parseInt(ctx.queryParameters["$offset"]) : undefined,
+                $language: request.getLocale().slice(0, 2)
             };
 
             return this.repository.findAll(options);
@@ -77,7 +78,10 @@ class SalesInvoiceStatusService {
         try {
             this.checkPermissions("read");
             const id = parseInt(ctx.pathParameters.id);
-            const entity = this.repository.findById(id);
+            const options: SalesInvoiceStatusEntityOptions = {
+                $language: request.getLocale().slice(0, 2)
+            };
+            const entity = this.repository.findById(id, options);
             if (entity) {
                 return entity;
             } else {
diff --git a/codbex-invoices/gen/codbex-invoices/api/Settings/SalesInvoiceTypeService.ts b/codbex-invoices/gen/codbex-invoices/api/Settings/SalesInvoiceTypeService.ts
index 6524158..2193d6c 100644
--- a/codbex-invoices/gen/codbex-invoices/api/Settings/SalesInvoiceTypeService.ts
+++ b/codbex-invoices/gen/codbex-invoices/api/Settings/SalesInvoiceTypeService.ts
@@ -1,7 +1,7 @@
-import { Controller, Get, Post, Put, Delete, response } from "sdk/http"
-import { Extensions } from "sdk/extensions"
+import { Controller, Get, Post, Put, Delete, request, response } from "@aerokit/sdk/http"
+import { Extensions } from "@aerokit/sdk/extensions"
 import { SalesInvoiceTypeRepository, SalesInvoiceTypeEntityOptions } from "../../dao/Settings/SalesInvoiceTypeRepository";
-import { user } from "sdk/security"
+import { user } from "@aerokit/sdk/security"
 import { ForbiddenError } from "../utils/ForbiddenError";
 import { ValidationError } from "../utils/ValidationError";
 import { HttpUtils } from "../utils/HttpUtils";
@@ -19,7 +19,8 @@ class SalesInvoiceTypeService {
             this.checkPermissions("read");
             const options: SalesInvoiceTypeEntityOptions = {
                 $limit: ctx.queryParameters["$limit"] ? parseInt(ctx.queryParameters["$limit"]) : undefined,
-                $offset: ctx.queryParameters["$offset"] ? parseInt(ctx.queryParameters["$offset"]) : undefined
+                $offset: ctx.queryParameters["$offset"] ? parseInt(ctx.queryParameters["$offset"]) : undefined,
+                $language: request.getLocale().slice(0, 2)
             };
 
             return this.repository.findAll(options);
@@ -77,7 +78,10 @@ class SalesInvoiceTypeService {
         try {
             this.checkPermissions("read");
             const id = parseInt(ctx.pathParameters.id);
-            const entity = this.repository.findById(id);
+            const options: SalesInvoiceTypeEntityOptions = {
+                $language: request.getLocale().slice(0, 2)
+            };
+            const entity = this.repository.findById(id, options);
             if (entity) {
                 return entity;
             } else {
diff --git a/codbex-invoices/gen/codbex-invoices/api/Settings/SentMethodService.ts b/codbex-invoices/gen/codbex-invoices/api/Settings/SentMethodService.ts
index 1b7600a..b008189 100644
--- a/codbex-invoices/gen/codbex-invoices/api/Settings/SentMethodService.ts
+++ b/codbex-invoices/gen/codbex-invoices/api/Settings/SentMethodService.ts
@@ -1,5 +1,5 @@
-import { Controller, Get, Post, Put, Delete, response } from "sdk/http"
-import { Extensions } from "sdk/extensions"
+import { Controller, Get, Post, Put, Delete, request, response } from "@aerokit/sdk/http"
+import { Extensions } from "@aerokit/sdk/extensions"
 import { SentMethodRepository, SentMethodEntityOptions } from "../../dao/Settings/SentMethodRepository";
 import { ValidationError } from "../utils/ValidationError";
 import { HttpUtils } from "../utils/HttpUtils";
@@ -16,7 +16,8 @@ class SentMethodService {
         try {
             const options: SentMethodEntityOptions = {
                 $limit: ctx.queryParameters["$limit"] ? parseInt(ctx.queryParameters["$limit"]) : undefined,
-                $offset: ctx.queryParameters["$offset"] ? parseInt(ctx.queryParameters["$offset"]) : undefined
+                $offset: ctx.queryParameters["$offset"] ? parseInt(ctx.queryParameters["$offset"]) : undefined,
+                $language: request.getLocale().slice(0, 2)
             };
 
             return this.repository.findAll(options);
@@ -69,7 +70,10 @@ class SentMethodService {
     public getById(_: any, ctx: any) {
         try {
             const id = parseInt(ctx.pathParameters.id);
-            const entity = this.repository.findById(id);
+            const options: SentMethodEntityOptions = {
+                $language: request.getLocale().slice(0, 2)
+            };
+            const entity = this.repository.findById(id, options);
             if (entity) {
                 return entity;
             } else {
diff --git a/codbex-invoices/gen/codbex-invoices/api/SupplierPayment/SupplierPaymentService.ts b/codbex-invoices/gen/codbex-invoices/api/SupplierPayment/SupplierPaymentService.ts
index ed2c4be..fe7a7d2 100644
--- a/codbex-invoices/gen/codbex-invoices/api/SupplierPayment/SupplierPaymentService.ts
+++ b/codbex-invoices/gen/codbex-invoices/api/SupplierPayment/SupplierPaymentService.ts
@@ -1,5 +1,5 @@
-import { Controller, Get, Post, Put, Delete, response } from "sdk/http"
-import { Extensions } from "sdk/extensions"
+import { Controller, Get, Post, Put, Delete, request, response } from "@aerokit/sdk/http"
+import { Extensions } from "@aerokit/sdk/extensions"
 import { SupplierPaymentRepository, SupplierPaymentEntityOptions } from "../../dao/SupplierPayment/SupplierPaymentRepository";
 import { ValidationError } from "../utils/ValidationError";
 import { HttpUtils } from "../utils/HttpUtils";
@@ -16,7 +16,8 @@ class SupplierPaymentService {
         try {
             const options: SupplierPaymentEntityOptions = {
                 $limit: ctx.queryParameters["$limit"] ? parseInt(ctx.queryParameters["$limit"]) : undefined,
-                $offset: ctx.queryParameters["$offset"] ? parseInt(ctx.queryParameters["$offset"]) : undefined
+                $offset: ctx.queryParameters["$offset"] ? parseInt(ctx.queryParameters["$offset"]) : undefined,
+                $language: request.getLocale().slice(0, 2)
             };
 
             return this.repository.findAll(options);
@@ -69,7 +70,10 @@ class SupplierPaymentService {
     public getById(_: any, ctx: any) {
         try {
             const id = parseInt(ctx.pathParameters.id);
-            const entity = this.repository.findById(id);
+            const options: SupplierPaymentEntityOptions = {
+                $language: request.getLocale().slice(0, 2)
+            };
+            const entity = this.repository.findById(id, options);
             if (entity) {
                 return entity;
             } else {
diff --git a/codbex-invoices/gen/codbex-invoices/api/utils/HttpUtils.ts b/codbex-invoices/gen/codbex-invoices/api/utils/HttpUtils.ts
index 80efced..08fbd20 100644
--- a/codbex-invoices/gen/codbex-invoices/api/utils/HttpUtils.ts
+++ b/codbex-invoices/gen/codbex-invoices/api/utils/HttpUtils.ts
@@ -1,4 +1,4 @@
-import { response } from "sdk/http";
+import { response } from "@aerokit/sdk/http";
 
 export class HttpUtils {
 
@@ -57,4 +57,4 @@ export class HttpUtils {
             response.println(JSON.stringify(body));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/codbex-invoices/gen/codbex-invoices/dao/CustomerPayment/CustomerPaymentRepository.ts b/codbex-invoices/gen/codbex-invoices/dao/CustomerPayment/CustomerPaymentRepository.ts
index 12e6ed4..c3fe32f 100644
--- a/codbex-invoices/gen/codbex-invoices/dao/CustomerPayment/CustomerPaymentRepository.ts
+++ b/codbex-invoices/gen/codbex-invoices/dao/CustomerPayment/CustomerPaymentRepository.ts
@@ -1,7 +1,7 @@
-import { query } from "sdk/db";
-import { producer } from "sdk/messaging";
-import { extensions } from "sdk/extensions";
-import { dao as daoApi } from "sdk/db";
+import { sql, query } from "@aerokit/sdk/db";
+import { producer } from "@aerokit/sdk/messaging";
+import { extensions } from "@aerokit/sdk/extensions";
+import { dao as daoApi } from "@aerokit/sdk/db";
 import { EntityUtils } from "../utils/EntityUtils";
 
 export interface CustomerPaymentEntity {
@@ -177,6 +177,7 @@ export interface CustomerPaymentEntityOptions {
     $order?: 'ASC' | 'DESC',
     $offset?: number,
     $limit?: number,
+    $language?: string
 }
 
 export interface CustomerPaymentEntityEvent {
@@ -295,14 +296,15 @@ export class CustomerPaymentRepository {
             options.$sort = "Date";
             options.$order = "DESC";
         }
-        return this.dao.list(options).map((e: CustomerPaymentEntity) => {
+        let list = this.dao.list(options).map((e: CustomerPaymentEntity) => {
             EntityUtils.setDate(e, "Date");
             EntityUtils.setDate(e, "Valor");
             return e;
         });
+        return list;
     }
 
-    public findById(id: number): CustomerPaymentEntity | undefined {
+    public findById(id: number, options: CustomerPaymentEntityOptions = {}): CustomerPaymentEntity | undefined {
         const entity = this.dao.find(id);
         EntityUtils.setDate(entity, "Date");
         EntityUtils.setDate(entity, "Valor");
diff --git a/codbex-invoices/gen/codbex-invoices/dao/PurchaseInvoice/PurchaseInvoiceItemRepository.ts b/codbex-invoices/gen/codbex-invoices/dao/PurchaseInvoice/PurchaseInvoiceItemRepository.ts
index 3ced90c..429f74d 100644
--- a/codbex-invoices/gen/codbex-invoices/dao/PurchaseInvoice/PurchaseInvoiceItemRepository.ts
+++ b/codbex-invoices/gen/codbex-invoices/dao/PurchaseInvoice/PurchaseInvoiceItemRepository.ts
@@ -1,7 +1,7 @@
-import { query } from "sdk/db";
-import { producer } from "sdk/messaging";
-import { extensions } from "sdk/extensions";
-import { dao as daoApi } from "sdk/db";
+import { sql, query } from "@aerokit/sdk/db";
+import { producer } from "@aerokit/sdk/messaging";
+import { extensions } from "@aerokit/sdk/extensions";
+import { dao as daoApi } from "@aerokit/sdk/db";
 
 export interface PurchaseInvoiceItemEntity {
     readonly Id: number;
@@ -121,6 +121,7 @@ export interface PurchaseInvoiceItemEntityOptions {
     $order?: 'ASC' | 'DESC',
     $offset?: number,
     $limit?: number,
+    $language?: string
 }
 
 export interface PurchaseInvoiceItemEntityEvent {
@@ -210,10 +211,11 @@ export class PurchaseInvoiceItemRepository {
     }
 
     public findAll(options: PurchaseInvoiceItemEntityOptions = {}): PurchaseInvoiceItemEntity[] {
-        return this.dao.list(options);
+        let list = this.dao.list(options);
+        return list;
     }
 
-    public findById(id: number): PurchaseInvoiceItemEntity | undefined {
+    public findById(id: number, options: PurchaseInvoiceItemEntityOptions = {}): PurchaseInvoiceItemEntity | undefined {
         const entity = this.dao.find(id);
         return entity ?? undefined;
     }
diff --git a/codbex-invoices/gen/codbex-invoices/dao/PurchaseInvoice/PurchaseInvoicePaymentRepository.ts b/codbex-invoices/gen/codbex-invoices/dao/PurchaseInvoice/PurchaseInvoicePaymentRepository.ts
index 3a9d28a..35b9598 100644
--- a/codbex-invoices/gen/codbex-invoices/dao/PurchaseInvoice/PurchaseInvoicePaymentRepository.ts
+++ b/codbex-invoices/gen/codbex-invoices/dao/PurchaseInvoice/PurchaseInvoicePaymentRepository.ts
@@ -1,7 +1,7 @@
-import { query } from "sdk/db";
-import { producer } from "sdk/messaging";
-import { extensions } from "sdk/extensions";
-import { dao as daoApi } from "sdk/db";
+import { sql, query } from "@aerokit/sdk/db";
+import { producer } from "@aerokit/sdk/messaging";
+import { extensions } from "@aerokit/sdk/extensions";
+import { dao as daoApi } from "@aerokit/sdk/db";
 
 export interface PurchaseInvoicePaymentEntity {
     readonly Id: number;
@@ -70,6 +70,7 @@ export interface PurchaseInvoicePaymentEntityOptions {
     $order?: 'ASC' | 'DESC',
     $offset?: number,
     $limit?: number,
+    $language?: string
 }
 
 export interface PurchaseInvoicePaymentEntityEvent {
@@ -125,10 +126,11 @@ export class PurchaseInvoicePaymentRepository {
     }
 
     public findAll(options: PurchaseInvoicePaymentEntityOptions = {}): PurchaseInvoicePaymentEntity[] {
-        return this.dao.list(options);
+        let list = this.dao.list(options);
+        return list;
     }
 
-    public findById(id: number): PurchaseInvoicePaymentEntity | undefined {
+    public findById(id: number, options: PurchaseInvoicePaymentEntityOptions = {}): PurchaseInvoicePaymentEntity | undefined {
         const entity = this.dao.find(id);
         return entity ?? undefined;
     }
diff --git a/codbex-invoices/gen/codbex-invoices/dao/PurchaseInvoice/PurchaseInvoiceRepository.ts b/codbex-invoices/gen/codbex-invoices/dao/PurchaseInvoice/PurchaseInvoiceRepository.ts
index 374ee96..9650e56 100644
--- a/codbex-invoices/gen/codbex-invoices/dao/PurchaseInvoice/PurchaseInvoiceRepository.ts
+++ b/codbex-invoices/gen/codbex-invoices/dao/PurchaseInvoice/PurchaseInvoiceRepository.ts
@@ -1,7 +1,7 @@
-import { query } from "sdk/db";
-import { producer } from "sdk/messaging";
-import { extensions } from "sdk/extensions";
-import { dao as daoApi } from "sdk/db";
+import { sql, query } from "@aerokit/sdk/db";
+import { producer } from "@aerokit/sdk/messaging";
+import { extensions } from "@aerokit/sdk/extensions";
+import { dao as daoApi } from "@aerokit/sdk/db";
 import { EntityUtils } from "../utils/EntityUtils";
 // custom imports
 import { NumberGeneratorService } from "/codbex-number-generator/service/generator";
@@ -267,6 +267,7 @@ export interface PurchaseInvoiceEntityOptions {
     $order?: 'ASC' | 'DESC',
     $offset?: number,
     $limit?: number,
+    $language?: string
 }
 
 export interface PurchaseInvoiceEntityEvent {
@@ -442,14 +443,15 @@ export class PurchaseInvoiceRepository {
             options.$sort = "Number";
             options.$order = "DESC";
         }
-        return this.dao.list(options).map((e: PurchaseInvoiceEntity) => {
+        let list = this.dao.list(options).map((e: PurchaseInvoiceEntity) => {
             EntityUtils.setDate(e, "Date");
             EntityUtils.setDate(e, "Due");
             return e;
         });
+        return list;
     }
 
-    public findById(id: number): PurchaseInvoiceEntity | undefined {
+    public findById(id: number, options: PurchaseInvoiceEntityOptions = {}): PurchaseInvoiceEntity | undefined {
         const entity = this.dao.find(id);
         EntityUtils.setDate(entity, "Date");
         EntityUtils.setDate(entity, "Due");
diff --git a/codbex-invoices/gen/codbex-invoices/dao/SalesInvoice/DeductionRepository.ts b/codbex-invoices/gen/codbex-invoices/dao/SalesInvoice/DeductionRepository.ts
index 1b51fea..4faa067 100644
--- a/codbex-invoices/gen/codbex-invoices/dao/SalesInvoice/DeductionRepository.ts
+++ b/codbex-invoices/gen/codbex-invoices/dao/SalesInvoice/DeductionRepository.ts
@@ -1,7 +1,7 @@
-import { query } from "sdk/db";
-import { producer } from "sdk/messaging";
-import { extensions } from "sdk/extensions";
-import { dao as daoApi } from "sdk/db";
+import { sql, query } from "@aerokit/sdk/db";
+import { producer } from "@aerokit/sdk/messaging";
+import { extensions } from "@aerokit/sdk/extensions";
+import { dao as daoApi } from "@aerokit/sdk/db";
 
 export interface DeductionEntity {
     readonly Id: number;
@@ -61,6 +61,7 @@ export interface DeductionEntityOptions {
     $order?: 'ASC' | 'DESC',
     $offset?: number,
     $limit?: number,
+    $language?: string
 }
 
 export interface DeductionEntityEvent {
@@ -110,10 +111,11 @@ export class DeductionRepository {
     }
 
     public findAll(options: DeductionEntityOptions = {}): DeductionEntity[] {
-        return this.dao.list(options);
+        let list = this.dao.list(options);
+        return list;
     }
 
-    public findById(id: number): DeductionEntity | undefined {
+    public findById(id: number, options: DeductionEntityOptions = {}): DeductionEntity | undefined {
         const entity = this.dao.find(id);
         return entity ?? undefined;
     }
diff --git a/codbex-invoices/gen/codbex-invoices/dao/SalesInvoice/SalesInvoiceItemRepository.ts b/codbex-invoices/gen/codbex-invoices/dao/SalesInvoice/SalesInvoiceItemRepository.ts
index c4eef61..92a1d91 100644
--- a/codbex-invoices/gen/codbex-invoices/dao/SalesInvoice/SalesInvoiceItemRepository.ts
+++ b/codbex-invoices/gen/codbex-invoices/dao/SalesInvoice/SalesInvoiceItemRepository.ts
@@ -1,7 +1,7 @@
-import { query } from "sdk/db";
-import { producer } from "sdk/messaging";
-import { extensions } from "sdk/extensions";
-import { dao as daoApi } from "sdk/db";
+import { sql, query } from "@aerokit/sdk/db";
+import { producer } from "@aerokit/sdk/messaging";
+import { extensions } from "@aerokit/sdk/extensions";
+import { dao as daoApi } from "@aerokit/sdk/db";
 
 export interface SalesInvoiceItemEntity {
     readonly Id: number;
@@ -121,6 +121,7 @@ export interface SalesInvoiceItemEntityOptions {
     $order?: 'ASC' | 'DESC',
     $offset?: number,
     $limit?: number,
+    $language?: string
 }
 
 export interface SalesInvoiceItemEntityEvent {
@@ -214,10 +215,11 @@ export class SalesInvoiceItemRepository {
     }
 
     public findAll(options: SalesInvoiceItemEntityOptions = {}): SalesInvoiceItemEntity[] {
-        return this.dao.list(options);
+        let list = this.dao.list(options);
+        return list;
     }
 
-    public findById(id: number): SalesInvoiceItemEntity | undefined {
+    public findById(id: number, options: SalesInvoiceItemEntityOptions = {}): SalesInvoiceItemEntity | undefined {
         const entity = this.dao.find(id);
         return entity ?? undefined;
     }
diff --git a/codbex-invoices/gen/codbex-invoices/dao/SalesInvoice/SalesInvoicePaymentRepository.ts b/codbex-invoices/gen/codbex-invoices/dao/SalesInvoice/SalesInvoicePaymentRepository.ts
index 4adcdfd..c2b8cc6 100644
--- a/codbex-invoices/gen/codbex-invoices/dao/SalesInvoice/SalesInvoicePaymentRepository.ts
+++ b/codbex-invoices/gen/codbex-invoices/dao/SalesInvoice/SalesInvoicePaymentRepository.ts
@@ -1,7 +1,7 @@
-import { query } from "sdk/db";
-import { producer } from "sdk/messaging";
-import { extensions } from "sdk/extensions";
-import { dao as daoApi } from "sdk/db";
+import { sql, query } from "@aerokit/sdk/db";
+import { producer } from "@aerokit/sdk/messaging";
+import { extensions } from "@aerokit/sdk/extensions";
+import { dao as daoApi } from "@aerokit/sdk/db";
 
 export interface SalesInvoicePaymentEntity {
     readonly Id: number;
@@ -70,6 +70,7 @@ export interface SalesInvoicePaymentEntityOptions {
     $order?: 'ASC' | 'DESC',
     $offset?: number,
     $limit?: number,
+    $language?: string
 }
 
 export interface SalesInvoicePaymentEntityEvent {
@@ -125,10 +126,11 @@ export class SalesInvoicePaymentRepository {
     }
 
     public findAll(options: SalesInvoicePaymentEntityOptions = {}): SalesInvoicePaymentEntity[] {
-        return this.dao.list(options);
+        let list = this.dao.list(options);
+        return list;
     }
 
-    public findById(id: number): SalesInvoicePaymentEntity | undefined {
+    public findById(id: number, options: SalesInvoicePaymentEntityOptions = {}): SalesInvoicePaymentEntity | undefined {
         const entity = this.dao.find(id);
         return entity ?? undefined;
     }
diff --git a/codbex-invoices/gen/codbex-invoices/dao/SalesInvoice/SalesInvoiceRepository.ts b/codbex-invoices/gen/codbex-invoices/dao/SalesInvoice/SalesInvoiceRepository.ts
index 4fb96e8..929ebf6 100644
--- a/codbex-invoices/gen/codbex-invoices/dao/SalesInvoice/SalesInvoiceRepository.ts
+++ b/codbex-invoices/gen/codbex-invoices/dao/SalesInvoice/SalesInvoiceRepository.ts
@@ -1,7 +1,7 @@
-import { query } from "sdk/db";
-import { producer } from "sdk/messaging";
-import { extensions } from "sdk/extensions";
-import { dao as daoApi } from "sdk/db";
+import { sql, query } from "@aerokit/sdk/db";
+import { producer } from "@aerokit/sdk/messaging";
+import { extensions } from "@aerokit/sdk/extensions";
+import { dao as daoApi } from "@aerokit/sdk/db";
 import { EntityUtils } from "../utils/EntityUtils";
 // custom imports
 import { NumberGeneratorService } from "/codbex-number-generator/service/generator";
@@ -258,6 +258,7 @@ export interface SalesInvoiceEntityOptions {
     $order?: 'ASC' | 'DESC',
     $offset?: number,
     $limit?: number,
+    $language?: string
 }
 
 export interface SalesInvoiceEntityEvent {
@@ -429,14 +430,15 @@ export class SalesInvoiceRepository {
             options.$sort = "Number";
             options.$order = "DESC";
         }
-        return this.dao.list(options).map((e: SalesInvoiceEntity) => {
+        let list = this.dao.list(options).map((e: SalesInvoiceEntity) => {
             EntityUtils.setDate(e, "Date");
             EntityUtils.setDate(e, "Due");
             return e;
         });
+        return list;
     }
 
-    public findById(id: number): SalesInvoiceEntity | undefined {
+    public findById(id: number, options: SalesInvoiceEntityOptions = {}): SalesInvoiceEntity | undefined {
         const entity = this.dao.find(id);
         EntityUtils.setDate(entity, "Date");
         EntityUtils.setDate(entity, "Due");
diff --git a/codbex-invoices/gen/codbex-invoices/dao/Settings/PaymentMethodRepository.ts b/codbex-invoices/gen/codbex-invoices/dao/Settings/PaymentMethodRepository.ts
index 435d3aa..10a4fd1 100644
--- a/codbex-invoices/gen/codbex-invoices/dao/Settings/PaymentMethodRepository.ts
+++ b/codbex-invoices/gen/codbex-invoices/dao/Settings/PaymentMethodRepository.ts
@@ -1,7 +1,7 @@
-import { query } from "sdk/db";
-import { producer } from "sdk/messaging";
-import { extensions } from "sdk/extensions";
-import { dao as daoApi } from "sdk/db";
+import { sql, query } from "@aerokit/sdk/db";
+import { producer } from "@aerokit/sdk/messaging";
+import { extensions } from "@aerokit/sdk/extensions";
+import { dao as daoApi } from "@aerokit/sdk/db";
 
 export interface PaymentMethodEntity {
     readonly Id: number;
@@ -52,6 +52,7 @@ export interface PaymentMethodEntityOptions {
     $order?: 'ASC' | 'DESC',
     $offset?: number,
     $limit?: number,
+    $language?: string
 }
 
 export interface PaymentMethodEntityEvent {
@@ -96,10 +97,11 @@ export class PaymentMethodRepository {
     }
 
     public findAll(options: PaymentMethodEntityOptions = {}): PaymentMethodEntity[] {
-        return this.dao.list(options);
+        let list = this.dao.list(options);
+        return list;
     }
 
-    public findById(id: number): PaymentMethodEntity | undefined {
+    public findById(id: number, options: PaymentMethodEntityOptions = {}): PaymentMethodEntity | undefined {
         const entity = this.dao.find(id);
         return entity ?? undefined;
     }
diff --git a/codbex-invoices/gen/codbex-invoices/dao/Settings/PurchaseInvoiceStatusRepository.ts b/codbex-invoices/gen/codbex-invoices/dao/Settings/PurchaseInvoiceStatusRepository.ts
index bd26ee4..b2126c4 100644
--- a/codbex-invoices/gen/codbex-invoices/dao/Settings/PurchaseInvoiceStatusRepository.ts
+++ b/codbex-invoices/gen/codbex-invoices/dao/Settings/PurchaseInvoiceStatusRepository.ts
@@ -1,7 +1,7 @@
-import { query } from "sdk/db";
-import { producer } from "sdk/messaging";
-import { extensions } from "sdk/extensions";
-import { dao as daoApi } from "sdk/db";
+import { sql, query } from "@aerokit/sdk/db";
+import { producer } from "@aerokit/sdk/messaging";
+import { extensions } from "@aerokit/sdk/extensions";
+import { dao as daoApi } from "@aerokit/sdk/db";
 
 export interface PurchaseInvoiceStatusEntity {
     readonly Id: number;
@@ -52,6 +52,7 @@ export interface PurchaseInvoiceStatusEntityOptions {
     $order?: 'ASC' | 'DESC',
     $offset?: number,
     $limit?: number,
+    $language?: string
 }
 
 export interface PurchaseInvoiceStatusEntityEvent {
@@ -96,10 +97,11 @@ export class PurchaseInvoiceStatusRepository {
     }
 
     public findAll(options: PurchaseInvoiceStatusEntityOptions = {}): PurchaseInvoiceStatusEntity[] {
-        return this.dao.list(options);
+        let list = this.dao.list(options);
+        return list;
     }
 
-    public findById(id: number): PurchaseInvoiceStatusEntity | undefined {
+    public findById(id: number, options: PurchaseInvoiceStatusEntityOptions = {}): PurchaseInvoiceStatusEntity | undefined {
         const entity = this.dao.find(id);
         return entity ?? undefined;
     }
diff --git a/codbex-invoices/gen/codbex-invoices/dao/Settings/PurchaseInvoiceTypeRepository.ts b/codbex-invoices/gen/codbex-invoices/dao/Settings/PurchaseInvoiceTypeRepository.ts
index 4c5f6b9..e632a0d 100644
--- a/codbex-invoices/gen/codbex-invoices/dao/Settings/PurchaseInvoiceTypeRepository.ts
+++ b/codbex-invoices/gen/codbex-invoices/dao/Settings/PurchaseInvoiceTypeRepository.ts
@@ -1,7 +1,7 @@
-import { query } from "sdk/db";
-import { producer } from "sdk/messaging";
-import { extensions } from "sdk/extensions";
-import { dao as daoApi } from "sdk/db";
+import { sql, query } from "@aerokit/sdk/db";
+import { producer } from "@aerokit/sdk/messaging";
+import { extensions } from "@aerokit/sdk/extensions";
+import { dao as daoApi } from "@aerokit/sdk/db";
 
 export interface PurchaseInvoiceTypeEntity {
     readonly Id: number;
@@ -61,6 +61,7 @@ export interface PurchaseInvoiceTypeEntityOptions {
     $order?: 'ASC' | 'DESC',
     $offset?: number,
     $limit?: number,
+    $language?: string
 }
 
 export interface PurchaseInvoiceTypeEntityEvent {
@@ -111,10 +112,11 @@ export class PurchaseInvoiceTypeRepository {
     }
 
     public findAll(options: PurchaseInvoiceTypeEntityOptions = {}): PurchaseInvoiceTypeEntity[] {
-        return this.dao.list(options);
+        let list = this.dao.list(options);
+        return list;
     }
 
-    public findById(id: number): PurchaseInvoiceTypeEntity | undefined {
+    public findById(id: number, options: PurchaseInvoiceTypeEntityOptions = {}): PurchaseInvoiceTypeEntity | undefined {
         const entity = this.dao.find(id);
         return entity ?? undefined;
     }
diff --git a/codbex-invoices/gen/codbex-invoices/dao/Settings/SalesInvoiceStatusRepository.ts b/codbex-invoices/gen/codbex-invoices/dao/Settings/SalesInvoiceStatusRepository.ts
index ef2681b..fa3a1ed 100644
--- a/codbex-invoices/gen/codbex-invoices/dao/Settings/SalesInvoiceStatusRepository.ts
+++ b/codbex-invoices/gen/codbex-invoices/dao/Settings/SalesInvoiceStatusRepository.ts
@@ -1,7 +1,7 @@
-import { query } from "sdk/db";
-import { producer } from "sdk/messaging";
-import { extensions } from "sdk/extensions";
-import { dao as daoApi } from "sdk/db";
+import { sql, query } from "@aerokit/sdk/db";
+import { producer } from "@aerokit/sdk/messaging";
+import { extensions } from "@aerokit/sdk/extensions";
+import { dao as daoApi } from "@aerokit/sdk/db";
 
 export interface SalesInvoiceStatusEntity {
     readonly Id: number;
@@ -52,6 +52,7 @@ export interface SalesInvoiceStatusEntityOptions {
     $order?: 'ASC' | 'DESC',
     $offset?: number,
     $limit?: number,
+    $language?: string
 }
 
 export interface SalesInvoiceStatusEntityEvent {
@@ -96,10 +97,11 @@ export class SalesInvoiceStatusRepository {
     }
 
     public findAll(options: SalesInvoiceStatusEntityOptions = {}): SalesInvoiceStatusEntity[] {
-        return this.dao.list(options);
+        let list = this.dao.list(options);
+        return list;
     }
 
-    public findById(id: number): SalesInvoiceStatusEntity | undefined {
+    public findById(id: number, options: SalesInvoiceStatusEntityOptions = {}): SalesInvoiceStatusEntity | undefined {
         const entity = this.dao.find(id);
         return entity ?? undefined;
     }
diff --git a/codbex-invoices/gen/codbex-invoices/dao/Settings/SalesInvoiceTypeRepository.ts b/codbex-invoices/gen/codbex-invoices/dao/Settings/SalesInvoiceTypeRepository.ts
index 21d089c..c4ba676 100644
--- a/codbex-invoices/gen/codbex-invoices/dao/Settings/SalesInvoiceTypeRepository.ts
+++ b/codbex-invoices/gen/codbex-invoices/dao/Settings/SalesInvoiceTypeRepository.ts
@@ -1,7 +1,7 @@
-import { query } from "sdk/db";
-import { producer } from "sdk/messaging";
-import { extensions } from "sdk/extensions";
-import { dao as daoApi } from "sdk/db";
+import { sql, query } from "@aerokit/sdk/db";
+import { producer } from "@aerokit/sdk/messaging";
+import { extensions } from "@aerokit/sdk/extensions";
+import { dao as daoApi } from "@aerokit/sdk/db";
 
 export interface SalesInvoiceTypeEntity {
     readonly Id: number;
@@ -61,6 +61,7 @@ export interface SalesInvoiceTypeEntityOptions {
     $order?: 'ASC' | 'DESC',
     $offset?: number,
     $limit?: number,
+    $language?: string
 }
 
 export interface SalesInvoiceTypeEntityEvent {
@@ -111,10 +112,11 @@ export class SalesInvoiceTypeRepository {
     }
 
     public findAll(options: SalesInvoiceTypeEntityOptions = {}): SalesInvoiceTypeEntity[] {
-        return this.dao.list(options);
+        let list = this.dao.list(options);
+        return list;
     }
 
-    public findById(id: number): SalesInvoiceTypeEntity | undefined {
+    public findById(id: number, options: SalesInvoiceTypeEntityOptions = {}): SalesInvoiceTypeEntity | undefined {
         const entity = this.dao.find(id);
         return entity ?? undefined;
     }
diff --git a/codbex-invoices/gen/codbex-invoices/dao/Settings/SentMethodRepository.ts b/codbex-invoices/gen/codbex-invoices/dao/Settings/SentMethodRepository.ts
index f5d9f54..078a3bf 100644
--- a/codbex-invoices/gen/codbex-invoices/dao/Settings/SentMethodRepository.ts
+++ b/codbex-invoices/gen/codbex-invoices/dao/Settings/SentMethodRepository.ts
@@ -1,7 +1,7 @@
-import { query } from "sdk/db";
-import { producer } from "sdk/messaging";
-import { extensions } from "sdk/extensions";
-import { dao as daoApi } from "sdk/db";
+import { sql, query } from "@aerokit/sdk/db";
+import { producer } from "@aerokit/sdk/messaging";
+import { extensions } from "@aerokit/sdk/extensions";
+import { dao as daoApi } from "@aerokit/sdk/db";
 
 export interface SentMethodEntity {
     readonly Id: number;
@@ -52,6 +52,7 @@ export interface SentMethodEntityOptions {
     $order?: 'ASC' | 'DESC',
     $offset?: number,
     $limit?: number,
+    $language?: string
 }
 
 export interface SentMethodEntityEvent {
@@ -96,10 +97,11 @@ export class SentMethodRepository {
     }
 
     public findAll(options: SentMethodEntityOptions = {}): SentMethodEntity[] {
-        return this.dao.list(options);
+        let list = this.dao.list(options);
+        return list;
     }
 
-    public findById(id: number): SentMethodEntity | undefined {
+    public findById(id: number, options: SentMethodEntityOptions = {}): SentMethodEntity | undefined {
         const entity = this.dao.find(id);
         return entity ?? undefined;
     }
diff --git a/codbex-invoices/gen/codbex-invoices/dao/SupplierPayment/SupplierPaymentRepository.ts b/codbex-invoices/gen/codbex-invoices/dao/SupplierPayment/SupplierPaymentRepository.ts
index e0fceb9..11389eb 100644
--- a/codbex-invoices/gen/codbex-invoices/dao/SupplierPayment/SupplierPaymentRepository.ts
+++ b/codbex-invoices/gen/codbex-invoices/dao/SupplierPayment/SupplierPaymentRepository.ts
@@ -1,7 +1,7 @@
-import { query } from "sdk/db";
-import { producer } from "sdk/messaging";
-import { extensions } from "sdk/extensions";
-import { dao as daoApi } from "sdk/db";
+import { sql, query } from "@aerokit/sdk/db";
+import { producer } from "@aerokit/sdk/messaging";
+import { extensions } from "@aerokit/sdk/extensions";
+import { dao as daoApi } from "@aerokit/sdk/db";
 import { EntityUtils } from "../utils/EntityUtils";
 
 export interface SupplierPaymentEntity {
@@ -168,6 +168,7 @@ export interface SupplierPaymentEntityOptions {
     $order?: 'ASC' | 'DESC',
     $offset?: number,
     $limit?: number,
+    $language?: string
 }
 
 export interface SupplierPaymentEntityEvent {
@@ -281,14 +282,15 @@ export class SupplierPaymentRepository {
             options.$sort = "Date";
             options.$order = "DESC";
         }
-        return this.dao.list(options).map((e: SupplierPaymentEntity) => {
+        let list = this.dao.list(options).map((e: SupplierPaymentEntity) => {
             EntityUtils.setDate(e, "Date");
             EntityUtils.setDate(e, "Valor");
             return e;
         });
+        return list;
     }
 
-    public findById(id: number): SupplierPaymentEntity | undefined {
+    public findById(id: number, options: SupplierPaymentEntityOptions = {}): SupplierPaymentEntity | undefined {
         const entity = this.dao.find(id);
         EntityUtils.setDate(entity, "Date");
         EntityUtils.setDate(entity, "Valor");
diff --git a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoiceItem/controller.js b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoiceItem/controller.js
index 0112ce8..8b985c6 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoiceItem/controller.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoiceItem/controller.js
@@ -12,10 +12,10 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 		};
 
 		LocaleService.onInit(() => {
-			translated.yes = LocaleService.t('codbex-invoices:defaults.yes');
-			translated.no = LocaleService.t('codbex-invoices:defaults.no');
-			translated.deleteTitle = LocaleService.t('codbex-invoices:defaults.deleteTitle', { name: '$t(codbex-invoices:t.PURCHASEINVOICEITEM)' });
-			translated.deleteConfirm = LocaleService.t('codbex-invoices:messages.deleteConfirm', { name: '$t(codbex-invoices:t.PURCHASEINVOICEITEM)' });
+			translated.yes = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.yes');
+			translated.no = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.no');
+			translated.deleteTitle = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.deleteTitle', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM)' });
+			translated.deleteConfirm = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.deleteConfirm', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM)' });
 		});
 		//-----------------Custom Actions-------------------//
 		Extensions.getWindows(['codbex-invoices-custom-action']).then((response) => {
@@ -120,8 +120,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 				}, (error) => {
 					const message = error.data ? error.data.message : '';
 					Dialogs.showAlert({
-						title: LocaleService.t('codbex-invoices:t.PURCHASEINVOICEITEM'),
-						message: LocaleService.t('codbex-invoices:messages.error.unableToLF', { name: '$t(codbex-invoices:t.PURCHASEINVOICEITEM)', message: message }),
+						title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM'),
+						message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLF', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM)', message: message }),
 						type: AlertTypes.Error
 					});
 					console.error('EntityService:', error);
@@ -129,8 +129,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			}, (error) => {
 				const message = error.data ? error.data.message : '';
 				Dialogs.showAlert({
-					title: LocaleService.t('codbex-invoices:t.PURCHASEINVOICEITEM'),
-					message: LocaleService.t('codbex-invoices:messages.error.unableToCount', { name: '$t(codbex-invoices:t.PURCHASEINVOICEITEM)', message: message }),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM'),
+					message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToCount', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM)', message: message }),
 					type: AlertTypes.Error
 				});
 				console.error('EntityService:', error);
@@ -220,8 +220,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 					}, (error) => {
 						const message = error.data ? error.data.message : '';
 						Dialogs.showAlert({
-							title: LocaleService.t('codbex-invoices:t.PURCHASEINVOICEITEM'),
-							message: LocaleService.t('codbex-invoices:messages.error.unableToDelete', { name: '$t(codbex-invoices:t.PURCHASEINVOICEITEM)', message: message }),
+							title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM'),
+							message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToDelete', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM)', message: message }),
 							type: AlertTypes.Error,
 						});
 						console.error('EntityService:', error);
@@ -245,7 +245,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			const message = error.data ? error.data.message : '';
 			Dialogs.showAlert({
 				title: 'PurchaseInvoice',
-				message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+				message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 				type: AlertTypes.Error
 			});
 		});
@@ -260,7 +260,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			const message = error.data ? error.data.message : '';
 			Dialogs.showAlert({
 				title: 'UoM',
-				message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+				message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 				type: AlertTypes.Error
 			});
 		});
diff --git a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoiceItem/dialog-filter/index.html b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoiceItem/dialog-filter/index.html
index aaf4f69..30b17e2 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoiceItem/dialog-filter/index.html
+++ b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoiceItem/dialog-filter/index.html
@@ -17,40 +17,40 @@
 			<bk-message-strip class="fd-margin--md" ng-show="errorMessage" glyph="sap-icon--message-error" state="error" on-dismiss="clearErrorMessage()">{{ errorMessage }}</bk-message-strip>
 
             <bk-fieldset class="fd-padding-begin-end--sm" ng-form="forms.details">
-                <bk-form-group label="{{ 'codbex-invoices:defaults.formGrpFilter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICEITEM)'} }}" name="entityForm" transclude-classes="fd-container fd-form-layout-grid-container">
+                <bk-form-group label="{{ 'codbex-invoices:codbex-invoices-model.defaults.formGrpFilter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM)'} }}" name="entityForm" transclude-classes="fd-container fd-form-layout-grid-container">
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idName" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICEITEM_NAME' | t }}</bk-form-label>
+                        	<bk-form-label for="idName" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM_NAME' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--8">
-							<bk-form-input-message state="{{ forms.details['Name'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:messages.error.incorrectInput' | t}}">
+							<bk-form-input-message state="{{ forms.details['Name'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:codbex-invoices-model.messages.error.incorrectInput' | t}}">
 								<bk-input id="idName"
 	                                name="Name"
 	                                state="{{ forms.details['Name'].$valid ? '' : 'error' }}"
 	                                ng-model="entity.Name"
 									ng-maxlength="20.0"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICEITEM_NAME)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM_NAME)'} }}">
 	                            </bk-input>
 							</bk-form-input-message>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idQuantity" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICEITEM_QUANTITY' | t }}</bk-form-label>
+                        	<bk-form-label for="idQuantity" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM_QUANTITY' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--4">
 	                        <bk-step-input input-id="idQuantity"
 								name="Quantity"
 								state="{{ forms.details['Quantity'].$valid ? '' : 'error' }}"
 								ng-model="entity.Quantity"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICEITEM_QUANTITY)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM_QUANTITY)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idUoM" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICEITEM_UOM' | t }}</bk-form-label>
+                        	<bk-form-label for="idUoM" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM_UOM' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--8">
 	                        <bk-combobox-input input-id="idUoM"
@@ -58,76 +58,76 @@
 	                            state="{{ forms.details['UoM'].$valid ? '' : 'error' }}"
 	                            ng-model="entity.UoM"
 	                            dropdown-items="optionsUoM"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICEITEM_UOM)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'UoM'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'UoM'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM_UOM)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'UoM'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'UoM'} }}">
 	                        </bk-combobox-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idPrice" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICEITEM_PRICE' | t }}</bk-form-label>
+                        	<bk-form-label for="idPrice" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM_PRICE' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--4">
 	                        <bk-step-input input-id="idPrice"
 								name="Price"
 								state="{{ forms.details['Price'].$valid ? '' : 'error' }}"
 								ng-model="entity.Price"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICEITEM_PRICE)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM_PRICE)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idNet" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICEITEM_NET' | t }}</bk-form-label>
+                        	<bk-form-label for="idNet" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM_NET' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--4">
 	                        <bk-step-input input-id="idNet"
 								name="Net"
 								state="{{ forms.details['Net'].$valid ? '' : 'error' }}"
 								ng-model="entity.Net"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICEITEM_NET)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM_NET)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idVATRate" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICEITEM_VATRATE' | t }}</bk-form-label>
+                        	<bk-form-label for="idVATRate" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM_VATRATE' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--8">
-							<bk-form-input-message state="{{ forms.details['VATRate'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:messages.error.incorrectInput' | t}}">
+							<bk-form-input-message state="{{ forms.details['VATRate'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:codbex-invoices-model.messages.error.incorrectInput' | t}}">
 								<bk-input id="idVATRate"
 	                                name="VATRate"
 	                                state="{{ forms.details['VATRate'].$valid ? '' : 'error' }}"
 	                                ng-model="entity.VATRate"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICEITEM_VATRATE)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM_VATRATE)'} }}">
 	                            </bk-input>
 							</bk-form-input-message>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idVAT" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICEITEM_VAT' | t }}</bk-form-label>
+                        	<bk-form-label for="idVAT" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM_VAT' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--4">
 	                        <bk-step-input input-id="idVAT"
 								name="VAT"
 								state="{{ forms.details['VAT'].$valid ? '' : 'error' }}"
 								ng-model="entity.VAT"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICEITEM_VAT)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM_VAT)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idGross" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICEITEM_GROSS' | t }}</bk-form-label>
+                        	<bk-form-label for="idGross" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM_GROSS' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--4">
 	                        <bk-step-input input-id="idGross"
 								name="Gross"
 								state="{{ forms.details['Gross'].$valid ? '' : 'error' }}"
 								ng-model="entity.Gross"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICEITEM_GROSS)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM_GROSS)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
@@ -138,13 +138,13 @@
         <bk-bar bar-design="footer" compact="true" ng-show="action !== 'select'">
 			<bk-bar-right>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.filter' | t }}" state="emphasized" ng-click="filter()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.filter' | t }}" state="emphasized" ng-click="filter()"></bk-button>
 				</bk-bar-element>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.reset' | t }}" ng-click="resetFilter()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.reset' | t }}" ng-click="resetFilter()"></bk-button>
 				</bk-bar-element>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
 				</bk-bar-element>
 			</bk-bar-right>
 		</bk-bar>
diff --git a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoiceItem/dialog-filter/view.js b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoiceItem/dialog-filter/view.js
index cae6bb9..893c5ac 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoiceItem/dialog-filter/view.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoiceItem/dialog-filter/view.js
@@ -7,9 +7,9 @@ const viewData = {
     id: 'PurchaseInvoiceItem-filter',
     label: 'PurchaseInvoiceItem Filter',
     translation: {
-        key: 'codbex-invoices:extName',
+        key: 'codbex-invoices:codbex-invoices-model.extName',
         options: {
-            content: '$t(codbex-invoices:t.PURCHASEINVOICEITEM) $t(codbex-invoices:defaults.filter)',
+            content: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM) $t(codbex-invoices:codbex-invoices-model.defaults.filter)',
         }
     },
     path: '/services/web/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoiceItem/dialog-filter/index.html',
diff --git a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoiceItem/dialog-window/controller.js b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoiceItem/dialog-window/controller.js
index 8ff002c..abbe2b3 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoiceItem/dialog-window/controller.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoiceItem/dialog-window/controller.js
@@ -20,12 +20,12 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 		$scope.action = 'select';
 
 		LocaleService.onInit(() => {
-			description = LocaleService.t('codbex-invoices:defaults.description');
-			$scope.formHeaders.select = LocaleService.t('codbex-invoices:defaults.formHeadSelect', { name: '$t(codbex-invoices:t.PURCHASEINVOICEITEM)' });
-			$scope.formHeaders.create = LocaleService.t('codbex-invoices:defaults.formHeadCreate', { name: '$t(codbex-invoices:t.PURCHASEINVOICEITEM)' });
-			$scope.formHeaders.update = LocaleService.t('codbex-invoices:defaults.formHeadUpdate', { name: '$t(codbex-invoices:t.PURCHASEINVOICEITEM)' });
-			propertySuccessfullyCreated = LocaleService.t('codbex-invoices:messages.propertySuccessfullyCreated', { name: '$t(codbex-invoices:t.PURCHASEINVOICEITEM)' });
-			propertySuccessfullyUpdated = LocaleService.t('codbex-invoices:messages.propertySuccessfullyUpdated', { name: '$t(codbex-invoices:t.PURCHASEINVOICEITEM)' });
+			description = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.description');
+			$scope.formHeaders.select = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.formHeadSelect', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM)' });
+			$scope.formHeaders.create = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.formHeadCreate', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM)' });
+			$scope.formHeaders.update = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.formHeadUpdate', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM)' });
+			propertySuccessfullyCreated = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.propertySuccessfullyCreated', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM)' });
+			propertySuccessfullyUpdated = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.propertySuccessfullyUpdated', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM)' });
 		});
 
 		let params = ViewParameters.get();
@@ -44,7 +44,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			EntityService.create(entity).then((response) => {
 				Dialogs.postMessage({ topic: 'codbex-invoices.PurchaseInvoice.PurchaseInvoiceItem.entityCreated', data: response.data });
 				Notifications.show({
-					title: LocaleService.t('codbex-invoices:t.PURCHASEINVOICEITEM'),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM'),
 					description: propertySuccessfullyCreated,
 					type: 'positive'
 				});
@@ -52,8 +52,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			}, (error) => {
 				const message = error.data ? error.data.message : '';
 				Dialogs.showAlert({
-					title: LocaleService.t('codbex-invoices:t.PURCHASEINVOICEITEM'),
-					message: LocaleService.t('codbex-invoices:messages.error.unableToCreate', { name: '$t(codbex-invoices:t.PURCHASEINVOICEITEM)', message: message }),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM'),
+					message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToCreate', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM)', message: message }),
 					type: AlertTypes.Error
 				});
 				console.error('EntityService:', error);
@@ -67,7 +67,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			EntityService.update(id, entity).then((response) => {
 				Dialogs.postMessage({ topic: 'codbex-invoices.PurchaseInvoice.PurchaseInvoiceItem.entityUpdated', data: response.data });
 				Notifications.show({
-					title: LocaleService.t('codbex-invoices:t.PURCHASEINVOICEITEM'),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM'),
 					description: propertySuccessfullyUpdated,
 					type: 'positive'
 				});
@@ -75,8 +75,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			}, (error) => {
 				const message = error.data ? error.data.message : '';
 				Dialogs.showAlert({
-					title: LocaleService.t('codbex-invoices:t.PURCHASEINVOICEITEM'),
-					message: LocaleService.t('codbex-invoices:messages.error.unableToUpdate', { name: '$t(codbex-invoices:t.PURCHASEINVOICEITEM)', message: message }),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM'),
+					message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToUpdate', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM)', message: message }),
 					type: AlertTypes.Error
 				});
 				console.error('EntityService:', error);
diff --git a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoiceItem/dialog-window/index.html b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoiceItem/dialog-window/index.html
index f2191ac..17b131e 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoiceItem/dialog-window/index.html
+++ b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoiceItem/dialog-window/index.html
@@ -19,10 +19,10 @@
                 <bk-form-group label="{{formHeaders[action]}}" name="entityForm" transclude-classes="fd-container fd-form-layout-grid-container">
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idName" ng-required="true" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICEITEM_NAME' | t }}</bk-form-label>
+                        	<bk-form-label for="idName" ng-required="true" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM_NAME' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
-							<bk-form-input-message state="{{ forms.details['Name'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:messages.error.pattern' | t:{'rule':''} }}">
+							<bk-form-input-message state="{{ forms.details['Name'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:codbex-invoices-model.messages.error.pattern' | t:{'rule':''} }}">
 								<bk-input id="idName"
 	                                name="Name"
 	                                state="{{ forms.details['Name'].$valid ? '' : 'error' }}"
@@ -32,14 +32,14 @@
 									ng-maxlength="20.0"
 	                                input-rules="{ patterns: [''] }"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICEITEM_NAME)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM_NAME)'} }}">
 	                            </bk-input>
 							</bk-form-input-message>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idQuantity" ng-required="true" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICEITEM_QUANTITY' | t }}</bk-form-label>
+                        	<bk-form-label for="idQuantity" ng-required="true" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM_QUANTITY' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--4 ">
 	                        <bk-step-input input-id="idQuantity"
@@ -48,13 +48,13 @@
 								ng-required="true"
 								ng-model="entity.Quantity"
 								is-readonly="action === 'select'"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICEITEM_QUANTITY)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM_QUANTITY)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idUoM" ng-required="true" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICEITEM_UOM' | t }}</bk-form-label>
+                        	<bk-form-label for="idUoM" ng-required="true" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM_UOM' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
 	                        <bk-combobox-input input-id="idUoM"
@@ -64,14 +64,14 @@
 	                            ng-model="entity.UoM"
 	                            is-readonly="action === 'select'"
 	                            dropdown-items="optionsUoM"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICEITEM_UOM)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'UoM'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'UoM'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM_UOM)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'UoM'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'UoM'} }}">
 	                        </bk-combobox-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idPrice" ng-required="true" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICEITEM_PRICE' | t }}</bk-form-label>
+                        	<bk-form-label for="idPrice" ng-required="true" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM_PRICE' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--4 ">
 	                        <bk-step-input input-id="idPrice"
@@ -80,29 +80,29 @@
 								ng-required="true"
 								ng-model="entity.Price"
 								is-readonly="action === 'select'"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICEITEM_PRICE)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM_PRICE)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idNet" ng-required="false" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICEITEM_NET' | t }}</bk-form-label>
+                        	<bk-form-label for="idNet" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM_NET' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--4 ">
 	                        <bk-step-input input-id="idNet"
 								name="Net"
 								ng-model="entity.Net"
 								is-readonly="true"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICEITEM_NET)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM_NET)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idVATRate" ng-required="false" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICEITEM_VATRATE' | t }}</bk-form-label>
+                        	<bk-form-label for="idVATRate" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM_VATRATE' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
-							<bk-form-input-message state="{{ forms.details['VATRate'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:messages.error.pattern' | t:{'rule':''} }}">
+							<bk-form-input-message state="{{ forms.details['VATRate'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:codbex-invoices-model.messages.error.pattern' | t:{'rule':''} }}">
 								<bk-input id="idVATRate"
 	                                name="VATRate"
 	                                state="{{ forms.details['VATRate'].$valid ? '' : 'error' }}"
@@ -111,34 +111,34 @@
 	                                ng-readonly="action === 'select'"
 	                                input-rules="{ patterns: [''] }"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICEITEM_VATRATE)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM_VATRATE)'} }}">
 	                            </bk-input>
 							</bk-form-input-message>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idVAT" ng-required="false" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICEITEM_VAT' | t }}</bk-form-label>
+                        	<bk-form-label for="idVAT" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM_VAT' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--4 ">
 	                        <bk-step-input input-id="idVAT"
 								name="VAT"
 								ng-model="entity.VAT"
 								is-readonly="true"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICEITEM_VAT)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM_VAT)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idGross" ng-required="false" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICEITEM_GROSS' | t }}</bk-form-label>
+                        	<bk-form-label for="idGross" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM_GROSS' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--4 ">
 	                        <bk-step-input input-id="idGross"
 								name="Gross"
 								ng-model="entity.Gross"
 								is-readonly="true"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICEITEM_GROSS)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM_GROSS)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
@@ -149,11 +149,11 @@
 		<bk-bar bar-design="footer" compact="true" ng-show="action !== 'select'">
 			<bk-bar-right>
 				<bk-bar-element>
-					<bk-button ng-if="action === 'create'" label="{{'codbex-invoices:defaults.create' | t}}" state="emphasized" ng-click="create()" ng-disabled="!forms.details.$valid"></bk-button>
-					<bk-button ng-if="action !== 'create'" label="{{'codbex-invoices:defaults.update' | t}}" state="emphasized" ng-click="update()" ng-disabled="!forms.details.$valid"></bk-button>
+					<bk-button ng-if="action === 'create'" label="{{'codbex-invoices:codbex-invoices-model.defaults.create' | t}}" state="emphasized" ng-click="create()" ng-disabled="!forms.details.$valid"></bk-button>
+					<bk-button ng-if="action !== 'create'" label="{{'codbex-invoices:codbex-invoices-model.defaults.update' | t}}" state="emphasized" ng-click="update()" ng-disabled="!forms.details.$valid"></bk-button>
 				</bk-bar-element>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
 				</bk-bar-element>
 			</bk-bar-right>
 		</bk-bar>
diff --git a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoiceItem/dialog-window/view.js b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoiceItem/dialog-window/view.js
index 213b2ac..6151d36 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoiceItem/dialog-window/view.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoiceItem/dialog-window/view.js
@@ -7,7 +7,7 @@ const viewData = {
     id: 'PurchaseInvoiceItem-details',
     label: 'PurchaseInvoiceItem',
     translation: {
-        key: 'codbex-invoices:t.PURCHASEINVOICEITEM',
+        key: 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM',
     },
     path: '/services/web/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoiceItem/dialog-window/index.html',
     perspectiveName: 'PurchaseInvoice'
diff --git a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoiceItem/index.html b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoiceItem/index.html
index 05bfb03..0d850ca 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoiceItem/index.html
+++ b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoiceItem/index.html
@@ -15,34 +15,34 @@
 
 	<body class="bk-vbox">
 		<bk-message-page glyph="sap-icon--hint" ng-show="data == null">
-			<bk-message-page-title>{{'codbex-invoices:messages.detailSelectRecord' | t}}</bk-message-page-title>
+			<bk-message-page-title>{{'codbex-invoices:codbex-invoices-model.messages.detailSelectRecord' | t}}</bk-message-page-title>
 		</bk-message-page>
 
 		<bk-toolbar has-title="true" ng-hide="data == null">
-			<bk-toolbar-title>{{'codbex-invoices:defaults.items' | t}} <span bk-object-status text="{{dataCount}}" inverted="true"></bk-toolbar-title>
-			<bk-button compact="true" state="transparent" label="{{ 'codbex-invoices:defaults.filter' | t }}" ng-click="openFilter()"></bk-button>
+			<bk-toolbar-title>{{'codbex-invoices:codbex-invoices-model.defaults.items' | t}} <span bk-object-status text="{{dataCount}}" inverted="true"></bk-toolbar-title>
+			<bk-button compact="true" state="transparent" label="{{ 'codbex-invoices:codbex-invoices-model.defaults.filter' | t }}" ng-click="openFilter()"></bk-button>
 			<bk-button ng-repeat="action in pageActions track by $index" compact="true" state="transparent" label="{{action.translation.key | t:action.translation.options:action.label}}" ng-click="triggerPageAction(action)"></bk-button>
 			<bk-toolbar-spacer></bk-toolbar-spacer>
-			<bk-button compact="true" state="emphasized" label="{{'codbex-invoices:defaults.create' | t}}" ng-click="createEntity()" ng-disabled="selectedMainEntityId == null"></bk-button>
+			<bk-button compact="true" state="emphasized" label="{{'codbex-invoices:codbex-invoices-model.defaults.create' | t}}" ng-click="createEntity()" ng-disabled="selectedMainEntityId == null"></bk-button>
 		</bk-toolbar>
 		<bk-scrollbar class="bk-full-height" ng-hide="data == null">
 			<table bk-table display-mode="compact" inner-borders="top" outer-borders="none">
 				<thead bk-table-header sticky="true">
 					<tr bk-table-row>
-						<th bk-table-header-cell>{{ 'codbex-invoices:t.PURCHASEINVOICEITEM_NAME' | t:'Name' }}</th>
-						<th bk-table-header-cell>{{ 'codbex-invoices:t.PURCHASEINVOICEITEM_QUANTITY' | t:'Quantity' }}</th>
-						<th bk-table-header-cell>{{ 'codbex-invoices:t.PURCHASEINVOICEITEM_UOM' | t:'UoM' }}</th>
-						<th bk-table-header-cell>{{ 'codbex-invoices:t.PURCHASEINVOICEITEM_PRICE' | t:'Price' }}</th>
-						<th bk-table-header-cell>{{ 'codbex-invoices:t.PURCHASEINVOICEITEM_NET' | t:'Net' }}</th>
-						<th bk-table-header-cell>{{ 'codbex-invoices:t.PURCHASEINVOICEITEM_VATRATE' | t:'VATRate' }}</th>
-						<th bk-table-header-cell>{{ 'codbex-invoices:t.PURCHASEINVOICEITEM_VAT' | t:'VAT' }}</th>
-						<th bk-table-header-cell>{{ 'codbex-invoices:t.PURCHASEINVOICEITEM_GROSS' | t:'Gross' }}</th>
+						<th bk-table-header-cell>{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM_NAME' | t:'Name' }}</th>
+						<th bk-table-header-cell>{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM_QUANTITY' | t:'Quantity' }}</th>
+						<th bk-table-header-cell>{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM_UOM' | t:'UoM' }}</th>
+						<th bk-table-header-cell>{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM_PRICE' | t:'Price' }}</th>
+						<th bk-table-header-cell>{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM_NET' | t:'Net' }}</th>
+						<th bk-table-header-cell>{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM_VATRATE' | t:'VATRate' }}</th>
+						<th bk-table-header-cell>{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM_VAT' | t:'VAT' }}</th>
+						<th bk-table-header-cell>{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM_GROSS' | t:'Gross' }}</th>
 						<th bk-table-header-cell></th>
 					</tr>
 				</thead>
 				<tbody bk-table-body>
 					<tr bk-table-row hoverable="true" ng-show="data.length == 0">
-						<td bk-table-cell no-data="true">{{'codbex-invoices:messages.noData' | t}}</td>
+						<td bk-table-cell no-data="true">{{'codbex-invoices:codbex-invoices-model.messages.noData' | t}}</td>
 					</tr>
 					<tr bk-table-row hoverable="true" ng-repeat="next in data track by $index" selected="next.Id === selectedEntity.Id" ng-click="selectEntity(next)">
 						<td bk-table-cell ng-click="openDetails(next)" hoverable="true" activable="true">{{next.Name}}</td>
@@ -58,14 +58,14 @@
 						<td bk-table-cell fit-content="true">
 							<bk-popover>
 								<bk-popover-control>
-									<bk-button compact="true" glyph="sap-icon--overflow" state="transparent" aria-label="{{'codbex-invoices:aria.tableRowMenuBtn' | t}}" ng-click="setTristate()"></bk-button>
+									<bk-button compact="true" glyph="sap-icon--overflow" state="transparent" aria-label="{{'codbex-invoices:codbex-invoices-model.aria.tableRowMenuBtn' | t}}" ng-click="setTristate()"></bk-button>
 								</bk-popover-control>
 								<bk-popover-body align="bottom-right">
-									<bk-menu aria-label="{{'codbex-invoices:aria.tableRowMenu' | t}}" no-backdrop="true" no-shadow="true">
+									<bk-menu aria-label="{{'codbex-invoices:codbex-invoices-model.aria.tableRowMenu' | t}}" no-backdrop="true" no-shadow="true">
 										<bk-menu-item ng-repeat="action in entityActions" title="{{action.translation.key | t:action.translation.options:action.label}}" ng-click="triggerEntityAction(action)"></bk-menu-item>
-										<bk-menu-item title="{{ 'codbex-invoices:defaults.viewDetails' | t }}" ng-click="openDetails(next)"></bk-menu-item>
-										<bk-menu-item title="{{ 'codbex-invoices:defaults.edit' | t }}" ng-click="updateEntity(next)"></bk-menu-item>
-										<bk-menu-item title="{{ 'codbex-invoices:defaults.delete' | t }}" ng-click="deleteEntity(next)"></bk-menu-item>
+										<bk-menu-item title="{{ 'codbex-invoices:codbex-invoices-model.defaults.viewDetails' | t }}" ng-click="openDetails(next)"></bk-menu-item>
+										<bk-menu-item title="{{ 'codbex-invoices:codbex-invoices-model.defaults.edit' | t }}" ng-click="updateEntity(next)"></bk-menu-item>
+										<bk-menu-item title="{{ 'codbex-invoices:codbex-invoices-model.defaults.delete' | t }}" ng-click="deleteEntity(next)"></bk-menu-item>
 									</bk-menu>
 								</bk-popover-body>
 							</bk-popover>
diff --git a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoiceItem/view.js b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoiceItem/view.js
index 1d22ed4..67643bf 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoiceItem/view.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoiceItem/view.js
@@ -7,7 +7,7 @@ const viewData = {
     id: 'PurchaseInvoiceItem',
     label: 'PurchaseInvoiceItem',
     translation: {
-        key: 'codbex-invoices:t.PURCHASEINVOICEITEM',
+        key: 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEITEM',
     },
     region: 'bottom',
     lazyLoad: false,
diff --git a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoicePayment/controller.js b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoicePayment/controller.js
index ada3e58..8f63d71 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoicePayment/controller.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoicePayment/controller.js
@@ -12,10 +12,10 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 		};
 
 		LocaleService.onInit(() => {
-			translated.yes = LocaleService.t('codbex-invoices:defaults.yes');
-			translated.no = LocaleService.t('codbex-invoices:defaults.no');
-			translated.deleteTitle = LocaleService.t('codbex-invoices:defaults.deleteTitle', { name: '$t(codbex-invoices:t.PURCHASEINVOICEPAYMENT)' });
-			translated.deleteConfirm = LocaleService.t('codbex-invoices:messages.deleteConfirm', { name: '$t(codbex-invoices:t.PURCHASEINVOICEPAYMENT)' });
+			translated.yes = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.yes');
+			translated.no = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.no');
+			translated.deleteTitle = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.deleteTitle', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEPAYMENT)' });
+			translated.deleteConfirm = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.deleteConfirm', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEPAYMENT)' });
 		});
 		//-----------------Custom Actions-------------------//
 		Extensions.getWindows(['codbex-invoices-custom-action']).then((response) => {
@@ -120,8 +120,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 				}, (error) => {
 					const message = error.data ? error.data.message : '';
 					Dialogs.showAlert({
-						title: LocaleService.t('codbex-invoices:t.PURCHASEINVOICEPAYMENT'),
-						message: LocaleService.t('codbex-invoices:messages.error.unableToLF', { name: '$t(codbex-invoices:t.PURCHASEINVOICEPAYMENT)', message: message }),
+						title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEPAYMENT'),
+						message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLF', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEPAYMENT)', message: message }),
 						type: AlertTypes.Error
 					});
 					console.error('EntityService:', error);
@@ -129,8 +129,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			}, (error) => {
 				const message = error.data ? error.data.message : '';
 				Dialogs.showAlert({
-					title: LocaleService.t('codbex-invoices:t.PURCHASEINVOICEPAYMENT'),
-					message: LocaleService.t('codbex-invoices:messages.error.unableToCount', { name: '$t(codbex-invoices:t.PURCHASEINVOICEPAYMENT)', message: message }),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEPAYMENT'),
+					message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToCount', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEPAYMENT)', message: message }),
 					type: AlertTypes.Error
 				});
 				console.error('EntityService:', error);
@@ -220,8 +220,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 					}, (error) => {
 						const message = error.data ? error.data.message : '';
 						Dialogs.showAlert({
-							title: LocaleService.t('codbex-invoices:t.PURCHASEINVOICEPAYMENT'),
-							message: LocaleService.t('codbex-invoices:messages.error.unableToDelete', { name: '$t(codbex-invoices:t.PURCHASEINVOICEPAYMENT)', message: message }),
+							title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEPAYMENT'),
+							message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToDelete', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEPAYMENT)', message: message }),
 							type: AlertTypes.Error,
 						});
 						console.error('EntityService:', error);
@@ -245,7 +245,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			const message = error.data ? error.data.message : '';
 			Dialogs.showAlert({
 				title: 'PurchaseInvoice',
-				message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+				message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 				type: AlertTypes.Error
 			});
 		});
@@ -260,7 +260,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			const message = error.data ? error.data.message : '';
 			Dialogs.showAlert({
 				title: 'SupplierPayment',
-				message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+				message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 				type: AlertTypes.Error
 			});
 		});
diff --git a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoicePayment/dialog-filter/index.html b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoicePayment/dialog-filter/index.html
index 20119b3..a1f2b89 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoicePayment/dialog-filter/index.html
+++ b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoicePayment/dialog-filter/index.html
@@ -17,10 +17,10 @@
 			<bk-message-strip class="fd-margin--md" ng-show="errorMessage" glyph="sap-icon--message-error" state="error" on-dismiss="clearErrorMessage()">{{ errorMessage }}</bk-message-strip>
 
             <bk-fieldset class="fd-padding-begin-end--sm" ng-form="forms.details">
-                <bk-form-group label="{{ 'codbex-invoices:defaults.formGrpFilter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICEPAYMENT)'} }}" name="entityForm" transclude-classes="fd-container fd-form-layout-grid-container">
+                <bk-form-group label="{{ 'codbex-invoices:codbex-invoices-model.defaults.formGrpFilter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEPAYMENT)'} }}" name="entityForm" transclude-classes="fd-container fd-form-layout-grid-container">
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idSupplierPayment" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICEPAYMENT_SUPPLIERPAYMENT' | t }}</bk-form-label>
+                        	<bk-form-label for="idSupplierPayment" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEPAYMENT_SUPPLIERPAYMENT' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--8">
 	                        <bk-combobox-input input-id="idSupplierPayment"
@@ -28,21 +28,21 @@
 	                            state="{{ forms.details['SupplierPayment'].$valid ? '' : 'error' }}"
 	                            ng-model="entity.SupplierPayment"
 	                            dropdown-items="optionsSupplierPayment"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICEPAYMENT_SUPPLIERPAYMENT)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'SupplierPayment'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'SupplierPayment'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEPAYMENT_SUPPLIERPAYMENT)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'SupplierPayment'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'SupplierPayment'} }}">
 	                        </bk-combobox-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idAmount" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICEPAYMENT_AMOUNT' | t }}</bk-form-label>
+                        	<bk-form-label for="idAmount" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEPAYMENT_AMOUNT' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--4">
 	                        <bk-step-input input-id="idAmount"
 								name="Amount"
 								state="{{ forms.details['Amount'].$valid ? '' : 'error' }}"
 								ng-model="entity.Amount"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICEPAYMENT_AMOUNT)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEPAYMENT_AMOUNT)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
@@ -53,13 +53,13 @@
         <bk-bar bar-design="footer" compact="true" ng-show="action !== 'select'">
 			<bk-bar-right>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.filter' | t }}" state="emphasized" ng-click="filter()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.filter' | t }}" state="emphasized" ng-click="filter()"></bk-button>
 				</bk-bar-element>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.reset' | t }}" ng-click="resetFilter()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.reset' | t }}" ng-click="resetFilter()"></bk-button>
 				</bk-bar-element>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
 				</bk-bar-element>
 			</bk-bar-right>
 		</bk-bar>
diff --git a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoicePayment/dialog-filter/view.js b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoicePayment/dialog-filter/view.js
index a0b2e08..d90dda6 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoicePayment/dialog-filter/view.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoicePayment/dialog-filter/view.js
@@ -7,9 +7,9 @@ const viewData = {
     id: 'PurchaseInvoicePayment-filter',
     label: 'PurchaseInvoicePayment Filter',
     translation: {
-        key: 'codbex-invoices:extName',
+        key: 'codbex-invoices:codbex-invoices-model.extName',
         options: {
-            content: '$t(codbex-invoices:t.PURCHASEINVOICEPAYMENT) $t(codbex-invoices:defaults.filter)',
+            content: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEPAYMENT) $t(codbex-invoices:codbex-invoices-model.defaults.filter)',
         }
     },
     path: '/services/web/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoicePayment/dialog-filter/index.html',
diff --git a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoicePayment/dialog-window/controller.js b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoicePayment/dialog-window/controller.js
index e5e1f83..f68500f 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoicePayment/dialog-window/controller.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoicePayment/dialog-window/controller.js
@@ -20,12 +20,12 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 		$scope.action = 'select';
 
 		LocaleService.onInit(() => {
-			description = LocaleService.t('codbex-invoices:defaults.description');
-			$scope.formHeaders.select = LocaleService.t('codbex-invoices:defaults.formHeadSelect', { name: '$t(codbex-invoices:t.PURCHASEINVOICEPAYMENT)' });
-			$scope.formHeaders.create = LocaleService.t('codbex-invoices:defaults.formHeadCreate', { name: '$t(codbex-invoices:t.PURCHASEINVOICEPAYMENT)' });
-			$scope.formHeaders.update = LocaleService.t('codbex-invoices:defaults.formHeadUpdate', { name: '$t(codbex-invoices:t.PURCHASEINVOICEPAYMENT)' });
-			propertySuccessfullyCreated = LocaleService.t('codbex-invoices:messages.propertySuccessfullyCreated', { name: '$t(codbex-invoices:t.PURCHASEINVOICEPAYMENT)' });
-			propertySuccessfullyUpdated = LocaleService.t('codbex-invoices:messages.propertySuccessfullyUpdated', { name: '$t(codbex-invoices:t.PURCHASEINVOICEPAYMENT)' });
+			description = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.description');
+			$scope.formHeaders.select = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.formHeadSelect', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEPAYMENT)' });
+			$scope.formHeaders.create = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.formHeadCreate', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEPAYMENT)' });
+			$scope.formHeaders.update = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.formHeadUpdate', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEPAYMENT)' });
+			propertySuccessfullyCreated = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.propertySuccessfullyCreated', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEPAYMENT)' });
+			propertySuccessfullyUpdated = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.propertySuccessfullyUpdated', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEPAYMENT)' });
 		});
 
 		let params = ViewParameters.get();
@@ -44,7 +44,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			EntityService.create(entity).then((response) => {
 				Dialogs.postMessage({ topic: 'codbex-invoices.PurchaseInvoice.PurchaseInvoicePayment.entityCreated', data: response.data });
 				Notifications.show({
-					title: LocaleService.t('codbex-invoices:t.PURCHASEINVOICEPAYMENT'),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEPAYMENT'),
 					description: propertySuccessfullyCreated,
 					type: 'positive'
 				});
@@ -52,8 +52,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			}, (error) => {
 				const message = error.data ? error.data.message : '';
 				Dialogs.showAlert({
-					title: LocaleService.t('codbex-invoices:t.PURCHASEINVOICEPAYMENT'),
-					message: LocaleService.t('codbex-invoices:messages.error.unableToCreate', { name: '$t(codbex-invoices:t.PURCHASEINVOICEPAYMENT)', message: message }),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEPAYMENT'),
+					message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToCreate', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEPAYMENT)', message: message }),
 					type: AlertTypes.Error
 				});
 				console.error('EntityService:', error);
@@ -67,7 +67,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			EntityService.update(id, entity).then((response) => {
 				Dialogs.postMessage({ topic: 'codbex-invoices.PurchaseInvoice.PurchaseInvoicePayment.entityUpdated', data: response.data });
 				Notifications.show({
-					title: LocaleService.t('codbex-invoices:t.PURCHASEINVOICEPAYMENT'),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEPAYMENT'),
 					description: propertySuccessfullyUpdated,
 					type: 'positive'
 				});
@@ -75,8 +75,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			}, (error) => {
 				const message = error.data ? error.data.message : '';
 				Dialogs.showAlert({
-					title: LocaleService.t('codbex-invoices:t.PURCHASEINVOICEPAYMENT'),
-					message: LocaleService.t('codbex-invoices:messages.error.unableToUpdate', { name: '$t(codbex-invoices:t.PURCHASEINVOICEPAYMENT)', message: message }),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEPAYMENT'),
+					message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToUpdate', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEPAYMENT)', message: message }),
 					type: AlertTypes.Error
 				});
 				console.error('EntityService:', error);
diff --git a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoicePayment/dialog-window/index.html b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoicePayment/dialog-window/index.html
index e6b7797..3e033fb 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoicePayment/dialog-window/index.html
+++ b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoicePayment/dialog-window/index.html
@@ -19,7 +19,7 @@
                 <bk-form-group label="{{formHeaders[action]}}" name="entityForm" transclude-classes="fd-container fd-form-layout-grid-container">
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idSupplierPayment" ng-required="false" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICEPAYMENT_SUPPLIERPAYMENT' | t }}</bk-form-label>
+                        	<bk-form-label for="idSupplierPayment" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEPAYMENT_SUPPLIERPAYMENT' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
 	                        <bk-combobox-input input-id="idSupplierPayment"
@@ -29,14 +29,14 @@
 	                            ng-model="entity.SupplierPayment"
 	                            is-readonly="action === 'select'"
 	                            dropdown-items="optionsSupplierPayment"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICEPAYMENT_SUPPLIERPAYMENT)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'SupplierPayment'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'SupplierPayment'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEPAYMENT_SUPPLIERPAYMENT)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'SupplierPayment'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'SupplierPayment'} }}">
 	                        </bk-combobox-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idAmount" ng-required="true" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICEPAYMENT_AMOUNT' | t }}</bk-form-label>
+                        	<bk-form-label for="idAmount" ng-required="true" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEPAYMENT_AMOUNT' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--4 ">
 	                        <bk-step-input input-id="idAmount"
@@ -45,7 +45,7 @@
 								ng-required="true"
 								ng-model="entity.Amount"
 								is-readonly="action === 'select'"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICEPAYMENT_AMOUNT)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEPAYMENT_AMOUNT)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
@@ -56,11 +56,11 @@
 		<bk-bar bar-design="footer" compact="true" ng-show="action !== 'select'">
 			<bk-bar-right>
 				<bk-bar-element>
-					<bk-button ng-if="action === 'create'" label="{{'codbex-invoices:defaults.create' | t}}" state="emphasized" ng-click="create()" ng-disabled="!forms.details.$valid"></bk-button>
-					<bk-button ng-if="action !== 'create'" label="{{'codbex-invoices:defaults.update' | t}}" state="emphasized" ng-click="update()" ng-disabled="!forms.details.$valid"></bk-button>
+					<bk-button ng-if="action === 'create'" label="{{'codbex-invoices:codbex-invoices-model.defaults.create' | t}}" state="emphasized" ng-click="create()" ng-disabled="!forms.details.$valid"></bk-button>
+					<bk-button ng-if="action !== 'create'" label="{{'codbex-invoices:codbex-invoices-model.defaults.update' | t}}" state="emphasized" ng-click="update()" ng-disabled="!forms.details.$valid"></bk-button>
 				</bk-bar-element>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
 				</bk-bar-element>
 			</bk-bar-right>
 		</bk-bar>
diff --git a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoicePayment/dialog-window/view.js b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoicePayment/dialog-window/view.js
index 6f32c9c..83caac4 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoicePayment/dialog-window/view.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoicePayment/dialog-window/view.js
@@ -7,7 +7,7 @@ const viewData = {
     id: 'PurchaseInvoicePayment-details',
     label: 'PurchaseInvoicePayment',
     translation: {
-        key: 'codbex-invoices:t.PURCHASEINVOICEPAYMENT',
+        key: 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEPAYMENT',
     },
     path: '/services/web/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoicePayment/dialog-window/index.html',
     perspectiveName: 'PurchaseInvoice'
diff --git a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoicePayment/index.html b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoicePayment/index.html
index e2f8dfe..0b2214e 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoicePayment/index.html
+++ b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoicePayment/index.html
@@ -15,28 +15,28 @@
 
 	<body class="bk-vbox">
 		<bk-message-page glyph="sap-icon--hint" ng-show="data == null">
-			<bk-message-page-title>{{'codbex-invoices:messages.detailSelectRecord' | t}}</bk-message-page-title>
+			<bk-message-page-title>{{'codbex-invoices:codbex-invoices-model.messages.detailSelectRecord' | t}}</bk-message-page-title>
 		</bk-message-page>
 
 		<bk-toolbar has-title="true" ng-hide="data == null">
-			<bk-toolbar-title>{{'codbex-invoices:defaults.items' | t}} <span bk-object-status text="{{dataCount}}" inverted="true"></bk-toolbar-title>
-			<bk-button compact="true" state="transparent" label="{{ 'codbex-invoices:defaults.filter' | t }}" ng-click="openFilter()"></bk-button>
+			<bk-toolbar-title>{{'codbex-invoices:codbex-invoices-model.defaults.items' | t}} <span bk-object-status text="{{dataCount}}" inverted="true"></bk-toolbar-title>
+			<bk-button compact="true" state="transparent" label="{{ 'codbex-invoices:codbex-invoices-model.defaults.filter' | t }}" ng-click="openFilter()"></bk-button>
 			<bk-button ng-repeat="action in pageActions track by $index" compact="true" state="transparent" label="{{action.translation.key | t:action.translation.options:action.label}}" ng-click="triggerPageAction(action)"></bk-button>
 			<bk-toolbar-spacer></bk-toolbar-spacer>
-			<bk-button compact="true" state="emphasized" label="{{'codbex-invoices:defaults.create' | t}}" ng-click="createEntity()" ng-disabled="selectedMainEntityId == null"></bk-button>
+			<bk-button compact="true" state="emphasized" label="{{'codbex-invoices:codbex-invoices-model.defaults.create' | t}}" ng-click="createEntity()" ng-disabled="selectedMainEntityId == null"></bk-button>
 		</bk-toolbar>
 		<bk-scrollbar class="bk-full-height" ng-hide="data == null">
 			<table bk-table display-mode="compact" inner-borders="top" outer-borders="none">
 				<thead bk-table-header sticky="true">
 					<tr bk-table-row>
-						<th bk-table-header-cell>{{ 'codbex-invoices:t.PURCHASEINVOICEPAYMENT_SUPPLIERPAYMENT' | t:'SupplierPayment' }}</th>
-						<th bk-table-header-cell>{{ 'codbex-invoices:t.PURCHASEINVOICEPAYMENT_AMOUNT' | t:'Amount' }}</th>
+						<th bk-table-header-cell>{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEPAYMENT_SUPPLIERPAYMENT' | t:'SupplierPayment' }}</th>
+						<th bk-table-header-cell>{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEPAYMENT_AMOUNT' | t:'Amount' }}</th>
 						<th bk-table-header-cell></th>
 					</tr>
 				</thead>
 				<tbody bk-table-body>
 					<tr bk-table-row hoverable="true" ng-show="data.length == 0">
-						<td bk-table-cell no-data="true">{{'codbex-invoices:messages.noData' | t}}</td>
+						<td bk-table-cell no-data="true">{{'codbex-invoices:codbex-invoices-model.messages.noData' | t}}</td>
 					</tr>
 					<tr bk-table-row hoverable="true" ng-repeat="next in data track by $index" selected="next.Id === selectedEntity.Id" ng-click="selectEntity(next)">
 						<td bk-table-cell ng-click="openDetails(next)" hoverable="true" activable="true">
@@ -46,14 +46,14 @@
 						<td bk-table-cell fit-content="true">
 							<bk-popover>
 								<bk-popover-control>
-									<bk-button compact="true" glyph="sap-icon--overflow" state="transparent" aria-label="{{'codbex-invoices:aria.tableRowMenuBtn' | t}}" ng-click="setTristate()"></bk-button>
+									<bk-button compact="true" glyph="sap-icon--overflow" state="transparent" aria-label="{{'codbex-invoices:codbex-invoices-model.aria.tableRowMenuBtn' | t}}" ng-click="setTristate()"></bk-button>
 								</bk-popover-control>
 								<bk-popover-body align="bottom-right">
-									<bk-menu aria-label="{{'codbex-invoices:aria.tableRowMenu' | t}}" no-backdrop="true" no-shadow="true">
+									<bk-menu aria-label="{{'codbex-invoices:codbex-invoices-model.aria.tableRowMenu' | t}}" no-backdrop="true" no-shadow="true">
 										<bk-menu-item ng-repeat="action in entityActions" title="{{action.translation.key | t:action.translation.options:action.label}}" ng-click="triggerEntityAction(action)"></bk-menu-item>
-										<bk-menu-item title="{{ 'codbex-invoices:defaults.viewDetails' | t }}" ng-click="openDetails(next)"></bk-menu-item>
-										<bk-menu-item title="{{ 'codbex-invoices:defaults.edit' | t }}" ng-click="updateEntity(next)"></bk-menu-item>
-										<bk-menu-item title="{{ 'codbex-invoices:defaults.delete' | t }}" ng-click="deleteEntity(next)"></bk-menu-item>
+										<bk-menu-item title="{{ 'codbex-invoices:codbex-invoices-model.defaults.viewDetails' | t }}" ng-click="openDetails(next)"></bk-menu-item>
+										<bk-menu-item title="{{ 'codbex-invoices:codbex-invoices-model.defaults.edit' | t }}" ng-click="updateEntity(next)"></bk-menu-item>
+										<bk-menu-item title="{{ 'codbex-invoices:codbex-invoices-model.defaults.delete' | t }}" ng-click="deleteEntity(next)"></bk-menu-item>
 									</bk-menu>
 								</bk-popover-body>
 							</bk-popover>
diff --git a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoicePayment/view.js b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoicePayment/view.js
index a1c1ee0..8e3fada 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoicePayment/view.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/PurchaseInvoicePayment/view.js
@@ -7,7 +7,7 @@ const viewData = {
     id: 'PurchaseInvoicePayment',
     label: 'PurchaseInvoicePayment',
     translation: {
-        key: 'codbex-invoices:t.PURCHASEINVOICEPAYMENT',
+        key: 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICEPAYMENT',
     },
     region: 'bottom',
     lazyLoad: false,
diff --git a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/controller.js b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/controller.js
index 9478c16..d7bb36d 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/controller.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/controller.js
@@ -12,10 +12,10 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 		};
 
 		LocaleService.onInit(() => {
-			translated.yes = LocaleService.t('codbex-invoices:defaults.yes');
-			translated.no = LocaleService.t('codbex-invoices:defaults.no');
-			translated.deleteTitle = LocaleService.t('codbex-invoices:defaults.deleteTitle', { name: '$t(codbex-invoices:t.PURCHASEINVOICE)' });
-			translated.deleteConfirm = LocaleService.t('codbex-invoices:messages.deleteConfirm', { name: '$t(codbex-invoices:t.PURCHASEINVOICE)' });
+			translated.yes = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.yes');
+			translated.no = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.no');
+			translated.deleteTitle = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.deleteTitle', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE)' });
+			translated.deleteConfirm = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.deleteConfirm', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE)' });
 		});
 		$scope.dataPage = 1;
 		$scope.dataCount = 0;
@@ -114,8 +114,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 				}, (error) => {
 					const message = error.data ? error.data.message : '';
 					Dialogs.showAlert({
-						title: LocaleService.t('codbex-invoices:t.PURCHASEINVOICE'),
-						message: LocaleService.t('codbex-invoices:messages.error.unableToLF', { name: '$t(codbex-invoices:t.PURCHASEINVOICE)', message: message }),
+						title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE'),
+						message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLF', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE)', message: message }),
 						type: AlertTypes.Error
 					});
 					console.error('EntityService:', error);
@@ -123,8 +123,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			}, (error) => {
 				const message = error.data ? error.data.message : '';
 				Dialogs.showAlert({
-					title: LocaleService.t('codbex-invoices:t.PURCHASEINVOICE'),
-					message: LocaleService.t('codbex-invoices:messages.error.unableToCount', { name: '$t(codbex-invoices:t.PURCHASEINVOICE)', message: message }),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE'),
+					message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToCount', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE)', message: message }),
 					type: AlertTypes.Error
 				});
 				console.error('EntityService:', error);
@@ -203,8 +203,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 					}, (error) => {
 						const message = error.data ? error.data.message : '';
 						Dialogs.showAlert({
-							title: LocaleService.t('codbex-invoices:t.PURCHASEINVOICE'),
-							message: LocaleService.t('codbex-invoices:messages.error.unableToDelete', { name: '$t(codbex-invoices:t.PURCHASEINVOICE)', message: message }),
+							title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE'),
+							message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToDelete', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE)', message: message }),
 							type: AlertTypes.Error
 						});
 						console.error('EntityService:', error);
@@ -251,7 +251,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			const message = error.data ? error.data.message : '';
 			Dialogs.showAlert({
 				title: 'Type',
-				message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+				message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 				type: AlertTypes.Error
 			});
 		});
@@ -266,7 +266,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			const message = error.data ? error.data.message : '';
 			Dialogs.showAlert({
 				title: 'Supplier',
-				message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+				message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 				type: AlertTypes.Error
 			});
 		});
@@ -281,7 +281,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			const message = error.data ? error.data.message : '';
 			Dialogs.showAlert({
 				title: 'Currency',
-				message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+				message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 				type: AlertTypes.Error
 			});
 		});
@@ -296,7 +296,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			const message = error.data ? error.data.message : '';
 			Dialogs.showAlert({
 				title: 'PaymentMethod',
-				message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+				message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 				type: AlertTypes.Error
 			});
 		});
@@ -311,7 +311,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			const message = error.data ? error.data.message : '';
 			Dialogs.showAlert({
 				title: 'SentMethod',
-				message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+				message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 				type: AlertTypes.Error
 			});
 		});
@@ -326,7 +326,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			const message = error.data ? error.data.message : '';
 			Dialogs.showAlert({
 				title: 'Status',
-				message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+				message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 				type: AlertTypes.Error
 			});
 		});
@@ -341,7 +341,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			const message = error.data ? error.data.message : '';
 			Dialogs.showAlert({
 				title: 'Operator',
-				message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+				message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 				type: AlertTypes.Error
 			});
 		});
@@ -356,7 +356,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			const message = error.data ? error.data.message : '';
 			Dialogs.showAlert({
 				title: 'Company',
-				message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+				message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 				type: AlertTypes.Error
 			});
 		});
diff --git a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/dialog-filter/index.html b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/dialog-filter/index.html
index 0fd87e7..d44b32f 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/dialog-filter/index.html
+++ b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/dialog-filter/index.html
@@ -17,44 +17,44 @@
 			<bk-message-strip class="fd-margin--md" ng-show="errorMessage" glyph="sap-icon--message-error" state="error" on-dismiss="clearErrorMessage()">{{ errorMessage }}</bk-message-strip>
 
             <bk-fieldset class="fd-padding-begin-end--sm" ng-form="forms.details">
-                <bk-form-group label="{{ 'codbex-invoices:defaults.formGrpFilter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE)'} }}" name="entityForm" transclude-classes="fd-container fd-form-layout-grid-container">
+                <bk-form-group label="{{ 'codbex-invoices:codbex-invoices-model.defaults.formGrpFilter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE)'} }}" name="entityForm" transclude-classes="fd-container fd-form-layout-grid-container">
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idNumber" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_NUMBER' | t }}</bk-form-label>
+                        	<bk-form-label for="idNumber" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_NUMBER' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--8">
-							<bk-form-input-message state="{{ forms.details['Number'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:messages.error.incorrectInput' | t}}">
+							<bk-form-input-message state="{{ forms.details['Number'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:codbex-invoices-model.messages.error.incorrectInput' | t}}">
 								<bk-input id="idNumber"
 	                                name="Number"
 	                                state="{{ forms.details['Number'].$valid ? '' : 'error' }}"
 	                                ng-model="entity.Number"
 									ng-maxlength="20.0"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_NUMBER)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_NUMBER)'} }}">
 	                            </bk-input>
 							</bk-form-input-message>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idOriginalNumber" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_ORIGINALNUMBER' | t }}</bk-form-label>
+                        	<bk-form-label for="idOriginalNumber" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_ORIGINALNUMBER' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--8">
-							<bk-form-input-message state="{{ forms.details['OriginalNumber'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:messages.error.incorrectInput' | t}}">
+							<bk-form-input-message state="{{ forms.details['OriginalNumber'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:codbex-invoices-model.messages.error.incorrectInput' | t}}">
 								<bk-input id="idOriginalNumber"
 	                                name="OriginalNumber"
 	                                state="{{ forms.details['OriginalNumber'].$valid ? '' : 'error' }}"
 	                                ng-model="entity.OriginalNumber"
 									ng-maxlength="20.0"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_ORIGINALNUMBER)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_ORIGINALNUMBER)'} }}">
 	                            </bk-input>
 							</bk-form-input-message>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idType" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_PURCHASEINVOICETYPE' | t }}</bk-form-label>
+                        	<bk-form-label for="idType" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_PURCHASEINVOICETYPE' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--8">
 	                        <bk-combobox-input input-id="idType"
@@ -62,17 +62,17 @@
 	                            state="{{ forms.details['Type'].$valid ? '' : 'error' }}"
 	                            ng-model="entity.Type"
 	                            dropdown-items="optionsType"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_PURCHASEINVOICETYPE)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'Type'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'Type'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_PURCHASEINVOICETYPE)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'Type'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'Type'} }}">
 	                        </bk-combobox-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idDateFrom" colon="true">{{ 'codbex-invoices:defaults.from' | t:{'text':'$t(codbex-invoices:t.PURCHASEINVOICE_DATE)'} }}</bk-form-label>
+                        	<bk-form-label for="idDateFrom" colon="true">{{ 'codbex-invoices:codbex-invoices-model.defaults.from' | t:{'text':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_DATE)'} }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--2">
-							<bk-form-input-message state="{{ forms.details['Date'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:messages.error.incorrectInput' | t}}">
+							<bk-form-input-message state="{{ forms.details['Date'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:codbex-invoices-model.messages.error.incorrectInput' | t}}">
 								<bk-input id="idDateFrom"
 	                                name="Date"
 	                                state="{{ forms.details['Date'].$valid ? '' : 'error' }}"
@@ -82,10 +82,10 @@
 							</bk-form-input-message>
 	                    </div>
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idDateTo" colon="true">{{ 'codbex-invoices:defaults.to' | t:{'text':'$t(codbex-invoices:t.PURCHASEINVOICE_DATE)'} }}</bk-form-label>
+                        	<bk-form-label for="idDateTo" colon="true">{{ 'codbex-invoices:codbex-invoices-model.defaults.to' | t:{'text':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_DATE)'} }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--2">
-							<bk-form-input-message state="{{ forms.details['Date'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:messages.error.incorrectInput' | t}}">
+							<bk-form-input-message state="{{ forms.details['Date'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:codbex-invoices-model.messages.error.incorrectInput' | t}}">
 								<bk-input id="idDateTo"
 	                                name="Date"
 	                                state="{{ forms.details['Date'].$valid ? '' : 'error' }}"
@@ -97,10 +97,10 @@
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idDueFrom" colon="true">{{ 'codbex-invoices:defaults.from' | t:{'text':'$t(codbex-invoices:t.PURCHASEINVOICE_DUE)'} }}</bk-form-label>
+                        	<bk-form-label for="idDueFrom" colon="true">{{ 'codbex-invoices:codbex-invoices-model.defaults.from' | t:{'text':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_DUE)'} }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--2">
-							<bk-form-input-message state="{{ forms.details['Due'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:messages.error.incorrectInput' | t}}">
+							<bk-form-input-message state="{{ forms.details['Due'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:codbex-invoices-model.messages.error.incorrectInput' | t}}">
 								<bk-input id="idDueFrom"
 	                                name="Due"
 	                                state="{{ forms.details['Due'].$valid ? '' : 'error' }}"
@@ -110,10 +110,10 @@
 							</bk-form-input-message>
 	                    </div>
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idDueTo" colon="true">{{ 'codbex-invoices:defaults.to' | t:{'text':'$t(codbex-invoices:t.PURCHASEINVOICE_DUE)'} }}</bk-form-label>
+                        	<bk-form-label for="idDueTo" colon="true">{{ 'codbex-invoices:codbex-invoices-model.defaults.to' | t:{'text':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_DUE)'} }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--2">
-							<bk-form-input-message state="{{ forms.details['Due'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:messages.error.incorrectInput' | t}}">
+							<bk-form-input-message state="{{ forms.details['Due'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:codbex-invoices-model.messages.error.incorrectInput' | t}}">
 								<bk-input id="idDueTo"
 	                                name="Due"
 	                                state="{{ forms.details['Due'].$valid ? '' : 'error' }}"
@@ -125,7 +125,7 @@
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idSupplier" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_SUPPLIER' | t }}</bk-form-label>
+                        	<bk-form-label for="idSupplier" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_SUPPLIER' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--8">
 	                        <bk-combobox-input input-id="idSupplier"
@@ -133,27 +133,27 @@
 	                            state="{{ forms.details['Supplier'].$valid ? '' : 'error' }}"
 	                            ng-model="entity.Supplier"
 	                            dropdown-items="optionsSupplier"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_SUPPLIER)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'Supplier'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'Supplier'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_SUPPLIER)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'Supplier'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'Supplier'} }}">
 	                        </bk-combobox-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idNet" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_NET' | t }}</bk-form-label>
+                        	<bk-form-label for="idNet" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_NET' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--4">
 	                        <bk-step-input input-id="idNet"
 								name="Net"
 								state="{{ forms.details['Net'].$valid ? '' : 'error' }}"
 								ng-model="entity.Net"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_NET)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_NET)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idCurrency" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_CURRENCY' | t }}</bk-form-label>
+                        	<bk-form-label for="idCurrency" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_CURRENCY' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--8">
 	                        <bk-combobox-input input-id="idCurrency"
@@ -161,108 +161,108 @@
 	                            state="{{ forms.details['Currency'].$valid ? '' : 'error' }}"
 	                            ng-model="entity.Currency"
 	                            dropdown-items="optionsCurrency"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_CURRENCY)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'Currency'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'Currency'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_CURRENCY)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'Currency'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'Currency'} }}">
 	                        </bk-combobox-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idGross" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_GROSS' | t }}</bk-form-label>
+                        	<bk-form-label for="idGross" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_GROSS' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--4">
 	                        <bk-step-input input-id="idGross"
 								name="Gross"
 								state="{{ forms.details['Gross'].$valid ? '' : 'error' }}"
 								ng-model="entity.Gross"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_GROSS)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_GROSS)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idDiscount" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_DISCOUNT' | t }}</bk-form-label>
+                        	<bk-form-label for="idDiscount" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_DISCOUNT' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--4">
 	                        <bk-step-input input-id="idDiscount"
 								name="Discount"
 								state="{{ forms.details['Discount'].$valid ? '' : 'error' }}"
 								ng-model="entity.Discount"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_DISCOUNT)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_DISCOUNT)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idTaxes" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_TAXES' | t }}</bk-form-label>
+                        	<bk-form-label for="idTaxes" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_TAXES' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--4">
 	                        <bk-step-input input-id="idTaxes"
 								name="Taxes"
 								state="{{ forms.details['Taxes'].$valid ? '' : 'error' }}"
 								ng-model="entity.Taxes"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_TAXES)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_TAXES)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idVAT" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_VAT' | t }}</bk-form-label>
+                        	<bk-form-label for="idVAT" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_VAT' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--4">
 	                        <bk-step-input input-id="idVAT"
 								name="VAT"
 								state="{{ forms.details['VAT'].$valid ? '' : 'error' }}"
 								ng-model="entity.VAT"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_VAT)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_VAT)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idTotal" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_TOTAL' | t }}</bk-form-label>
+                        	<bk-form-label for="idTotal" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_TOTAL' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--4">
 	                        <bk-step-input input-id="idTotal"
 								name="Total"
 								state="{{ forms.details['Total'].$valid ? '' : 'error' }}"
 								ng-model="entity.Total"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_TOTAL)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_TOTAL)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idPaid" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_PAID' | t }}</bk-form-label>
+                        	<bk-form-label for="idPaid" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_PAID' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--4">
 	                        <bk-step-input input-id="idPaid"
 								name="Paid"
 								state="{{ forms.details['Paid'].$valid ? '' : 'error' }}"
 								ng-model="entity.Paid"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_PAID)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_PAID)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
 					<bk-form-item class="fd-row">
 						<div class="fd-col fd-col-md--2">
-							<bk-form-label for="idConditions" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_CONDITIONS' | t }}</bk-form-label>
+							<bk-form-label for="idConditions" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_CONDITIONS' | t }}</bk-form-label>
 						</div>
 						<div class="fd-col fd-col-md--8">
-							<bk-form-input-message state="{{ forms.details['Conditions'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:messages.error.incorrectInput' | t}}">
+							<bk-form-input-message state="{{ forms.details['Conditions'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:codbex-invoices-model.messages.error.incorrectInput' | t}}">
 								<bk-textarea id="idConditions"
 									name="Conditions"
 									state="{{ forms.details['Conditions'].$valid ? '' : 'error' }}"
 									ng-model="entity.Conditions"
 									ng-maxlength="200.0"
-									placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_CONDITIONS)'} }}">
+									placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_CONDITIONS)'} }}">
 								</bk-textarea>
 							</bk-form-input-message>
 						</div>
 					</bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idPaymentMethod" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_PAYMENTMETHOD' | t }}</bk-form-label>
+                        	<bk-form-label for="idPaymentMethod" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_PAYMENTMETHOD' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--8">
 	                        <bk-combobox-input input-id="idPaymentMethod"
@@ -270,14 +270,14 @@
 	                            state="{{ forms.details['PaymentMethod'].$valid ? '' : 'error' }}"
 	                            ng-model="entity.PaymentMethod"
 	                            dropdown-items="optionsPaymentMethod"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_PAYMENTMETHOD)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'PaymentMethod'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'PaymentMethod'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_PAYMENTMETHOD)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'PaymentMethod'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'PaymentMethod'} }}">
 	                        </bk-combobox-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idSentMethod" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_SENTMETHOD' | t }}</bk-form-label>
+                        	<bk-form-label for="idSentMethod" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_SENTMETHOD' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--8">
 	                        <bk-combobox-input input-id="idSentMethod"
@@ -285,14 +285,14 @@
 	                            state="{{ forms.details['SentMethod'].$valid ? '' : 'error' }}"
 	                            ng-model="entity.SentMethod"
 	                            dropdown-items="optionsSentMethod"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_SENTMETHOD)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'SentMethod'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'SentMethod'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_SENTMETHOD)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'SentMethod'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'SentMethod'} }}">
 	                        </bk-combobox-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idStatus" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_STATUS' | t }}</bk-form-label>
+                        	<bk-form-label for="idStatus" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_STATUS' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--8">
 	                        <bk-combobox-input input-id="idStatus"
@@ -300,14 +300,14 @@
 	                            state="{{ forms.details['Status'].$valid ? '' : 'error' }}"
 	                            ng-model="entity.Status"
 	                            dropdown-items="optionsStatus"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_STATUS)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'Status'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'Status'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_STATUS)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'Status'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'Status'} }}">
 	                        </bk-combobox-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idOperator" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_OPERATOR' | t }}</bk-form-label>
+                        	<bk-form-label for="idOperator" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_OPERATOR' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--8">
 	                        <bk-combobox-input input-id="idOperator"
@@ -315,30 +315,30 @@
 	                            state="{{ forms.details['Operator'].$valid ? '' : 'error' }}"
 	                            ng-model="entity.Operator"
 	                            dropdown-items="optionsOperator"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_OPERATOR)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'Operator'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'Operator'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_OPERATOR)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'Operator'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'Operator'} }}">
 	                        </bk-combobox-input>
 	                    </div>
                     </bk-form-item>
 					<bk-form-item class="fd-row">
 						<div class="fd-col fd-col-md--2">
-							<bk-form-label for="idDocument" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_DOCUMENT' | t }}</bk-form-label>
+							<bk-form-label for="idDocument" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_DOCUMENT' | t }}</bk-form-label>
 						</div>
 						<div class="fd-col fd-col-md--8">
-							<bk-form-input-message state="{{ forms.details['Document'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:messages.error.incorrectInput' | t}}">
+							<bk-form-input-message state="{{ forms.details['Document'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:codbex-invoices-model.messages.error.incorrectInput' | t}}">
 								<bk-textarea id="idDocument"
 									name="Document"
 									state="{{ forms.details['Document'].$valid ? '' : 'error' }}"
 									ng-model="entity.Document"
 									ng-maxlength="200.0"
-									placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_DOCUMENT)'} }}">
+									placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_DOCUMENT)'} }}">
 								</bk-textarea>
 							</bk-form-input-message>
 						</div>
 					</bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idCompany" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_COMPANY' | t }}</bk-form-label>
+                        	<bk-form-label for="idCompany" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_COMPANY' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--8">
 	                        <bk-combobox-input input-id="idCompany"
@@ -346,74 +346,74 @@
 	                            state="{{ forms.details['Company'].$valid ? '' : 'error' }}"
 	                            ng-model="entity.Company"
 	                            dropdown-items="optionsCompany"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_COMPANY)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'Company'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'Company'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_COMPANY)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'Company'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'Company'} }}">
 	                        </bk-combobox-input>
 	                    </div>
                     </bk-form-item>
 					<bk-form-item class="fd-row">
 						<div class="fd-col fd-col-md--2">
-							<bk-form-label for="idName" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_NAME' | t }}</bk-form-label>
+							<bk-form-label for="idName" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_NAME' | t }}</bk-form-label>
 						</div>
 						<div class="fd-col fd-col-md--8">
-							<bk-form-input-message state="{{ forms.details['Name'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:messages.error.incorrectInput' | t}}">
+							<bk-form-input-message state="{{ forms.details['Name'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:codbex-invoices-model.messages.error.incorrectInput' | t}}">
 								<bk-textarea id="idName"
 									name="Name"
 									state="{{ forms.details['Name'].$valid ? '' : 'error' }}"
 									ng-model="entity.Name"
 									ng-maxlength="200.0"
-									placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_NAME)'} }}">
+									placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_NAME)'} }}">
 								</bk-textarea>
 							</bk-form-input-message>
 						</div>
 					</bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idUUID" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_UUID' | t }}</bk-form-label>
+                        	<bk-form-label for="idUUID" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_UUID' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--8">
-							<bk-form-input-message state="{{ forms.details['UUID'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:messages.error.incorrectInput' | t}}">
+							<bk-form-input-message state="{{ forms.details['UUID'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:codbex-invoices-model.messages.error.incorrectInput' | t}}">
 								<bk-input id="idUUID"
 	                                name="UUID"
 	                                state="{{ forms.details['UUID'].$valid ? '' : 'error' }}"
 	                                ng-model="entity.UUID"
 									ng-maxlength="36.0"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_UUID)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_UUID)'} }}">
 	                            </bk-input>
 							</bk-form-input-message>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idProcess" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_PROCESS' | t }}</bk-form-label>
+                        	<bk-form-label for="idProcess" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_PROCESS' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--8">
-							<bk-form-input-message state="{{ forms.details['Process'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:messages.error.incorrectInput' | t}}">
+							<bk-form-input-message state="{{ forms.details['Process'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:codbex-invoices-model.messages.error.incorrectInput' | t}}">
 								<bk-input id="idProcess"
 	                                name="Process"
 	                                state="{{ forms.details['Process'].$valid ? '' : 'error' }}"
 	                                ng-model="entity.Process"
 									ng-maxlength="36.0"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_PROCESS)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_PROCESS)'} }}">
 	                            </bk-input>
 							</bk-form-input-message>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idReference" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_REFERENCE' | t }}</bk-form-label>
+                        	<bk-form-label for="idReference" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_REFERENCE' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--8">
-							<bk-form-input-message state="{{ forms.details['Reference'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:messages.error.incorrectInput' | t}}">
+							<bk-form-input-message state="{{ forms.details['Reference'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:codbex-invoices-model.messages.error.incorrectInput' | t}}">
 								<bk-input id="idReference"
 	                                name="Reference"
 	                                state="{{ forms.details['Reference'].$valid ? '' : 'error' }}"
 	                                ng-model="entity.Reference"
 									ng-maxlength="36.0"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_REFERENCE)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_REFERENCE)'} }}">
 	                            </bk-input>
 							</bk-form-input-message>
 	                    </div>
@@ -425,13 +425,13 @@
         <bk-bar bar-design="footer" compact="true" ng-show="action !== 'select'">
 			<bk-bar-right>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.filter' | t }}" state="emphasized" ng-click="filter()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.filter' | t }}" state="emphasized" ng-click="filter()"></bk-button>
 				</bk-bar-element>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.reset' | t }}" ng-click="resetFilter()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.reset' | t }}" ng-click="resetFilter()"></bk-button>
 				</bk-bar-element>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
 				</bk-bar-element>
 			</bk-bar-right>
 		</bk-bar>
diff --git a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/dialog-filter/view.js b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/dialog-filter/view.js
index 999483b..c579257 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/dialog-filter/view.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/dialog-filter/view.js
@@ -7,9 +7,9 @@ const viewData = {
     id: 'PurchaseInvoice-filter',
     label: 'PurchaseInvoice Filter',
     translation: {
-        key: 'codbex-invoices:extName',
+        key: 'codbex-invoices:codbex-invoices-model.extName',
         options: {
-            content: '$t(codbex-invoices:t.PURCHASEINVOICE) $t(codbex-invoices:defaults.filter)',
+            content: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE) $t(codbex-invoices:codbex-invoices-model.defaults.filter)',
         }
     },
     path: '/services/web/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/dialog-filter/index.html',
diff --git a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/dialog-window/controller.js b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/dialog-window/controller.js
index d04f21b..2fdc0d2 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/dialog-window/controller.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/dialog-window/controller.js
@@ -20,12 +20,12 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 		$scope.action = 'select';
 
 		LocaleService.onInit(() => {
-			description = LocaleService.t('codbex-invoices:defaults.description');
-			$scope.formHeaders.select = LocaleService.t('codbex-invoices:defaults.formHeadSelect', { name: '$t(codbex-invoices:t.PURCHASEINVOICE)' });
-			$scope.formHeaders.create = LocaleService.t('codbex-invoices:defaults.formHeadCreate', { name: '$t(codbex-invoices:t.PURCHASEINVOICE)' });
-			$scope.formHeaders.update = LocaleService.t('codbex-invoices:defaults.formHeadUpdate', { name: '$t(codbex-invoices:t.PURCHASEINVOICE)' });
-			propertySuccessfullyCreated = LocaleService.t('codbex-invoices:messages.propertySuccessfullyCreated', { name: '$t(codbex-invoices:t.PURCHASEINVOICE)' });
-			propertySuccessfullyUpdated = LocaleService.t('codbex-invoices:messages.propertySuccessfullyUpdated', { name: '$t(codbex-invoices:t.PURCHASEINVOICE)' });
+			description = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.description');
+			$scope.formHeaders.select = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.formHeadSelect', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE)' });
+			$scope.formHeaders.create = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.formHeadCreate', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE)' });
+			$scope.formHeaders.update = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.formHeadUpdate', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE)' });
+			propertySuccessfullyCreated = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.propertySuccessfullyCreated', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE)' });
+			propertySuccessfullyUpdated = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.propertySuccessfullyUpdated', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE)' });
 		});
 
 		let params = ViewParameters.get();
@@ -56,7 +56,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			EntityService.create(entity).then((response) => {
 				Dialogs.postMessage({ topic: 'codbex-invoices.PurchaseInvoice.PurchaseInvoice.entityCreated', data: response.data });
 				Notifications.show({
-					title: LocaleService.t('codbex-invoices:t.PURCHASEINVOICE'),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE'),
 					description: propertySuccessfullyCreated,
 					type: 'positive'
 				});
@@ -64,7 +64,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			}, (error) => {
 				const message = error.data ? error.data.message : '';
 				$scope.$evalAsync(() => {
-					$scope.errorMessage = LocaleService.t('codbex-invoices:messages.error.unableToCreate', { name: '$t(codbex-invoices:t.PURCHASEINVOICE)', message: message });
+					$scope.errorMessage = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToCreate', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE)', message: message });
 				});
 				console.error('EntityService:', error);
 			});
@@ -78,14 +78,14 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 				Dialogs.postMessage({ topic: 'codbex-invoices.PurchaseInvoice.PurchaseInvoice.entityUpdated', data: response.data });
 				$scope.cancel();
 				Notifications.show({
-					title: LocaleService.t('codbex-invoices:t.PURCHASEINVOICE'),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE'),
 					description: propertySuccessfullyUpdated,
 					type: 'positive'
 				});
 			}, (error) => {
 				const message = error.data ? error.data.message : '';
 				$scope.$evalAsync(() => {
-					$scope.errorMessage = LocaleService.t('codbex-invoices:messages.error.unableToUpdate', { name: '$t(codbex-invoices:t.PURCHASEINVOICE)', message: message });
+					$scope.errorMessage = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToUpdate', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE)', message: message });
 				});
 				console.error('EntityService:', error);
 			});
@@ -105,7 +105,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			const message = error.data ? error.data.message : '';
 			Dialogs.showAlert({
 				title: 'Type',
-				message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+				message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 				type: AlertTypes.Error
 			});
 		});
@@ -123,7 +123,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			const message = error.data ? error.data.message : '';
 			Dialogs.showAlert({
 				title: 'Supplier',
-				message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+				message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 				type: AlertTypes.Error
 			});
 		});
@@ -141,7 +141,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			const message = error.data ? error.data.message : '';
 			Dialogs.showAlert({
 				title: 'Currency',
-				message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+				message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 				type: AlertTypes.Error
 			});
 		});
@@ -159,7 +159,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			const message = error.data ? error.data.message : '';
 			Dialogs.showAlert({
 				title: 'PaymentMethod',
-				message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+				message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 				type: AlertTypes.Error
 			});
 		});
@@ -177,7 +177,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			const message = error.data ? error.data.message : '';
 			Dialogs.showAlert({
 				title: 'SentMethod',
-				message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+				message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 				type: AlertTypes.Error
 			});
 		});
@@ -195,7 +195,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			const message = error.data ? error.data.message : '';
 			Dialogs.showAlert({
 				title: 'Status',
-				message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+				message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 				type: AlertTypes.Error
 			});
 		});
@@ -213,7 +213,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			const message = error.data ? error.data.message : '';
 			Dialogs.showAlert({
 				title: 'Operator',
-				message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+				message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 				type: AlertTypes.Error
 			});
 		});
@@ -231,7 +231,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			const message = error.data ? error.data.message : '';
 			Dialogs.showAlert({
 				title: 'Company',
-				message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+				message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 				type: AlertTypes.Error
 			});
 		});
diff --git a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/dialog-window/index.html b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/dialog-window/index.html
index d8efed6..88c426e 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/dialog-window/index.html
+++ b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/dialog-window/index.html
@@ -21,7 +21,7 @@
                 <bk-form-group label="{{formHeaders[action]}}" name="entityForm" transclude-classes="fd-container fd-form-layout-grid-container">
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idNumber" ng-required="false" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_NUMBER' | t }}</bk-form-label>
+                        	<bk-form-label for="idNumber" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_NUMBER' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
 								<bk-input id="idNumber"
@@ -29,16 +29,16 @@
 	                                ng-model="entity.Number"
 	                                ng-readonly="true"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_NUMBER)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_NUMBER)'} }}">
 	                            </bk-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idOriginalNumber" ng-required="false" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_ORIGINALNUMBER' | t }}</bk-form-label>
+                        	<bk-form-label for="idOriginalNumber" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_ORIGINALNUMBER' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
-							<bk-form-input-message state="{{ forms.details['OriginalNumber'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:messages.error.pattern' | t:{'rule':''} }}">
+							<bk-form-input-message state="{{ forms.details['OriginalNumber'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:codbex-invoices-model.messages.error.pattern' | t:{'rule':''} }}">
 								<bk-input id="idOriginalNumber"
 	                                name="OriginalNumber"
 	                                state="{{ forms.details['OriginalNumber'].$valid ? '' : 'error' }}"
@@ -48,14 +48,14 @@
 									ng-maxlength="20.0"
 	                                input-rules="{ patterns: [''] }"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_ORIGINALNUMBER)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_ORIGINALNUMBER)'} }}">
 	                            </bk-input>
 							</bk-form-input-message>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idType" ng-required="false" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_PURCHASEINVOICETYPE' | t }}</bk-form-label>
+                        	<bk-form-label for="idType" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_PURCHASEINVOICETYPE' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
 	                        <bk-combobox-input input-id="idType"
@@ -65,17 +65,17 @@
 	                            ng-model="entity.Type"
 	                            is-readonly="action === 'select'"
 	                            dropdown-items="optionsType"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_PURCHASEINVOICETYPE)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'Type'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'Type'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_PURCHASEINVOICETYPE)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'Type'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'Type'} }}">
 	                        </bk-combobox-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idDate" ng-required="true" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_DATE' | t }}</bk-form-label>
+                        	<bk-form-label for="idDate" ng-required="true" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_DATE' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--2 ">
-							<bk-form-input-message state="{{ forms.details['Date'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:messages.error.incorrectInput' | t}}">
+							<bk-form-input-message state="{{ forms.details['Date'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:codbex-invoices-model.messages.error.incorrectInput' | t}}">
 								<bk-input id="idDate"
 	                                name="Date"
 	                                state="{{ forms.details['Date'].$valid ? '' : 'error' }}"
@@ -89,10 +89,10 @@
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idDue" ng-required="true" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_DUE' | t }}</bk-form-label>
+                        	<bk-form-label for="idDue" ng-required="true" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_DUE' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--2 ">
-							<bk-form-input-message state="{{ forms.details['Due'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:messages.error.incorrectInput' | t}}">
+							<bk-form-input-message state="{{ forms.details['Due'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:codbex-invoices-model.messages.error.incorrectInput' | t}}">
 								<bk-input id="idDue"
 	                                name="Due"
 	                                state="{{ forms.details['Due'].$valid ? '' : 'error' }}"
@@ -106,7 +106,7 @@
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idSupplier" ng-required="true" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_SUPPLIER' | t }}</bk-form-label>
+                        	<bk-form-label for="idSupplier" ng-required="true" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_SUPPLIER' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
 	                        <bk-combobox-input input-id="idSupplier"
@@ -116,14 +116,14 @@
 	                            ng-model="entity.Supplier"
 	                            is-readonly="action === 'select'"
 	                            dropdown-items="optionsSupplier"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_SUPPLIER)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'Supplier'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'Supplier'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_SUPPLIER)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'Supplier'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'Supplier'} }}">
 	                        </bk-combobox-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idNet" ng-required="false" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_NET' | t }}</bk-form-label>
+                        	<bk-form-label for="idNet" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_NET' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--4 ">
 	                        <bk-step-input input-id="idNet"
@@ -132,13 +132,13 @@
 								is-required="false"
 								ng-model="entity.Net"
 								is-readonly="action === 'select'"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_NET)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_NET)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idCurrency" ng-required="true" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_CURRENCY' | t }}</bk-form-label>
+                        	<bk-form-label for="idCurrency" ng-required="true" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_CURRENCY' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
 	                        <bk-combobox-input input-id="idCurrency"
@@ -148,14 +148,14 @@
 	                            ng-model="entity.Currency"
 	                            is-readonly="action === 'select'"
 	                            dropdown-items="optionsCurrency"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_CURRENCY)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'Currency'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'Currency'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_CURRENCY)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'Currency'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'Currency'} }}">
 	                        </bk-combobox-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idGross" ng-required="false" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_GROSS' | t }}</bk-form-label>
+                        	<bk-form-label for="idGross" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_GROSS' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--4 ">
 	                        <bk-step-input input-id="idGross"
@@ -164,13 +164,13 @@
 								is-required="false"
 								ng-model="entity.Gross"
 								is-readonly="action === 'select'"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_GROSS)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_GROSS)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idDiscount" ng-required="false" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_DISCOUNT' | t }}</bk-form-label>
+                        	<bk-form-label for="idDiscount" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_DISCOUNT' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--4 ">
 	                        <bk-step-input input-id="idDiscount"
@@ -179,13 +179,13 @@
 								is-required="false"
 								ng-model="entity.Discount"
 								is-readonly="action === 'select'"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_DISCOUNT)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_DISCOUNT)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idTaxes" ng-required="false" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_TAXES' | t }}</bk-form-label>
+                        	<bk-form-label for="idTaxes" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_TAXES' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--4 ">
 	                        <bk-step-input input-id="idTaxes"
@@ -194,13 +194,13 @@
 								is-required="false"
 								ng-model="entity.Taxes"
 								is-readonly="action === 'select'"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_TAXES)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_TAXES)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idVAT" ng-required="false" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_VAT' | t }}</bk-form-label>
+                        	<bk-form-label for="idVAT" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_VAT' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--4 ">
 	                        <bk-step-input input-id="idVAT"
@@ -209,13 +209,13 @@
 								is-required="false"
 								ng-model="entity.VAT"
 								is-readonly="action === 'select'"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_VAT)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_VAT)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idTotal" ng-required="false" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_TOTAL' | t }}</bk-form-label>
+                        	<bk-form-label for="idTotal" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_TOTAL' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--4 ">
 	                        <bk-step-input input-id="idTotal"
@@ -224,13 +224,13 @@
 								is-required="false"
 								ng-model="entity.Total"
 								is-readonly="action === 'select'"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_TOTAL)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_TOTAL)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idPaid" ng-required="false" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_PAID' | t }}</bk-form-label>
+                        	<bk-form-label for="idPaid" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_PAID' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--4 ">
 	                        <bk-step-input input-id="idPaid"
@@ -239,16 +239,16 @@
 								is-required="false"
 								ng-model="entity.Paid"
 								is-readonly="action === 'select'"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_PAID)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_PAID)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
 					<bk-form-item class="fd-row">
 						<div class="fd-col fd-col-md--2">
-							<bk-form-label for="idConditions" ng-required="false" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_CONDITIONS' | t }}</bk-form-label>
+							<bk-form-label for="idConditions" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_CONDITIONS' | t }}</bk-form-label>
 						</div>
 						<div class="fd-col  fd-col-md--8 ">
-							<bk-form-input-message state="{{ forms.details['Conditions'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:messages.error.pattern' | t:{'rule':''} }}">
+							<bk-form-input-message state="{{ forms.details['Conditions'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:codbex-invoices-model.messages.error.pattern' | t:{'rule':''} }}">
 								<bk-textarea id="idConditions"
 									name="Conditions"
 									state="{{ forms.details['Conditions'].$valid ? '' : 'error' }}"
@@ -257,14 +257,14 @@
 	                            	ng-readonly="action === 'select'"
 									ng-maxlength="200.0"
 									input-rules="{ patterns: [''] }"
-									placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_CONDITIONS)'} }}">
+									placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_CONDITIONS)'} }}">
 								</bk-textarea>
 							</bk-form-input-message>
 						</div>
 					</bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idPaymentMethod" ng-required="false" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_PAYMENTMETHOD' | t }}</bk-form-label>
+                        	<bk-form-label for="idPaymentMethod" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_PAYMENTMETHOD' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
 	                        <bk-combobox-input input-id="idPaymentMethod"
@@ -274,14 +274,14 @@
 	                            ng-model="entity.PaymentMethod"
 	                            is-readonly="action === 'select'"
 	                            dropdown-items="optionsPaymentMethod"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_PAYMENTMETHOD)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'PaymentMethod'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'PaymentMethod'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_PAYMENTMETHOD)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'PaymentMethod'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'PaymentMethod'} }}">
 	                        </bk-combobox-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idSentMethod" ng-required="false" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_SENTMETHOD' | t }}</bk-form-label>
+                        	<bk-form-label for="idSentMethod" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_SENTMETHOD' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
 	                        <bk-combobox-input input-id="idSentMethod"
@@ -291,14 +291,14 @@
 	                            ng-model="entity.SentMethod"
 	                            is-readonly="action === 'select'"
 	                            dropdown-items="optionsSentMethod"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_SENTMETHOD)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'SentMethod'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'SentMethod'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_SENTMETHOD)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'SentMethod'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'SentMethod'} }}">
 	                        </bk-combobox-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idStatus" ng-required="true" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_STATUS' | t }}</bk-form-label>
+                        	<bk-form-label for="idStatus" ng-required="true" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_STATUS' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
 	                        <bk-combobox-input input-id="idStatus"
@@ -308,14 +308,14 @@
 	                            ng-model="entity.Status"
 	                            is-readonly="action === 'select'"
 	                            dropdown-items="optionsStatus"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_STATUS)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'Status'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'Status'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_STATUS)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'Status'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'Status'} }}">
 	                        </bk-combobox-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idOperator" ng-required="true" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_OPERATOR' | t }}</bk-form-label>
+                        	<bk-form-label for="idOperator" ng-required="true" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_OPERATOR' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
 	                        <bk-combobox-input input-id="idOperator"
@@ -325,17 +325,17 @@
 	                            ng-model="entity.Operator"
 	                            is-readonly="action === 'select'"
 	                            dropdown-items="optionsOperator"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_OPERATOR)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'Operator'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'Operator'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_OPERATOR)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'Operator'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'Operator'} }}">
 	                        </bk-combobox-input>
 	                    </div>
                     </bk-form-item>
 					<bk-form-item class="fd-row">
 						<div class="fd-col fd-col-md--2">
-							<bk-form-label for="idDocument" ng-required="false" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_DOCUMENT' | t }}</bk-form-label>
+							<bk-form-label for="idDocument" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_DOCUMENT' | t }}</bk-form-label>
 						</div>
 						<div class="fd-col  fd-col-md--8 ">
-							<bk-form-input-message state="{{ forms.details['Document'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:messages.error.pattern' | t:{'rule':''} }}">
+							<bk-form-input-message state="{{ forms.details['Document'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:codbex-invoices-model.messages.error.pattern' | t:{'rule':''} }}">
 								<bk-textarea id="idDocument"
 									name="Document"
 									state="{{ forms.details['Document'].$valid ? '' : 'error' }}"
@@ -344,14 +344,14 @@
 	                            	ng-readonly="action === 'select'"
 									ng-maxlength="200.0"
 									input-rules="{ patterns: [''] }"
-									placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_DOCUMENT)'} }}">
+									placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_DOCUMENT)'} }}">
 								</bk-textarea>
 							</bk-form-input-message>
 						</div>
 					</bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idCompany" ng-required="true" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_COMPANY' | t }}</bk-form-label>
+                        	<bk-form-label for="idCompany" ng-required="true" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_COMPANY' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
 	                        <bk-combobox-input input-id="idCompany"
@@ -361,27 +361,27 @@
 	                            ng-model="entity.Company"
 	                            is-readonly="action === 'select'"
 	                            dropdown-items="optionsCompany"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_COMPANY)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'Company'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'Company'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_COMPANY)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'Company'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'Company'} }}">
 	                        </bk-combobox-input>
 	                    </div>
                     </bk-form-item>
 					<bk-form-item class="fd-row">
 						<div class="fd-col fd-col-md--2">
-							<bk-form-label for="idName" ng-required="false" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_NAME' | t }}</bk-form-label>
+							<bk-form-label for="idName" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_NAME' | t }}</bk-form-label>
 						</div>
 						<div class="fd-col  fd-col-md--8 ">
 								<bk-textarea id="idName"
 									name="Name"
 									ng-model="entity.Name"
 	                            	ng-readonly="true"
-									placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_NAME)'} }}">
+									placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_NAME)'} }}">
 								</bk-textarea>
 						</div>
 					</bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idUUID" ng-required="false" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_UUID' | t }}</bk-form-label>
+                        	<bk-form-label for="idUUID" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_UUID' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
 								<bk-input id="idUUID"
@@ -389,13 +389,13 @@
 	                                ng-model="entity.UUID"
 	                                ng-readonly="true"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_UUID)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_UUID)'} }}">
 	                            </bk-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idProcess" ng-required="false" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_PROCESS' | t }}</bk-form-label>
+                        	<bk-form-label for="idProcess" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_PROCESS' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
 								<bk-input id="idProcess"
@@ -403,16 +403,16 @@
 	                                ng-model="entity.Process"
 	                                ng-readonly="true"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_PROCESS)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_PROCESS)'} }}">
 	                            </bk-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idReference" ng-required="false" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_REFERENCE' | t }}</bk-form-label>
+                        	<bk-form-label for="idReference" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_REFERENCE' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
-							<bk-form-input-message state="{{ forms.details['Reference'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:messages.error.pattern' | t:{'rule':''} }}">
+							<bk-form-input-message state="{{ forms.details['Reference'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:codbex-invoices-model.messages.error.pattern' | t:{'rule':''} }}">
 								<bk-input id="idReference"
 	                                name="Reference"
 	                                state="{{ forms.details['Reference'].$valid ? '' : 'error' }}"
@@ -422,7 +422,7 @@
 									ng-maxlength="36.0"
 	                                input-rules="{ patterns: [''] }"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_REFERENCE)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_REFERENCE)'} }}">
 	                            </bk-input>
 							</bk-form-input-message>
 	                    </div>
@@ -434,11 +434,11 @@
 		<bk-bar bar-design="footer" compact="true" ng-show="action !== 'select'">
 			<bk-bar-right>
 				<bk-bar-element>
-					<bk-button ng-if="action === 'create'" label="{{'codbex-invoices:defaults.create' | t}}" state="emphasized" ng-click="create()" ng-disabled="!forms.details.$valid"></bk-button>
-					<bk-button ng-if="action !== 'create'" label="{{'codbex-invoices:defaults.update' | t}}" state="emphasized" ng-click="update()" ng-disabled="!forms.details.$valid"></bk-button>
+					<bk-button ng-if="action === 'create'" label="{{'codbex-invoices:codbex-invoices-model.defaults.create' | t}}" state="emphasized" ng-click="create()" ng-disabled="!forms.details.$valid"></bk-button>
+					<bk-button ng-if="action !== 'create'" label="{{'codbex-invoices:codbex-invoices-model.defaults.update' | t}}" state="emphasized" ng-click="update()" ng-disabled="!forms.details.$valid"></bk-button>
 				</bk-bar-element>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
 				</bk-bar-element>
 			</bk-bar-right>
 		</bk-bar>
diff --git a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/dialog-window/view.js b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/dialog-window/view.js
index 8365e0d..5403d00 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/dialog-window/view.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/dialog-window/view.js
@@ -7,7 +7,7 @@ const viewData = {
     id: "PurchaseInvoice-details",
     label: "PurchaseInvoice",
     translation: {
-        key: 'codbex-invoices:t.PURCHASEINVOICE',
+        key: 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE',
     },
     path: "/services/web/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/dialog-window/index.html",
     perspectiveName: "PurchaseInvoice",
diff --git a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/index.html b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/index.html
index 782b81a..700e923 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/index.html
+++ b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/index.html
@@ -15,18 +15,18 @@
 
 	<body class="bk-vbox">
 		<bk-toolbar has-title="true">
-			<bk-toolbar-title>{{'codbex-invoices:defaults.items' | t}} <span bk-object-status text="{{dataCount}}" inverted="true"></bk-toolbar-title>
+			<bk-toolbar-title>{{'codbex-invoices:codbex-invoices-model.defaults.items' | t}} <span bk-object-status text="{{dataCount}}" inverted="true"></bk-toolbar-title>
 			<bk-toolbar-spacer></bk-toolbar-spacer>
-			<bk-button compact="true" state="transparent" glyph="sap-icon--add" aria-label="{{ 'codbex-invoices:aria.addEntity' | t }}" ng-disabled="action == 'update'" ng-click="createEntity()"></bk-button>
-			<bk-button compact="true" state="transparent" glyph="sap-icon--edit" aria-label="{{ 'codbex-invoices:aria.editEntity' | t }}" ng-disabled="selectedEntity == null" ng-click="updateEntity()"></bk-button>
-			<bk-button compact="true" state="transparent" glyph="sap-icon--delete" aria-label="{{ 'codbex-invoices:aria.deleteEntity' | t }}" ng-disabled="selectedEntity == null || action == 'update'" ng-click="deleteEntity()"></bk-button>
+			<bk-button compact="true" state="transparent" glyph="sap-icon--add" aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.addEntity' | t }}" ng-disabled="action == 'update'" ng-click="createEntity()"></bk-button>
+			<bk-button compact="true" state="transparent" glyph="sap-icon--edit" aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.editEntity' | t }}" ng-disabled="selectedEntity == null" ng-click="updateEntity()"></bk-button>
+			<bk-button compact="true" state="transparent" glyph="sap-icon--delete" aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.deleteEntity' | t }}" ng-disabled="selectedEntity == null || action == 'update'" ng-click="deleteEntity()"></bk-button>
 			<bk-popover>
 				<bk-popover-control>
-					<bk-button compact="true" glyph="sap-icon--overflow" state="transparent" aria-label="{{ 'codbex-invoices:aria.headerMenuBtn' | t }}"></bk-button>
+					<bk-button compact="true" glyph="sap-icon--overflow" state="transparent" aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.headerMenuBtn' | t }}"></bk-button>
 				</bk-popover-control>
 				<bk-popover-body align="bottom-right">
-					<bk-menu aria-label="{{ 'codbex-invoices:aria.headerMenu' | t }}" no-backdrop="true" no-shadow="true">
-						<bk-menu-item title="{{ 'codbex-invoices:defaults.filter' | t }}" ng-click="openFilter()"></bk-menu-item>
+					<bk-menu aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.headerMenu' | t }}" no-backdrop="true" no-shadow="true">
+						<bk-menu-item title="{{ 'codbex-invoices:codbex-invoices-model.defaults.filter' | t }}" ng-click="openFilter()"></bk-menu-item>
 						<bk-menu-item ng-repeat="action in pageActions track by $index" title="{{action.translation.key | t:action.translation.options:action.label}}" ng-click="triggerPageAction(action)"></bk-menu-item>
 					</bk-menu>
 				</bk-popover-body>
@@ -71,7 +71,7 @@
 				</bk-list-item>
 			</bk-list>
 			<bk-list-action-item ng-show="dataPage <= dataPages && dataCount > dataLimit" ng-click="loadPage()">
-				{{ 'codbex-invoices:defaults.loadMore' | t }}
+				{{ 'codbex-invoices:codbex-invoices-model.defaults.loadMore' | t }}
 			</bk-list-action-item>
 		</bk-scrollbar>
 		<theme></theme>
diff --git a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/main-details/controller.js b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/main-details/controller.js
index 14e4f86..c7cb126 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/main-details/controller.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/main-details/controller.js
@@ -20,12 +20,12 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 		$scope.action = 'select';
 
 		LocaleService.onInit(() => {
-			description = LocaleService.t('codbex-invoices:defaults.description');
-			$scope.formHeaders.select = LocaleService.t('codbex-invoices:defaults.formHeadSelect', { name: '$t(codbex-invoices:t.PURCHASEINVOICE)' });
-			$scope.formHeaders.create = LocaleService.t('codbex-invoices:defaults.formHeadCreate', { name: '$t(codbex-invoices:t.PURCHASEINVOICE)' });
-			$scope.formHeaders.update = LocaleService.t('codbex-invoices:defaults.formHeadUpdate', { name: '$t(codbex-invoices:t.PURCHASEINVOICE)' });
-			propertySuccessfullyCreated = LocaleService.t('codbex-invoices:messages.propertySuccessfullyCreated', { name: '$t(codbex-invoices:t.PURCHASEINVOICE)' });
-			propertySuccessfullyUpdated = LocaleService.t('codbex-invoices:messages.propertySuccessfullyUpdated', { name: '$t(codbex-invoices:t.PURCHASEINVOICE)' });
+			description = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.description');
+			$scope.formHeaders.select = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.formHeadSelect', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE)' });
+			$scope.formHeaders.create = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.formHeadCreate', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE)' });
+			$scope.formHeaders.update = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.formHeadUpdate', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE)' });
+			propertySuccessfullyCreated = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.propertySuccessfullyCreated', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE)' });
+			propertySuccessfullyUpdated = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.propertySuccessfullyUpdated', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE)' });
 		});
 
 		//-----------------Custom Actions-------------------//
@@ -132,15 +132,15 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 				Dialogs.postMessage({ topic: 'codbex-invoices.PurchaseInvoice.PurchaseInvoice.entityCreated', data: response.data });
 				Dialogs.postMessage({ topic: 'codbex-invoices.PurchaseInvoice.PurchaseInvoice.clearDetails' , data: response.data });
 				Notifications.show({
-					title: LocaleService.t('codbex-invoices:t.PURCHASEINVOICE'),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE'),
 					description: propertySuccessfullyCreated,
 					type: 'positive'
 				});
 			}, (error) => {
 				const message = error.data ? error.data.message : '';
 				Dialogs.showAlert({
-					title: LocaleService.t('codbex-invoices:t.PURCHASEINVOICE'),
-					message: LocaleService.t('codbex-invoices:messages.error.unableToCreate', { name: '$t(codbex-invoices:t.PURCHASEINVOICE)', message: message }),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE'),
+					message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToCreate', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE)', message: message }),
 					type: AlertTypes.Error
 				});
 				console.error('EntityService:', error);
@@ -152,15 +152,15 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 				Dialogs.postMessage({ topic: 'codbex-invoices.PurchaseInvoice.PurchaseInvoice.entityUpdated', data: response.data });
 				Dialogs.postMessage({ topic: 'codbex-invoices.PurchaseInvoice.PurchaseInvoice.clearDetails', data: response.data });
 				Notifications.show({
-					title: LocaleService.t('codbex-invoices:t.PURCHASEINVOICE'),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE'),
 					description: propertySuccessfullyUpdated,
 					type: 'positive'
 				});
 			}, (error) => {
 				const message = error.data ? error.data.message : '';
 				Dialogs.showAlert({
-					title: LocaleService.t('codbex-invoices:t.PURCHASEINVOICE'),
-					message: LocaleService.t('codbex-invoices:messages.error.unableToCreate', { name: '$t(codbex-invoices:t.PURCHASEINVOICE)', message: message }),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE'),
+					message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToCreate', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE)', message: message }),
 					type: AlertTypes.Error
 				});
 				console.error('EntityService:', error);
@@ -280,7 +280,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 				const message = error.data ? error.data.message : '';
 				Dialogs.showAlert({
 					title: 'Type',
-					message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+					message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 					type: AlertTypes.Error
 				});
 			});
@@ -297,7 +297,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 				const message = error.data ? error.data.message : '';
 				Dialogs.showAlert({
 					title: 'Supplier',
-					message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+					message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 					type: AlertTypes.Error
 				});
 			});
@@ -314,7 +314,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 				const message = error.data ? error.data.message : '';
 				Dialogs.showAlert({
 					title: 'Currency',
-					message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+					message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 					type: AlertTypes.Error
 				});
 			});
@@ -331,7 +331,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 				const message = error.data ? error.data.message : '';
 				Dialogs.showAlert({
 					title: 'PaymentMethod',
-					message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+					message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 					type: AlertTypes.Error
 				});
 			});
@@ -348,7 +348,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 				const message = error.data ? error.data.message : '';
 				Dialogs.showAlert({
 					title: 'SentMethod',
-					message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+					message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 					type: AlertTypes.Error
 				});
 			});
@@ -365,7 +365,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 				const message = error.data ? error.data.message : '';
 				Dialogs.showAlert({
 					title: 'Status',
-					message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+					message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 					type: AlertTypes.Error
 				});
 			});
@@ -382,7 +382,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 				const message = error.data ? error.data.message : '';
 				Dialogs.showAlert({
 					title: 'Operator',
-					message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+					message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 					type: AlertTypes.Error
 				});
 			});
@@ -399,7 +399,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 				const message = error.data ? error.data.message : '';
 				Dialogs.showAlert({
 					title: 'Company',
-					message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+					message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 					type: AlertTypes.Error
 				});
 			});
diff --git a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/main-details/index.html b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/main-details/index.html
index 3195c13..73288bc 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/main-details/index.html
+++ b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/main-details/index.html
@@ -19,7 +19,7 @@
                 <bk-form-group label="{{formHeaders[action]}}" name="entityForm" transclude-classes="fd-container fd-form-layout-grid-container">
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idNumber" ng-required="false" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_NUMBER' | t }}</bk-form-label>
+                        	<bk-form-label for="idNumber" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_NUMBER' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
 								<bk-input id="idNumber"
@@ -27,16 +27,16 @@
 	                                ng-model="entity.Number"
 	                                ng-readonly="true"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_NUMBER)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_NUMBER)'} }}">
 	                            </bk-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idOriginalNumber" ng-required="false" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_ORIGINALNUMBER' | t }}</bk-form-label>
+                        	<bk-form-label for="idOriginalNumber" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_ORIGINALNUMBER' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
-							<bk-form-input-message state="{{ forms.details['OriginalNumber'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:messages.error.pattern' | t:{'rule':''} }}">
+							<bk-form-input-message state="{{ forms.details['OriginalNumber'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:codbex-invoices-model.messages.error.pattern' | t:{'rule':''} }}">
 								<bk-input id="idOriginalNumber"
 	                                name="OriginalNumber"
 	                                state="{{ forms.details['OriginalNumber'].$valid ? '' : 'error' }}"
@@ -46,14 +46,14 @@
 									ng-maxlength="20.0"
 	                                input-rules="{ patterns: [''] }"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_ORIGINALNUMBER)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_ORIGINALNUMBER)'} }}">
 	                            </bk-input>
 							</bk-form-input-message>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idType" ng-required="false" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_PURCHASEINVOICETYPE' | t }}</bk-form-label>
+                        	<bk-form-label for="idType" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_PURCHASEINVOICETYPE' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--7 ">
 	                        <bk-combobox-input input-id="idType"
@@ -63,21 +63,21 @@
 	                            ng-model="entity.Type"
 	                            is-readonly="action === 'select'"
 	                            dropdown-items="optionsType"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_PURCHASEINVOICETYPE)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'Type'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'Type'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_PURCHASEINVOICETYPE)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'Type'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'Type'} }}">
 	                        </bk-combobox-input>
 	                    </div>
 	                    <div class="fd-col fd-col--full">
-							<bk-button glyph="sap-icon--add" aria-label="{{ 'codbex-invoices:defaults.add' | t }}" ng-click="createType()" ng-hide="action === 'select'"></bk-button>
-							<bk-button glyph="sap-icon--refresh" aria-label="{{ 'codbex-invoices:defaults.refresh' | t }}" ng-click="refreshType()" ng-hide="action === 'select'"></bk-button>
+							<bk-button glyph="sap-icon--add" aria-label="{{ 'codbex-invoices:codbex-invoices-model.defaults.add' | t }}" ng-click="createType()" ng-hide="action === 'select'"></bk-button>
+							<bk-button glyph="sap-icon--refresh" aria-label="{{ 'codbex-invoices:codbex-invoices-model.defaults.refresh' | t }}" ng-click="refreshType()" ng-hide="action === 'select'"></bk-button>
 						</div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idDate" ng-required="true" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_DATE' | t }}</bk-form-label>
+                        	<bk-form-label for="idDate" ng-required="true" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_DATE' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--2 ">
-							<bk-form-input-message state="{{ forms.details['Date'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:messages.error.incorrectInput' | t}}">
+							<bk-form-input-message state="{{ forms.details['Date'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:codbex-invoices-model.messages.error.incorrectInput' | t}}">
 								<bk-input id="idDate"
 	                                name="Date"
 	                                state="{{ forms.details['Date'].$valid ? '' : 'error' }}"
@@ -91,10 +91,10 @@
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idDue" ng-required="true" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_DUE' | t }}</bk-form-label>
+                        	<bk-form-label for="idDue" ng-required="true" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_DUE' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--2 ">
-							<bk-form-input-message state="{{ forms.details['Due'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:messages.error.incorrectInput' | t}}">
+							<bk-form-input-message state="{{ forms.details['Due'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:codbex-invoices-model.messages.error.incorrectInput' | t}}">
 								<bk-input id="idDue"
 	                                name="Due"
 	                                state="{{ forms.details['Due'].$valid ? '' : 'error' }}"
@@ -108,7 +108,7 @@
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idSupplier" ng-required="true" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_SUPPLIER' | t }}</bk-form-label>
+                        	<bk-form-label for="idSupplier" ng-required="true" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_SUPPLIER' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--7 ">
 	                        <bk-combobox-input input-id="idSupplier"
@@ -118,18 +118,18 @@
 	                            ng-model="entity.Supplier"
 	                            is-readonly="action === 'select'"
 	                            dropdown-items="optionsSupplier"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_SUPPLIER)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'Supplier'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'Supplier'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_SUPPLIER)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'Supplier'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'Supplier'} }}">
 	                        </bk-combobox-input>
 	                    </div>
 	                    <div class="fd-col fd-col--full">
-							<bk-button glyph="sap-icon--add" aria-label="{{ 'codbex-invoices:defaults.add' | t }}" ng-click="createSupplier()" ng-hide="action === 'select'"></bk-button>
-							<bk-button glyph="sap-icon--refresh" aria-label="{{ 'codbex-invoices:defaults.refresh' | t }}" ng-click="refreshSupplier()" ng-hide="action === 'select'"></bk-button>
+							<bk-button glyph="sap-icon--add" aria-label="{{ 'codbex-invoices:codbex-invoices-model.defaults.add' | t }}" ng-click="createSupplier()" ng-hide="action === 'select'"></bk-button>
+							<bk-button glyph="sap-icon--refresh" aria-label="{{ 'codbex-invoices:codbex-invoices-model.defaults.refresh' | t }}" ng-click="refreshSupplier()" ng-hide="action === 'select'"></bk-button>
 						</div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idNet" ng-required="false" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_NET' | t }}</bk-form-label>
+                        	<bk-form-label for="idNet" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_NET' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--4 ">
 							<bk-step-input input-id="idNet"
@@ -138,13 +138,13 @@
 								is-required="false"
 								ng-model="entity.Net"
 								is-readonly="action === 'select'"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_NET)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_NET)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idCurrency" ng-required="true" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_CURRENCY' | t }}</bk-form-label>
+                        	<bk-form-label for="idCurrency" ng-required="true" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_CURRENCY' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--7 ">
 	                        <bk-combobox-input input-id="idCurrency"
@@ -154,18 +154,18 @@
 	                            ng-model="entity.Currency"
 	                            is-readonly="action === 'select'"
 	                            dropdown-items="optionsCurrency"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_CURRENCY)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'Currency'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'Currency'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_CURRENCY)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'Currency'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'Currency'} }}">
 	                        </bk-combobox-input>
 	                    </div>
 	                    <div class="fd-col fd-col--full">
-							<bk-button glyph="sap-icon--add" aria-label="{{ 'codbex-invoices:defaults.add' | t }}" ng-click="createCurrency()" ng-hide="action === 'select'"></bk-button>
-							<bk-button glyph="sap-icon--refresh" aria-label="{{ 'codbex-invoices:defaults.refresh' | t }}" ng-click="refreshCurrency()" ng-hide="action === 'select'"></bk-button>
+							<bk-button glyph="sap-icon--add" aria-label="{{ 'codbex-invoices:codbex-invoices-model.defaults.add' | t }}" ng-click="createCurrency()" ng-hide="action === 'select'"></bk-button>
+							<bk-button glyph="sap-icon--refresh" aria-label="{{ 'codbex-invoices:codbex-invoices-model.defaults.refresh' | t }}" ng-click="refreshCurrency()" ng-hide="action === 'select'"></bk-button>
 						</div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idGross" ng-required="false" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_GROSS' | t }}</bk-form-label>
+                        	<bk-form-label for="idGross" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_GROSS' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--4 ">
 							<bk-step-input input-id="idGross"
@@ -174,13 +174,13 @@
 								is-required="false"
 								ng-model="entity.Gross"
 								is-readonly="action === 'select'"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_GROSS)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_GROSS)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idDiscount" ng-required="false" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_DISCOUNT' | t }}</bk-form-label>
+                        	<bk-form-label for="idDiscount" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_DISCOUNT' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--4 ">
 							<bk-step-input input-id="idDiscount"
@@ -189,13 +189,13 @@
 								is-required="false"
 								ng-model="entity.Discount"
 								is-readonly="action === 'select'"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_DISCOUNT)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_DISCOUNT)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idTaxes" ng-required="false" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_TAXES' | t }}</bk-form-label>
+                        	<bk-form-label for="idTaxes" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_TAXES' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--4 ">
 							<bk-step-input input-id="idTaxes"
@@ -204,13 +204,13 @@
 								is-required="false"
 								ng-model="entity.Taxes"
 								is-readonly="action === 'select'"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_TAXES)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_TAXES)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idVAT" ng-required="false" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_VAT' | t }}</bk-form-label>
+                        	<bk-form-label for="idVAT" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_VAT' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--4 ">
 							<bk-step-input input-id="idVAT"
@@ -219,13 +219,13 @@
 								is-required="false"
 								ng-model="entity.VAT"
 								is-readonly="action === 'select'"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_VAT)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_VAT)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idTotal" ng-required="false" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_TOTAL' | t }}</bk-form-label>
+                        	<bk-form-label for="idTotal" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_TOTAL' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--4 ">
 							<bk-step-input input-id="idTotal"
@@ -234,13 +234,13 @@
 								is-required="false"
 								ng-model="entity.Total"
 								is-readonly="action === 'select'"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_TOTAL)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_TOTAL)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idPaid" ng-required="false" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_PAID' | t }}</bk-form-label>
+                        	<bk-form-label for="idPaid" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_PAID' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--4 ">
 							<bk-step-input input-id="idPaid"
@@ -249,16 +249,16 @@
 								is-required="false"
 								ng-model="entity.Paid"
 								is-readonly="action === 'select'"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_PAID)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_PAID)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
 					<bk-form-item class="fd-row">
 						<div class="fd-col fd-col-md--2">
-							<bk-form-label for="idConditions" ng-required="false" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_CONDITIONS' | t }}</bk-form-label>
+							<bk-form-label for="idConditions" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_CONDITIONS' | t }}</bk-form-label>
 						</div>
 						<div class="fd-col  fd-col-md--8 ">
-							<bk-form-input-message state="{{ forms.details['Conditions'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:messages.error.pattern' | t:{'rule':''} }}">
+							<bk-form-input-message state="{{ forms.details['Conditions'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:codbex-invoices-model.messages.error.pattern' | t:{'rule':''} }}">
 								<bk-textarea id="idConditions"
 									name="Conditions"
 									state="{{ forms.details['Conditions'].$valid ? '' : 'error' }}"
@@ -267,14 +267,14 @@
 	                            	ng-readonly="action === 'select'"
 									ng-maxlength="200.0"
 									input-rules="{ patterns: [''] }"
-									placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_CONDITIONS)'} }}">
+									placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_CONDITIONS)'} }}">
 								</bk-textarea>
 							</bk-form-input-message>
 						</div>
 					</bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idPaymentMethod" ng-required="false" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_PAYMENTMETHOD' | t }}</bk-form-label>
+                        	<bk-form-label for="idPaymentMethod" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_PAYMENTMETHOD' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--7 ">
 	                        <bk-combobox-input input-id="idPaymentMethod"
@@ -284,18 +284,18 @@
 	                            ng-model="entity.PaymentMethod"
 	                            is-readonly="action === 'select'"
 	                            dropdown-items="optionsPaymentMethod"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_PAYMENTMETHOD)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'PaymentMethod'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'PaymentMethod'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_PAYMENTMETHOD)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'PaymentMethod'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'PaymentMethod'} }}">
 	                        </bk-combobox-input>
 	                    </div>
 	                    <div class="fd-col fd-col--full">
-							<bk-button glyph="sap-icon--add" aria-label="{{ 'codbex-invoices:defaults.add' | t }}" ng-click="createPaymentMethod()" ng-hide="action === 'select'"></bk-button>
-							<bk-button glyph="sap-icon--refresh" aria-label="{{ 'codbex-invoices:defaults.refresh' | t }}" ng-click="refreshPaymentMethod()" ng-hide="action === 'select'"></bk-button>
+							<bk-button glyph="sap-icon--add" aria-label="{{ 'codbex-invoices:codbex-invoices-model.defaults.add' | t }}" ng-click="createPaymentMethod()" ng-hide="action === 'select'"></bk-button>
+							<bk-button glyph="sap-icon--refresh" aria-label="{{ 'codbex-invoices:codbex-invoices-model.defaults.refresh' | t }}" ng-click="refreshPaymentMethod()" ng-hide="action === 'select'"></bk-button>
 						</div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idSentMethod" ng-required="false" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_SENTMETHOD' | t }}</bk-form-label>
+                        	<bk-form-label for="idSentMethod" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_SENTMETHOD' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--7 ">
 	                        <bk-combobox-input input-id="idSentMethod"
@@ -305,18 +305,18 @@
 	                            ng-model="entity.SentMethod"
 	                            is-readonly="action === 'select'"
 	                            dropdown-items="optionsSentMethod"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_SENTMETHOD)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'SentMethod'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'SentMethod'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_SENTMETHOD)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'SentMethod'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'SentMethod'} }}">
 	                        </bk-combobox-input>
 	                    </div>
 	                    <div class="fd-col fd-col--full">
-							<bk-button glyph="sap-icon--add" aria-label="{{ 'codbex-invoices:defaults.add' | t }}" ng-click="createSentMethod()" ng-hide="action === 'select'"></bk-button>
-							<bk-button glyph="sap-icon--refresh" aria-label="{{ 'codbex-invoices:defaults.refresh' | t }}" ng-click="refreshSentMethod()" ng-hide="action === 'select'"></bk-button>
+							<bk-button glyph="sap-icon--add" aria-label="{{ 'codbex-invoices:codbex-invoices-model.defaults.add' | t }}" ng-click="createSentMethod()" ng-hide="action === 'select'"></bk-button>
+							<bk-button glyph="sap-icon--refresh" aria-label="{{ 'codbex-invoices:codbex-invoices-model.defaults.refresh' | t }}" ng-click="refreshSentMethod()" ng-hide="action === 'select'"></bk-button>
 						</div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idStatus" ng-required="true" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_STATUS' | t }}</bk-form-label>
+                        	<bk-form-label for="idStatus" ng-required="true" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_STATUS' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--7 ">
 	                        <bk-combobox-input input-id="idStatus"
@@ -326,18 +326,18 @@
 	                            ng-model="entity.Status"
 	                            is-readonly="action === 'select'"
 	                            dropdown-items="optionsStatus"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_STATUS)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'Status'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'Status'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_STATUS)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'Status'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'Status'} }}">
 	                        </bk-combobox-input>
 	                    </div>
 	                    <div class="fd-col fd-col--full">
-							<bk-button glyph="sap-icon--add" aria-label="{{ 'codbex-invoices:defaults.add' | t }}" ng-click="createStatus()" ng-hide="action === 'select'"></bk-button>
-							<bk-button glyph="sap-icon--refresh" aria-label="{{ 'codbex-invoices:defaults.refresh' | t }}" ng-click="refreshStatus()" ng-hide="action === 'select'"></bk-button>
+							<bk-button glyph="sap-icon--add" aria-label="{{ 'codbex-invoices:codbex-invoices-model.defaults.add' | t }}" ng-click="createStatus()" ng-hide="action === 'select'"></bk-button>
+							<bk-button glyph="sap-icon--refresh" aria-label="{{ 'codbex-invoices:codbex-invoices-model.defaults.refresh' | t }}" ng-click="refreshStatus()" ng-hide="action === 'select'"></bk-button>
 						</div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idOperator" ng-required="true" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_OPERATOR' | t }}</bk-form-label>
+                        	<bk-form-label for="idOperator" ng-required="true" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_OPERATOR' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--7 ">
 	                        <bk-combobox-input input-id="idOperator"
@@ -347,21 +347,21 @@
 	                            ng-model="entity.Operator"
 	                            is-readonly="action === 'select'"
 	                            dropdown-items="optionsOperator"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_OPERATOR)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'Operator'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'Operator'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_OPERATOR)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'Operator'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'Operator'} }}">
 	                        </bk-combobox-input>
 	                    </div>
 	                    <div class="fd-col fd-col--full">
-							<bk-button glyph="sap-icon--add" aria-label="{{ 'codbex-invoices:defaults.add' | t }}" ng-click="createOperator()" ng-hide="action === 'select'"></bk-button>
-							<bk-button glyph="sap-icon--refresh" aria-label="{{ 'codbex-invoices:defaults.refresh' | t }}" ng-click="refreshOperator()" ng-hide="action === 'select'"></bk-button>
+							<bk-button glyph="sap-icon--add" aria-label="{{ 'codbex-invoices:codbex-invoices-model.defaults.add' | t }}" ng-click="createOperator()" ng-hide="action === 'select'"></bk-button>
+							<bk-button glyph="sap-icon--refresh" aria-label="{{ 'codbex-invoices:codbex-invoices-model.defaults.refresh' | t }}" ng-click="refreshOperator()" ng-hide="action === 'select'"></bk-button>
 						</div>
                     </bk-form-item>
 					<bk-form-item class="fd-row">
 						<div class="fd-col fd-col-md--2">
-							<bk-form-label for="idDocument" ng-required="false" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_DOCUMENT' | t }}</bk-form-label>
+							<bk-form-label for="idDocument" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_DOCUMENT' | t }}</bk-form-label>
 						</div>
 						<div class="fd-col  fd-col-md--8 ">
-							<bk-form-input-message state="{{ forms.details['Document'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:messages.error.pattern' | t:{'rule':''} }}">
+							<bk-form-input-message state="{{ forms.details['Document'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:codbex-invoices-model.messages.error.pattern' | t:{'rule':''} }}">
 								<bk-textarea id="idDocument"
 									name="Document"
 									state="{{ forms.details['Document'].$valid ? '' : 'error' }}"
@@ -370,14 +370,14 @@
 	                            	ng-readonly="action === 'select'"
 									ng-maxlength="200.0"
 									input-rules="{ patterns: [''] }"
-									placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_DOCUMENT)'} }}">
+									placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_DOCUMENT)'} }}">
 								</bk-textarea>
 							</bk-form-input-message>
 						</div>
 					</bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idCompany" ng-required="true" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_COMPANY' | t }}</bk-form-label>
+                        	<bk-form-label for="idCompany" ng-required="true" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_COMPANY' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--7 ">
 	                        <bk-combobox-input input-id="idCompany"
@@ -387,31 +387,31 @@
 	                            ng-model="entity.Company"
 	                            is-readonly="action === 'select'"
 	                            dropdown-items="optionsCompany"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_COMPANY)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'Company'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'Company'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_COMPANY)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'Company'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'Company'} }}">
 	                        </bk-combobox-input>
 	                    </div>
 	                    <div class="fd-col fd-col--full">
-							<bk-button glyph="sap-icon--add" aria-label="{{ 'codbex-invoices:defaults.add' | t }}" ng-click="createCompany()" ng-hide="action === 'select'"></bk-button>
-							<bk-button glyph="sap-icon--refresh" aria-label="{{ 'codbex-invoices:defaults.refresh' | t }}" ng-click="refreshCompany()" ng-hide="action === 'select'"></bk-button>
+							<bk-button glyph="sap-icon--add" aria-label="{{ 'codbex-invoices:codbex-invoices-model.defaults.add' | t }}" ng-click="createCompany()" ng-hide="action === 'select'"></bk-button>
+							<bk-button glyph="sap-icon--refresh" aria-label="{{ 'codbex-invoices:codbex-invoices-model.defaults.refresh' | t }}" ng-click="refreshCompany()" ng-hide="action === 'select'"></bk-button>
 						</div>
                     </bk-form-item>
 					<bk-form-item class="fd-row">
 						<div class="fd-col fd-col-md--2">
-							<bk-form-label for="idName" ng-required="false" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_NAME' | t }}</bk-form-label>
+							<bk-form-label for="idName" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_NAME' | t }}</bk-form-label>
 						</div>
 						<div class="fd-col  fd-col-md--8 ">
 								<bk-textarea id="idName"
 									name="Name"
 									ng-model="entity.Name"
 	                            	ng-readonly="true"
-									placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_NAME)'} }}">
+									placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_NAME)'} }}">
 								</bk-textarea>
 						</div>
 					</bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idUUID" ng-required="false" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_UUID' | t }}</bk-form-label>
+                        	<bk-form-label for="idUUID" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_UUID' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
 								<bk-input id="idUUID"
@@ -419,13 +419,13 @@
 	                                ng-model="entity.UUID"
 	                                ng-readonly="true"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_UUID)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_UUID)'} }}">
 	                            </bk-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idProcess" ng-required="false" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_PROCESS' | t }}</bk-form-label>
+                        	<bk-form-label for="idProcess" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_PROCESS' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
 								<bk-input id="idProcess"
@@ -433,16 +433,16 @@
 	                                ng-model="entity.Process"
 	                                ng-readonly="true"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_PROCESS)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_PROCESS)'} }}">
 	                            </bk-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idReference" ng-required="false" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICE_REFERENCE' | t }}</bk-form-label>
+                        	<bk-form-label for="idReference" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_REFERENCE' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
-							<bk-form-input-message state="{{ forms.details['Reference'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:messages.error.pattern' | t:{'rule':''} }}">
+							<bk-form-input-message state="{{ forms.details['Reference'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:codbex-invoices-model.messages.error.pattern' | t:{'rule':''} }}">
 								<bk-input id="idReference"
 	                                name="Reference"
 	                                state="{{ forms.details['Reference'].$valid ? '' : 'error' }}"
@@ -452,7 +452,7 @@
 									ng-maxlength="36.0"
 	                                input-rules="{ patterns: [''] }"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICE_REFERENCE)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE_REFERENCE)'} }}">
 	                            </bk-input>
 							</bk-form-input-message>
 	                    </div>
@@ -464,11 +464,11 @@
 		<bk-bar bar-design="footer" compact="true" ng-show="action !== 'select'">
 			<bk-bar-right>
 				<bk-bar-element>
-					<bk-button ng-if="action === 'create'" label="{{'codbex-invoices:defaults.create' | t}}" state="emphasized" ng-click="create()" ng-disabled="!forms.details.$valid"></bk-button>
-					<bk-button ng-if="action !== 'create'" label="{{'codbex-invoices:defaults.update' | t}}" state="emphasized" ng-click="update()" ng-disabled="!forms.details.$valid"></bk-button>
+					<bk-button ng-if="action === 'create'" label="{{'codbex-invoices:codbex-invoices-model.defaults.create' | t}}" state="emphasized" ng-click="create()" ng-disabled="!forms.details.$valid"></bk-button>
+					<bk-button ng-if="action !== 'create'" label="{{'codbex-invoices:codbex-invoices-model.defaults.update' | t}}" state="emphasized" ng-click="update()" ng-disabled="!forms.details.$valid"></bk-button>
 				</bk-bar-element>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
 				</bk-bar-element>
 			</bk-bar-right>
 		</bk-bar>
diff --git a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/main-details/view.js b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/main-details/view.js
index cf04aae..dc6a8e9 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/main-details/view.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/main-details/view.js
@@ -7,7 +7,7 @@ const viewData = {
     id: 'PurchaseInvoice-details',
     label: 'PurchaseInvoice',
     translation: {
-        key: 'codbex-invoices:t.PURCHASEINVOICE',
+        key: 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE',
     },
     region: 'center',
     lazyLoad: false,
diff --git a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/view.js b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/view.js
index af7a9f4..7f330f3 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/view.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/PurchaseInvoice/view.js
@@ -7,7 +7,7 @@ const viewData = {
     id: 'PurchaseInvoice',
     label: 'PurchaseInvoice',
     translation: {
-        key: 'codbex-invoices:t.PURCHASEINVOICE',
+        key: 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE',
     },
     region: 'left',
     lazyLoad: false,
diff --git a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/index.html b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/index.html
index a529925..932fd42 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/index.html
+++ b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/index.html
@@ -21,10 +21,10 @@
     <body>
         <layout ng-if="!state.error && !state.isBusy" config="::layoutConfig"></layout>
         <bk-busy-indicator-extended ng-if="!state.error && state.isBusy" class="bk-fill-parent" size="l">
-            {{'codbex-invoices:state.busy' | t}}
+            {{'codbex-invoices:codbex-invoices-model.state.busy' | t}}
         </bk-busy-indicator-extended>
         <bk-message-page glyph="sap-icon--error" ng-if="state.error">
-            <bk-message-page-title>{{'codbex-invoices:messages.error.loading' | t}}</bk-message-page-title>
+            <bk-message-page-title>{{'codbex-invoices:codbex-invoices-model.messages.error.loading' | t}}</bk-message-page-title>
         </bk-message-page>
         <script type="text/javascript">
             angular.module('app', ['platformView', 'platformLayout', 'platformLocale', 'blimpKit']).controller('ApplicationController', ($scope, Extensions) => {
diff --git a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/perspective.js b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/perspective.js
index fe9d0df..4a46d2e 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/perspective.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/perspective.js
@@ -7,7 +7,7 @@ const perspectiveData = {
 	id: 'PurchaseInvoice',
 	label: 'PurchaseInvoice',
 	translation: {
-        key: 'codbex-invoices:t.PURCHASEINVOICE',
+        key: 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICE',
     },
 	path: '/services/web/codbex-invoices/gen/codbex-invoices/ui/PurchaseInvoice/index.html',
 	groupId: 'purchasing-navigation-group',
diff --git a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/Deduction/controller.js b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/Deduction/controller.js
index a28f75b..d49e0df 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/Deduction/controller.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/Deduction/controller.js
@@ -12,10 +12,10 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 		};
 
 		LocaleService.onInit(() => {
-			translated.yes = LocaleService.t('codbex-invoices:defaults.yes');
-			translated.no = LocaleService.t('codbex-invoices:defaults.no');
-			translated.deleteTitle = LocaleService.t('codbex-invoices:defaults.deleteTitle', { name: '$t(codbex-invoices:t.DEDUCTION)' });
-			translated.deleteConfirm = LocaleService.t('codbex-invoices:messages.deleteConfirm', { name: '$t(codbex-invoices:t.DEDUCTION)' });
+			translated.yes = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.yes');
+			translated.no = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.no');
+			translated.deleteTitle = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.deleteTitle', { name: '$t(codbex-invoices:codbex-invoices-model.t.DEDUCTION)' });
+			translated.deleteConfirm = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.deleteConfirm', { name: '$t(codbex-invoices:codbex-invoices-model.t.DEDUCTION)' });
 		});
 		//-----------------Custom Actions-------------------//
 		Extensions.getWindows(['codbex-invoices-custom-action']).then((response) => {
@@ -120,8 +120,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 				}, (error) => {
 					const message = error.data ? error.data.message : '';
 					Dialogs.showAlert({
-						title: LocaleService.t('codbex-invoices:t.DEDUCTION'),
-						message: LocaleService.t('codbex-invoices:messages.error.unableToLF', { name: '$t(codbex-invoices:t.DEDUCTION)', message: message }),
+						title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.DEDUCTION'),
+						message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLF', { name: '$t(codbex-invoices:codbex-invoices-model.t.DEDUCTION)', message: message }),
 						type: AlertTypes.Error
 					});
 					console.error('EntityService:', error);
@@ -129,8 +129,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			}, (error) => {
 				const message = error.data ? error.data.message : '';
 				Dialogs.showAlert({
-					title: LocaleService.t('codbex-invoices:t.DEDUCTION'),
-					message: LocaleService.t('codbex-invoices:messages.error.unableToCount', { name: '$t(codbex-invoices:t.DEDUCTION)', message: message }),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.DEDUCTION'),
+					message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToCount', { name: '$t(codbex-invoices:codbex-invoices-model.t.DEDUCTION)', message: message }),
 					type: AlertTypes.Error
 				});
 				console.error('EntityService:', error);
@@ -216,8 +216,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 					}, (error) => {
 						const message = error.data ? error.data.message : '';
 						Dialogs.showAlert({
-							title: LocaleService.t('codbex-invoices:t.DEDUCTION'),
-							message: LocaleService.t('codbex-invoices:messages.error.unableToDelete', { name: '$t(codbex-invoices:t.DEDUCTION)', message: message }),
+							title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.DEDUCTION'),
+							message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToDelete', { name: '$t(codbex-invoices:codbex-invoices-model.t.DEDUCTION)', message: message }),
 							type: AlertTypes.Error,
 						});
 						console.error('EntityService:', error);
@@ -240,7 +240,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			const message = error.data ? error.data.message : '';
 			Dialogs.showAlert({
 				title: 'AdvanceInvoice',
-				message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+				message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 				type: AlertTypes.Error
 			});
 		});
diff --git a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/Deduction/dialog-filter/index.html b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/Deduction/dialog-filter/index.html
index e7fbaac..2afc8d2 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/Deduction/dialog-filter/index.html
+++ b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/Deduction/dialog-filter/index.html
@@ -17,10 +17,10 @@
 			<bk-message-strip class="fd-margin--md" ng-show="errorMessage" glyph="sap-icon--message-error" state="error" on-dismiss="clearErrorMessage()">{{ errorMessage }}</bk-message-strip>
 
             <bk-fieldset class="fd-padding-begin-end--sm" ng-form="forms.details">
-                <bk-form-group label="{{ 'codbex-invoices:defaults.formGrpFilter' | t:{'name':'$t(codbex-invoices:t.DEDUCTION)'} }}" name="entityForm" transclude-classes="fd-container fd-form-layout-grid-container">
+                <bk-form-group label="{{ 'codbex-invoices:codbex-invoices-model.defaults.formGrpFilter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.DEDUCTION)'} }}" name="entityForm" transclude-classes="fd-container fd-form-layout-grid-container">
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idAdvanceInvoice" colon="true">{{ 'codbex-invoices:t.DEDUCTION_ADVANCEINVOICE' | t }}</bk-form-label>
+                        	<bk-form-label for="idAdvanceInvoice" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.DEDUCTION_ADVANCEINVOICE' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--8">
 	                        <bk-combobox-input input-id="idAdvanceInvoice"
@@ -28,8 +28,8 @@
 	                            state="{{ forms.details['AdvanceInvoice'].$valid ? '' : 'error' }}"
 	                            ng-model="entity.AdvanceInvoice"
 	                            dropdown-items="optionsAdvanceInvoice"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.DEDUCTION_ADVANCEINVOICE)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'AdvanceInvoice'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'AdvanceInvoice'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.DEDUCTION_ADVANCEINVOICE)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'AdvanceInvoice'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'AdvanceInvoice'} }}">
 	                        </bk-combobox-input>
 	                    </div>
                     </bk-form-item>
@@ -40,13 +40,13 @@
         <bk-bar bar-design="footer" compact="true" ng-show="action !== 'select'">
 			<bk-bar-right>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.filter' | t }}" state="emphasized" ng-click="filter()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.filter' | t }}" state="emphasized" ng-click="filter()"></bk-button>
 				</bk-bar-element>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.reset' | t }}" ng-click="resetFilter()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.reset' | t }}" ng-click="resetFilter()"></bk-button>
 				</bk-bar-element>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
 				</bk-bar-element>
 			</bk-bar-right>
 		</bk-bar>
diff --git a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/Deduction/dialog-filter/view.js b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/Deduction/dialog-filter/view.js
index 93d57e2..e33e92c 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/Deduction/dialog-filter/view.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/Deduction/dialog-filter/view.js
@@ -7,9 +7,9 @@ const viewData = {
     id: 'Deduction-filter',
     label: 'Deduction Filter',
     translation: {
-        key: 'codbex-invoices:extName',
+        key: 'codbex-invoices:codbex-invoices-model.extName',
         options: {
-            content: '$t(codbex-invoices:t.DEDUCTION) $t(codbex-invoices:defaults.filter)',
+            content: '$t(codbex-invoices:codbex-invoices-model.t.DEDUCTION) $t(codbex-invoices:codbex-invoices-model.defaults.filter)',
         }
     },
     path: '/services/web/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/Deduction/dialog-filter/index.html',
diff --git a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/Deduction/dialog-window/controller.js b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/Deduction/dialog-window/controller.js
index 370d8c0..8b0295f 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/Deduction/dialog-window/controller.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/Deduction/dialog-window/controller.js
@@ -20,12 +20,12 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 		$scope.action = 'select';
 
 		LocaleService.onInit(() => {
-			description = LocaleService.t('codbex-invoices:defaults.description');
-			$scope.formHeaders.select = LocaleService.t('codbex-invoices:defaults.formHeadSelect', { name: '$t(codbex-invoices:t.DEDUCTION)' });
-			$scope.formHeaders.create = LocaleService.t('codbex-invoices:defaults.formHeadCreate', { name: '$t(codbex-invoices:t.DEDUCTION)' });
-			$scope.formHeaders.update = LocaleService.t('codbex-invoices:defaults.formHeadUpdate', { name: '$t(codbex-invoices:t.DEDUCTION)' });
-			propertySuccessfullyCreated = LocaleService.t('codbex-invoices:messages.propertySuccessfullyCreated', { name: '$t(codbex-invoices:t.DEDUCTION)' });
-			propertySuccessfullyUpdated = LocaleService.t('codbex-invoices:messages.propertySuccessfullyUpdated', { name: '$t(codbex-invoices:t.DEDUCTION)' });
+			description = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.description');
+			$scope.formHeaders.select = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.formHeadSelect', { name: '$t(codbex-invoices:codbex-invoices-model.t.DEDUCTION)' });
+			$scope.formHeaders.create = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.formHeadCreate', { name: '$t(codbex-invoices:codbex-invoices-model.t.DEDUCTION)' });
+			$scope.formHeaders.update = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.formHeadUpdate', { name: '$t(codbex-invoices:codbex-invoices-model.t.DEDUCTION)' });
+			propertySuccessfullyCreated = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.propertySuccessfullyCreated', { name: '$t(codbex-invoices:codbex-invoices-model.t.DEDUCTION)' });
+			propertySuccessfullyUpdated = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.propertySuccessfullyUpdated', { name: '$t(codbex-invoices:codbex-invoices-model.t.DEDUCTION)' });
 		});
 
 		let params = ViewParameters.get();
@@ -43,7 +43,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			EntityService.create(entity).then((response) => {
 				Dialogs.postMessage({ topic: 'codbex-invoices.SalesInvoice.Deduction.entityCreated', data: response.data });
 				Notifications.show({
-					title: LocaleService.t('codbex-invoices:t.DEDUCTION'),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.DEDUCTION'),
 					description: propertySuccessfullyCreated,
 					type: 'positive'
 				});
@@ -51,8 +51,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			}, (error) => {
 				const message = error.data ? error.data.message : '';
 				Dialogs.showAlert({
-					title: LocaleService.t('codbex-invoices:t.DEDUCTION'),
-					message: LocaleService.t('codbex-invoices:messages.error.unableToCreate', { name: '$t(codbex-invoices:t.DEDUCTION)', message: message }),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.DEDUCTION'),
+					message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToCreate', { name: '$t(codbex-invoices:codbex-invoices-model.t.DEDUCTION)', message: message }),
 					type: AlertTypes.Error
 				});
 				console.error('EntityService:', error);
@@ -66,7 +66,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			EntityService.update(id, entity).then((response) => {
 				Dialogs.postMessage({ topic: 'codbex-invoices.SalesInvoice.Deduction.entityUpdated', data: response.data });
 				Notifications.show({
-					title: LocaleService.t('codbex-invoices:t.DEDUCTION'),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.DEDUCTION'),
 					description: propertySuccessfullyUpdated,
 					type: 'positive'
 				});
@@ -74,8 +74,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			}, (error) => {
 				const message = error.data ? error.data.message : '';
 				Dialogs.showAlert({
-					title: LocaleService.t('codbex-invoices:t.DEDUCTION'),
-					message: LocaleService.t('codbex-invoices:messages.error.unableToUpdate', { name: '$t(codbex-invoices:t.DEDUCTION)', message: message }),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.DEDUCTION'),
+					message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToUpdate', { name: '$t(codbex-invoices:codbex-invoices-model.t.DEDUCTION)', message: message }),
 					type: AlertTypes.Error
 				});
 				console.error('EntityService:', error);
diff --git a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/Deduction/dialog-window/index.html b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/Deduction/dialog-window/index.html
index bf3c29d..12b2a5b 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/Deduction/dialog-window/index.html
+++ b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/Deduction/dialog-window/index.html
@@ -19,7 +19,7 @@
                 <bk-form-group label="{{formHeaders[action]}}" name="entityForm" transclude-classes="fd-container fd-form-layout-grid-container">
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idAdvanceInvoice" ng-required="false" colon="true">{{ 'codbex-invoices:t.DEDUCTION_ADVANCEINVOICE' | t }}</bk-form-label>
+                        	<bk-form-label for="idAdvanceInvoice" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.DEDUCTION_ADVANCEINVOICE' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
 	                        <bk-combobox-input input-id="idAdvanceInvoice"
@@ -29,8 +29,8 @@
 	                            ng-model="entity.AdvanceInvoice"
 	                            is-readonly="action === 'select'"
 	                            dropdown-items="optionsAdvanceInvoice"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.DEDUCTION_ADVANCEINVOICE)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'AdvanceInvoice'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'AdvanceInvoice'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.DEDUCTION_ADVANCEINVOICE)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'AdvanceInvoice'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'AdvanceInvoice'} }}">
 	                        </bk-combobox-input>
 	                    </div>
                     </bk-form-item>
@@ -41,11 +41,11 @@
 		<bk-bar bar-design="footer" compact="true" ng-show="action !== 'select'">
 			<bk-bar-right>
 				<bk-bar-element>
-					<bk-button ng-if="action === 'create'" label="{{'codbex-invoices:defaults.create' | t}}" state="emphasized" ng-click="create()" ng-disabled="!forms.details.$valid"></bk-button>
-					<bk-button ng-if="action !== 'create'" label="{{'codbex-invoices:defaults.update' | t}}" state="emphasized" ng-click="update()" ng-disabled="!forms.details.$valid"></bk-button>
+					<bk-button ng-if="action === 'create'" label="{{'codbex-invoices:codbex-invoices-model.defaults.create' | t}}" state="emphasized" ng-click="create()" ng-disabled="!forms.details.$valid"></bk-button>
+					<bk-button ng-if="action !== 'create'" label="{{'codbex-invoices:codbex-invoices-model.defaults.update' | t}}" state="emphasized" ng-click="update()" ng-disabled="!forms.details.$valid"></bk-button>
 				</bk-bar-element>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
 				</bk-bar-element>
 			</bk-bar-right>
 		</bk-bar>
diff --git a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/Deduction/dialog-window/view.js b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/Deduction/dialog-window/view.js
index 5723811..8497791 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/Deduction/dialog-window/view.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/Deduction/dialog-window/view.js
@@ -7,7 +7,7 @@ const viewData = {
     id: 'Deduction-details',
     label: 'Deduction',
     translation: {
-        key: 'codbex-invoices:t.DEDUCTION',
+        key: 'codbex-invoices:codbex-invoices-model.t.DEDUCTION',
     },
     path: '/services/web/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/Deduction/dialog-window/index.html',
     perspectiveName: 'SalesInvoice'
diff --git a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/Deduction/index.html b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/Deduction/index.html
index 3b2713d..fa19b11 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/Deduction/index.html
+++ b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/Deduction/index.html
@@ -15,27 +15,27 @@
 
 	<body class="bk-vbox">
 		<bk-message-page glyph="sap-icon--hint" ng-show="data == null">
-			<bk-message-page-title>{{'codbex-invoices:messages.detailSelectRecord' | t}}</bk-message-page-title>
+			<bk-message-page-title>{{'codbex-invoices:codbex-invoices-model.messages.detailSelectRecord' | t}}</bk-message-page-title>
 		</bk-message-page>
 
 		<bk-toolbar has-title="true" ng-hide="data == null">
-			<bk-toolbar-title>{{'codbex-invoices:defaults.items' | t}} <span bk-object-status text="{{dataCount}}" inverted="true"></bk-toolbar-title>
-			<bk-button compact="true" state="transparent" label="{{ 'codbex-invoices:defaults.filter' | t }}" ng-click="openFilter()"></bk-button>
+			<bk-toolbar-title>{{'codbex-invoices:codbex-invoices-model.defaults.items' | t}} <span bk-object-status text="{{dataCount}}" inverted="true"></bk-toolbar-title>
+			<bk-button compact="true" state="transparent" label="{{ 'codbex-invoices:codbex-invoices-model.defaults.filter' | t }}" ng-click="openFilter()"></bk-button>
 			<bk-button ng-repeat="action in pageActions track by $index" compact="true" state="transparent" label="{{action.translation.key | t:action.translation.options:action.label}}" ng-click="triggerPageAction(action)"></bk-button>
 			<bk-toolbar-spacer></bk-toolbar-spacer>
-			<bk-button compact="true" state="emphasized" label="{{'codbex-invoices:defaults.create' | t}}" ng-click="createEntity()" ng-disabled="selectedMainEntityId == null"></bk-button>
+			<bk-button compact="true" state="emphasized" label="{{'codbex-invoices:codbex-invoices-model.defaults.create' | t}}" ng-click="createEntity()" ng-disabled="selectedMainEntityId == null"></bk-button>
 		</bk-toolbar>
 		<bk-scrollbar class="bk-full-height" ng-hide="data == null">
 			<table bk-table display-mode="compact" inner-borders="top" outer-borders="none">
 				<thead bk-table-header sticky="true">
 					<tr bk-table-row>
-						<th bk-table-header-cell>{{ 'codbex-invoices:t.DEDUCTION_ADVANCEINVOICE' | t:'AdvanceInvoice' }}</th>
+						<th bk-table-header-cell>{{ 'codbex-invoices:codbex-invoices-model.t.DEDUCTION_ADVANCEINVOICE' | t:'AdvanceInvoice' }}</th>
 						<th bk-table-header-cell></th>
 					</tr>
 				</thead>
 				<tbody bk-table-body>
 					<tr bk-table-row hoverable="true" ng-show="data.length == 0">
-						<td bk-table-cell no-data="true">{{'codbex-invoices:messages.noData' | t}}</td>
+						<td bk-table-cell no-data="true">{{'codbex-invoices:codbex-invoices-model.messages.noData' | t}}</td>
 					</tr>
 					<tr bk-table-row hoverable="true" ng-repeat="next in data track by $index" selected="next.Id === selectedEntity.Id" ng-click="selectEntity(next)">
 						<td bk-table-cell ng-click="openDetails(next)" hoverable="true" activable="true">
@@ -44,14 +44,14 @@
 						<td bk-table-cell fit-content="true">
 							<bk-popover>
 								<bk-popover-control>
-									<bk-button compact="true" glyph="sap-icon--overflow" state="transparent" aria-label="{{'codbex-invoices:aria.tableRowMenuBtn' | t}}" ng-click="setTristate()"></bk-button>
+									<bk-button compact="true" glyph="sap-icon--overflow" state="transparent" aria-label="{{'codbex-invoices:codbex-invoices-model.aria.tableRowMenuBtn' | t}}" ng-click="setTristate()"></bk-button>
 								</bk-popover-control>
 								<bk-popover-body align="bottom-right">
-									<bk-menu aria-label="{{'codbex-invoices:aria.tableRowMenu' | t}}" no-backdrop="true" no-shadow="true">
+									<bk-menu aria-label="{{'codbex-invoices:codbex-invoices-model.aria.tableRowMenu' | t}}" no-backdrop="true" no-shadow="true">
 										<bk-menu-item ng-repeat="action in entityActions" title="{{action.translation.key | t:action.translation.options:action.label}}" ng-click="triggerEntityAction(action)"></bk-menu-item>
-										<bk-menu-item title="{{ 'codbex-invoices:defaults.viewDetails' | t }}" ng-click="openDetails(next)"></bk-menu-item>
-										<bk-menu-item title="{{ 'codbex-invoices:defaults.edit' | t }}" ng-click="updateEntity(next)"></bk-menu-item>
-										<bk-menu-item title="{{ 'codbex-invoices:defaults.delete' | t }}" ng-click="deleteEntity(next)"></bk-menu-item>
+										<bk-menu-item title="{{ 'codbex-invoices:codbex-invoices-model.defaults.viewDetails' | t }}" ng-click="openDetails(next)"></bk-menu-item>
+										<bk-menu-item title="{{ 'codbex-invoices:codbex-invoices-model.defaults.edit' | t }}" ng-click="updateEntity(next)"></bk-menu-item>
+										<bk-menu-item title="{{ 'codbex-invoices:codbex-invoices-model.defaults.delete' | t }}" ng-click="deleteEntity(next)"></bk-menu-item>
 									</bk-menu>
 								</bk-popover-body>
 							</bk-popover>
diff --git a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/Deduction/view.js b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/Deduction/view.js
index 3806a39..2f09bff 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/Deduction/view.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/Deduction/view.js
@@ -7,7 +7,7 @@ const viewData = {
     id: 'Deduction',
     label: 'Deduction',
     translation: {
-        key: 'codbex-invoices:t.DEDUCTION',
+        key: 'codbex-invoices:codbex-invoices-model.t.DEDUCTION',
     },
     region: 'bottom',
     lazyLoad: false,
diff --git a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoiceItem/controller.js b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoiceItem/controller.js
index 2e4b540..2388add 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoiceItem/controller.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoiceItem/controller.js
@@ -12,10 +12,10 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 		};
 
 		LocaleService.onInit(() => {
-			translated.yes = LocaleService.t('codbex-invoices:defaults.yes');
-			translated.no = LocaleService.t('codbex-invoices:defaults.no');
-			translated.deleteTitle = LocaleService.t('codbex-invoices:defaults.deleteTitle', { name: '$t(codbex-invoices:t.SALESINVOICEITEM)' });
-			translated.deleteConfirm = LocaleService.t('codbex-invoices:messages.deleteConfirm', { name: '$t(codbex-invoices:t.SALESINVOICEITEM)' });
+			translated.yes = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.yes');
+			translated.no = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.no');
+			translated.deleteTitle = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.deleteTitle', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM)' });
+			translated.deleteConfirm = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.deleteConfirm', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM)' });
 		});
 		//-----------------Custom Actions-------------------//
 		Extensions.getWindows(['codbex-invoices-custom-action']).then((response) => {
@@ -120,8 +120,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 				}, (error) => {
 					const message = error.data ? error.data.message : '';
 					Dialogs.showAlert({
-						title: LocaleService.t('codbex-invoices:t.SALESINVOICEITEM'),
-						message: LocaleService.t('codbex-invoices:messages.error.unableToLF', { name: '$t(codbex-invoices:t.SALESINVOICEITEM)', message: message }),
+						title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM'),
+						message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLF', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM)', message: message }),
 						type: AlertTypes.Error
 					});
 					console.error('EntityService:', error);
@@ -129,8 +129,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			}, (error) => {
 				const message = error.data ? error.data.message : '';
 				Dialogs.showAlert({
-					title: LocaleService.t('codbex-invoices:t.SALESINVOICEITEM'),
-					message: LocaleService.t('codbex-invoices:messages.error.unableToCount', { name: '$t(codbex-invoices:t.SALESINVOICEITEM)', message: message }),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM'),
+					message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToCount', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM)', message: message }),
 					type: AlertTypes.Error
 				});
 				console.error('EntityService:', error);
@@ -220,8 +220,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 					}, (error) => {
 						const message = error.data ? error.data.message : '';
 						Dialogs.showAlert({
-							title: LocaleService.t('codbex-invoices:t.SALESINVOICEITEM'),
-							message: LocaleService.t('codbex-invoices:messages.error.unableToDelete', { name: '$t(codbex-invoices:t.SALESINVOICEITEM)', message: message }),
+							title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM'),
+							message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToDelete', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM)', message: message }),
 							type: AlertTypes.Error,
 						});
 						console.error('EntityService:', error);
@@ -245,7 +245,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			const message = error.data ? error.data.message : '';
 			Dialogs.showAlert({
 				title: 'SalesInvoice',
-				message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+				message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 				type: AlertTypes.Error
 			});
 		});
@@ -260,7 +260,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			const message = error.data ? error.data.message : '';
 			Dialogs.showAlert({
 				title: 'UoM',
-				message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+				message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 				type: AlertTypes.Error
 			});
 		});
diff --git a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoiceItem/dialog-filter/index.html b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoiceItem/dialog-filter/index.html
index 0145f5f..4bdd6b0 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoiceItem/dialog-filter/index.html
+++ b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoiceItem/dialog-filter/index.html
@@ -17,40 +17,40 @@
 			<bk-message-strip class="fd-margin--md" ng-show="errorMessage" glyph="sap-icon--message-error" state="error" on-dismiss="clearErrorMessage()">{{ errorMessage }}</bk-message-strip>
 
             <bk-fieldset class="fd-padding-begin-end--sm" ng-form="forms.details">
-                <bk-form-group label="{{ 'codbex-invoices:defaults.formGrpFilter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICEITEM)'} }}" name="entityForm" transclude-classes="fd-container fd-form-layout-grid-container">
+                <bk-form-group label="{{ 'codbex-invoices:codbex-invoices-model.defaults.formGrpFilter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM)'} }}" name="entityForm" transclude-classes="fd-container fd-form-layout-grid-container">
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idName" colon="true">{{ 'codbex-invoices:t.SALESINVOICEITEM_NAME' | t }}</bk-form-label>
+                        	<bk-form-label for="idName" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM_NAME' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--8">
-							<bk-form-input-message state="{{ forms.details['Name'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:messages.error.incorrectInput' | t}}">
+							<bk-form-input-message state="{{ forms.details['Name'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:codbex-invoices-model.messages.error.incorrectInput' | t}}">
 								<bk-input id="idName"
 	                                name="Name"
 	                                state="{{ forms.details['Name'].$valid ? '' : 'error' }}"
 	                                ng-model="entity.Name"
 									ng-maxlength="300.0"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICEITEM_NAME)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM_NAME)'} }}">
 	                            </bk-input>
 							</bk-form-input-message>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idQuantity" colon="true">{{ 'codbex-invoices:t.SALESINVOICEITEM_QUANTITY' | t }}</bk-form-label>
+                        	<bk-form-label for="idQuantity" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM_QUANTITY' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--4">
 	                        <bk-step-input input-id="idQuantity"
 								name="Quantity"
 								state="{{ forms.details['Quantity'].$valid ? '' : 'error' }}"
 								ng-model="entity.Quantity"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICEITEM_QUANTITY)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM_QUANTITY)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idUoM" colon="true">{{ 'codbex-invoices:t.SALESINVOICEITEM_UOM' | t }}</bk-form-label>
+                        	<bk-form-label for="idUoM" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM_UOM' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--8">
 	                        <bk-combobox-input input-id="idUoM"
@@ -58,76 +58,76 @@
 	                            state="{{ forms.details['UoM'].$valid ? '' : 'error' }}"
 	                            ng-model="entity.UoM"
 	                            dropdown-items="optionsUoM"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.SALESINVOICEITEM_UOM)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'UoM'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'UoM'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM_UOM)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'UoM'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'UoM'} }}">
 	                        </bk-combobox-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idPrice" colon="true">{{ 'codbex-invoices:t.SALESINVOICEITEM_PRICE' | t }}</bk-form-label>
+                        	<bk-form-label for="idPrice" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM_PRICE' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--4">
 	                        <bk-step-input input-id="idPrice"
 								name="Price"
 								state="{{ forms.details['Price'].$valid ? '' : 'error' }}"
 								ng-model="entity.Price"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICEITEM_PRICE)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM_PRICE)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idNet" colon="true">{{ 'codbex-invoices:t.SALESINVOICEITEM_NET' | t }}</bk-form-label>
+                        	<bk-form-label for="idNet" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM_NET' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--4">
 	                        <bk-step-input input-id="idNet"
 								name="Net"
 								state="{{ forms.details['Net'].$valid ? '' : 'error' }}"
 								ng-model="entity.Net"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICEITEM_NET)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM_NET)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idVATRate" colon="true">{{ 'codbex-invoices:t.SALESINVOICEITEM_VATRATE' | t }}</bk-form-label>
+                        	<bk-form-label for="idVATRate" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM_VATRATE' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--8">
-							<bk-form-input-message state="{{ forms.details['VATRate'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:messages.error.incorrectInput' | t}}">
+							<bk-form-input-message state="{{ forms.details['VATRate'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:codbex-invoices-model.messages.error.incorrectInput' | t}}">
 								<bk-input id="idVATRate"
 	                                name="VATRate"
 	                                state="{{ forms.details['VATRate'].$valid ? '' : 'error' }}"
 	                                ng-model="entity.VATRate"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICEITEM_VATRATE)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM_VATRATE)'} }}">
 	                            </bk-input>
 							</bk-form-input-message>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idVAT" colon="true">{{ 'codbex-invoices:t.SALESINVOICEITEM_VAT' | t }}</bk-form-label>
+                        	<bk-form-label for="idVAT" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM_VAT' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--4">
 	                        <bk-step-input input-id="idVAT"
 								name="VAT"
 								state="{{ forms.details['VAT'].$valid ? '' : 'error' }}"
 								ng-model="entity.VAT"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICEITEM_VAT)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM_VAT)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idGross" colon="true">{{ 'codbex-invoices:t.SALESINVOICEITEM_GROSS' | t }}</bk-form-label>
+                        	<bk-form-label for="idGross" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM_GROSS' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--4">
 	                        <bk-step-input input-id="idGross"
 								name="Gross"
 								state="{{ forms.details['Gross'].$valid ? '' : 'error' }}"
 								ng-model="entity.Gross"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICEITEM_GROSS)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM_GROSS)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
@@ -138,13 +138,13 @@
         <bk-bar bar-design="footer" compact="true" ng-show="action !== 'select'">
 			<bk-bar-right>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.filter' | t }}" state="emphasized" ng-click="filter()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.filter' | t }}" state="emphasized" ng-click="filter()"></bk-button>
 				</bk-bar-element>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.reset' | t }}" ng-click="resetFilter()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.reset' | t }}" ng-click="resetFilter()"></bk-button>
 				</bk-bar-element>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
 				</bk-bar-element>
 			</bk-bar-right>
 		</bk-bar>
diff --git a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoiceItem/dialog-filter/view.js b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoiceItem/dialog-filter/view.js
index 37169f2..df86bf9 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoiceItem/dialog-filter/view.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoiceItem/dialog-filter/view.js
@@ -7,9 +7,9 @@ const viewData = {
     id: 'SalesInvoiceItem-filter',
     label: 'SalesInvoiceItem Filter',
     translation: {
-        key: 'codbex-invoices:extName',
+        key: 'codbex-invoices:codbex-invoices-model.extName',
         options: {
-            content: '$t(codbex-invoices:t.SALESINVOICEITEM) $t(codbex-invoices:defaults.filter)',
+            content: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM) $t(codbex-invoices:codbex-invoices-model.defaults.filter)',
         }
     },
     path: '/services/web/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoiceItem/dialog-filter/index.html',
diff --git a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoiceItem/dialog-window/controller.js b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoiceItem/dialog-window/controller.js
index 1376171..a47b862 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoiceItem/dialog-window/controller.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoiceItem/dialog-window/controller.js
@@ -20,12 +20,12 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 		$scope.action = 'select';
 
 		LocaleService.onInit(() => {
-			description = LocaleService.t('codbex-invoices:defaults.description');
-			$scope.formHeaders.select = LocaleService.t('codbex-invoices:defaults.formHeadSelect', { name: '$t(codbex-invoices:t.SALESINVOICEITEM)' });
-			$scope.formHeaders.create = LocaleService.t('codbex-invoices:defaults.formHeadCreate', { name: '$t(codbex-invoices:t.SALESINVOICEITEM)' });
-			$scope.formHeaders.update = LocaleService.t('codbex-invoices:defaults.formHeadUpdate', { name: '$t(codbex-invoices:t.SALESINVOICEITEM)' });
-			propertySuccessfullyCreated = LocaleService.t('codbex-invoices:messages.propertySuccessfullyCreated', { name: '$t(codbex-invoices:t.SALESINVOICEITEM)' });
-			propertySuccessfullyUpdated = LocaleService.t('codbex-invoices:messages.propertySuccessfullyUpdated', { name: '$t(codbex-invoices:t.SALESINVOICEITEM)' });
+			description = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.description');
+			$scope.formHeaders.select = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.formHeadSelect', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM)' });
+			$scope.formHeaders.create = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.formHeadCreate', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM)' });
+			$scope.formHeaders.update = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.formHeadUpdate', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM)' });
+			propertySuccessfullyCreated = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.propertySuccessfullyCreated', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM)' });
+			propertySuccessfullyUpdated = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.propertySuccessfullyUpdated', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM)' });
 		});
 
 		let params = ViewParameters.get();
@@ -44,7 +44,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			EntityService.create(entity).then((response) => {
 				Dialogs.postMessage({ topic: 'codbex-invoices.SalesInvoice.SalesInvoiceItem.entityCreated', data: response.data });
 				Notifications.show({
-					title: LocaleService.t('codbex-invoices:t.SALESINVOICEITEM'),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM'),
 					description: propertySuccessfullyCreated,
 					type: 'positive'
 				});
@@ -52,8 +52,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			}, (error) => {
 				const message = error.data ? error.data.message : '';
 				Dialogs.showAlert({
-					title: LocaleService.t('codbex-invoices:t.SALESINVOICEITEM'),
-					message: LocaleService.t('codbex-invoices:messages.error.unableToCreate', { name: '$t(codbex-invoices:t.SALESINVOICEITEM)', message: message }),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM'),
+					message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToCreate', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM)', message: message }),
 					type: AlertTypes.Error
 				});
 				console.error('EntityService:', error);
@@ -67,7 +67,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			EntityService.update(id, entity).then((response) => {
 				Dialogs.postMessage({ topic: 'codbex-invoices.SalesInvoice.SalesInvoiceItem.entityUpdated', data: response.data });
 				Notifications.show({
-					title: LocaleService.t('codbex-invoices:t.SALESINVOICEITEM'),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM'),
 					description: propertySuccessfullyUpdated,
 					type: 'positive'
 				});
@@ -75,8 +75,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			}, (error) => {
 				const message = error.data ? error.data.message : '';
 				Dialogs.showAlert({
-					title: LocaleService.t('codbex-invoices:t.SALESINVOICEITEM'),
-					message: LocaleService.t('codbex-invoices:messages.error.unableToUpdate', { name: '$t(codbex-invoices:t.SALESINVOICEITEM)', message: message }),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM'),
+					message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToUpdate', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM)', message: message }),
 					type: AlertTypes.Error
 				});
 				console.error('EntityService:', error);
diff --git a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoiceItem/dialog-window/index.html b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoiceItem/dialog-window/index.html
index e66a156..c7357ff 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoiceItem/dialog-window/index.html
+++ b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoiceItem/dialog-window/index.html
@@ -19,10 +19,10 @@
                 <bk-form-group label="{{formHeaders[action]}}" name="entityForm" transclude-classes="fd-container fd-form-layout-grid-container">
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idName" ng-required="true" colon="true">{{ 'codbex-invoices:t.SALESINVOICEITEM_NAME' | t }}</bk-form-label>
+                        	<bk-form-label for="idName" ng-required="true" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM_NAME' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
-							<bk-form-input-message state="{{ forms.details['Name'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:messages.error.pattern' | t:{'rule':''} }}">
+							<bk-form-input-message state="{{ forms.details['Name'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:codbex-invoices-model.messages.error.pattern' | t:{'rule':''} }}">
 								<bk-input id="idName"
 	                                name="Name"
 	                                state="{{ forms.details['Name'].$valid ? '' : 'error' }}"
@@ -32,14 +32,14 @@
 									ng-maxlength="300.0"
 	                                input-rules="{ patterns: [''] }"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICEITEM_NAME)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM_NAME)'} }}">
 	                            </bk-input>
 							</bk-form-input-message>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idQuantity" ng-required="true" colon="true">{{ 'codbex-invoices:t.SALESINVOICEITEM_QUANTITY' | t }}</bk-form-label>
+                        	<bk-form-label for="idQuantity" ng-required="true" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM_QUANTITY' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--4 ">
 	                        <bk-step-input input-id="idQuantity"
@@ -48,13 +48,13 @@
 								ng-required="true"
 								ng-model="entity.Quantity"
 								is-readonly="action === 'select'"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICEITEM_QUANTITY)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM_QUANTITY)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idUoM" ng-required="true" colon="true">{{ 'codbex-invoices:t.SALESINVOICEITEM_UOM' | t }}</bk-form-label>
+                        	<bk-form-label for="idUoM" ng-required="true" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM_UOM' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
 	                        <bk-combobox-input input-id="idUoM"
@@ -64,14 +64,14 @@
 	                            ng-model="entity.UoM"
 	                            is-readonly="action === 'select'"
 	                            dropdown-items="optionsUoM"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.SALESINVOICEITEM_UOM)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'UoM'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'UoM'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM_UOM)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'UoM'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'UoM'} }}">
 	                        </bk-combobox-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idPrice" ng-required="true" colon="true">{{ 'codbex-invoices:t.SALESINVOICEITEM_PRICE' | t }}</bk-form-label>
+                        	<bk-form-label for="idPrice" ng-required="true" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM_PRICE' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--4 ">
 	                        <bk-step-input input-id="idPrice"
@@ -80,29 +80,29 @@
 								ng-required="true"
 								ng-model="entity.Price"
 								is-readonly="action === 'select'"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICEITEM_PRICE)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM_PRICE)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idNet" ng-required="false" colon="true">{{ 'codbex-invoices:t.SALESINVOICEITEM_NET' | t }}</bk-form-label>
+                        	<bk-form-label for="idNet" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM_NET' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--4 ">
 	                        <bk-step-input input-id="idNet"
 								name="Net"
 								ng-model="entity.Net"
 								is-readonly="true"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICEITEM_NET)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM_NET)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idVATRate" ng-required="false" colon="true">{{ 'codbex-invoices:t.SALESINVOICEITEM_VATRATE' | t }}</bk-form-label>
+                        	<bk-form-label for="idVATRate" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM_VATRATE' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
-							<bk-form-input-message state="{{ forms.details['VATRate'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:messages.error.pattern' | t:{'rule':''} }}">
+							<bk-form-input-message state="{{ forms.details['VATRate'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:codbex-invoices-model.messages.error.pattern' | t:{'rule':''} }}">
 								<bk-input id="idVATRate"
 	                                name="VATRate"
 	                                state="{{ forms.details['VATRate'].$valid ? '' : 'error' }}"
@@ -111,34 +111,34 @@
 	                                ng-readonly="action === 'select'"
 	                                input-rules="{ patterns: [''] }"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICEITEM_VATRATE)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM_VATRATE)'} }}">
 	                            </bk-input>
 							</bk-form-input-message>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idVAT" ng-required="false" colon="true">{{ 'codbex-invoices:t.SALESINVOICEITEM_VAT' | t }}</bk-form-label>
+                        	<bk-form-label for="idVAT" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM_VAT' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--4 ">
 	                        <bk-step-input input-id="idVAT"
 								name="VAT"
 								ng-model="entity.VAT"
 								is-readonly="true"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICEITEM_VAT)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM_VAT)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idGross" ng-required="false" colon="true">{{ 'codbex-invoices:t.SALESINVOICEITEM_GROSS' | t }}</bk-form-label>
+                        	<bk-form-label for="idGross" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM_GROSS' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--4 ">
 	                        <bk-step-input input-id="idGross"
 								name="Gross"
 								ng-model="entity.Gross"
 								is-readonly="true"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICEITEM_GROSS)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM_GROSS)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
@@ -149,11 +149,11 @@
 		<bk-bar bar-design="footer" compact="true" ng-show="action !== 'select'">
 			<bk-bar-right>
 				<bk-bar-element>
-					<bk-button ng-if="action === 'create'" label="{{'codbex-invoices:defaults.create' | t}}" state="emphasized" ng-click="create()" ng-disabled="!forms.details.$valid"></bk-button>
-					<bk-button ng-if="action !== 'create'" label="{{'codbex-invoices:defaults.update' | t}}" state="emphasized" ng-click="update()" ng-disabled="!forms.details.$valid"></bk-button>
+					<bk-button ng-if="action === 'create'" label="{{'codbex-invoices:codbex-invoices-model.defaults.create' | t}}" state="emphasized" ng-click="create()" ng-disabled="!forms.details.$valid"></bk-button>
+					<bk-button ng-if="action !== 'create'" label="{{'codbex-invoices:codbex-invoices-model.defaults.update' | t}}" state="emphasized" ng-click="update()" ng-disabled="!forms.details.$valid"></bk-button>
 				</bk-bar-element>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
 				</bk-bar-element>
 			</bk-bar-right>
 		</bk-bar>
diff --git a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoiceItem/dialog-window/view.js b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoiceItem/dialog-window/view.js
index b34d0be..5165676 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoiceItem/dialog-window/view.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoiceItem/dialog-window/view.js
@@ -7,7 +7,7 @@ const viewData = {
     id: 'SalesInvoiceItem-details',
     label: 'SalesInvoiceItem',
     translation: {
-        key: 'codbex-invoices:t.SALESINVOICEITEM',
+        key: 'codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM',
     },
     path: '/services/web/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoiceItem/dialog-window/index.html',
     perspectiveName: 'SalesInvoice'
diff --git a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoiceItem/index.html b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoiceItem/index.html
index cc9f9f4..5adb63e 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoiceItem/index.html
+++ b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoiceItem/index.html
@@ -15,34 +15,34 @@
 
 	<body class="bk-vbox">
 		<bk-message-page glyph="sap-icon--hint" ng-show="data == null">
-			<bk-message-page-title>{{'codbex-invoices:messages.detailSelectRecord' | t}}</bk-message-page-title>
+			<bk-message-page-title>{{'codbex-invoices:codbex-invoices-model.messages.detailSelectRecord' | t}}</bk-message-page-title>
 		</bk-message-page>
 
 		<bk-toolbar has-title="true" ng-hide="data == null">
-			<bk-toolbar-title>{{'codbex-invoices:defaults.items' | t}} <span bk-object-status text="{{dataCount}}" inverted="true"></bk-toolbar-title>
-			<bk-button compact="true" state="transparent" label="{{ 'codbex-invoices:defaults.filter' | t }}" ng-click="openFilter()"></bk-button>
+			<bk-toolbar-title>{{'codbex-invoices:codbex-invoices-model.defaults.items' | t}} <span bk-object-status text="{{dataCount}}" inverted="true"></bk-toolbar-title>
+			<bk-button compact="true" state="transparent" label="{{ 'codbex-invoices:codbex-invoices-model.defaults.filter' | t }}" ng-click="openFilter()"></bk-button>
 			<bk-button ng-repeat="action in pageActions track by $index" compact="true" state="transparent" label="{{action.translation.key | t:action.translation.options:action.label}}" ng-click="triggerPageAction(action)"></bk-button>
 			<bk-toolbar-spacer></bk-toolbar-spacer>
-			<bk-button compact="true" state="emphasized" label="{{'codbex-invoices:defaults.create' | t}}" ng-click="createEntity()" ng-disabled="selectedMainEntityId == null"></bk-button>
+			<bk-button compact="true" state="emphasized" label="{{'codbex-invoices:codbex-invoices-model.defaults.create' | t}}" ng-click="createEntity()" ng-disabled="selectedMainEntityId == null"></bk-button>
 		</bk-toolbar>
 		<bk-scrollbar class="bk-full-height" ng-hide="data == null">
 			<table bk-table display-mode="compact" inner-borders="top" outer-borders="none">
 				<thead bk-table-header sticky="true">
 					<tr bk-table-row>
-						<th bk-table-header-cell>{{ 'codbex-invoices:t.SALESINVOICEITEM_NAME' | t:'Name' }}</th>
-						<th bk-table-header-cell>{{ 'codbex-invoices:t.SALESINVOICEITEM_QUANTITY' | t:'Quantity' }}</th>
-						<th bk-table-header-cell>{{ 'codbex-invoices:t.SALESINVOICEITEM_UOM' | t:'UoM' }}</th>
-						<th bk-table-header-cell>{{ 'codbex-invoices:t.SALESINVOICEITEM_PRICE' | t:'Price' }}</th>
-						<th bk-table-header-cell>{{ 'codbex-invoices:t.SALESINVOICEITEM_NET' | t:'Net' }}</th>
-						<th bk-table-header-cell>{{ 'codbex-invoices:t.SALESINVOICEITEM_VATRATE' | t:'VATRate' }}</th>
-						<th bk-table-header-cell>{{ 'codbex-invoices:t.SALESINVOICEITEM_VAT' | t:'VAT' }}</th>
-						<th bk-table-header-cell>{{ 'codbex-invoices:t.SALESINVOICEITEM_GROSS' | t:'Gross' }}</th>
+						<th bk-table-header-cell>{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM_NAME' | t:'Name' }}</th>
+						<th bk-table-header-cell>{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM_QUANTITY' | t:'Quantity' }}</th>
+						<th bk-table-header-cell>{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM_UOM' | t:'UoM' }}</th>
+						<th bk-table-header-cell>{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM_PRICE' | t:'Price' }}</th>
+						<th bk-table-header-cell>{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM_NET' | t:'Net' }}</th>
+						<th bk-table-header-cell>{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM_VATRATE' | t:'VATRate' }}</th>
+						<th bk-table-header-cell>{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM_VAT' | t:'VAT' }}</th>
+						<th bk-table-header-cell>{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM_GROSS' | t:'Gross' }}</th>
 						<th bk-table-header-cell></th>
 					</tr>
 				</thead>
 				<tbody bk-table-body>
 					<tr bk-table-row hoverable="true" ng-show="data.length == 0">
-						<td bk-table-cell no-data="true">{{'codbex-invoices:messages.noData' | t}}</td>
+						<td bk-table-cell no-data="true">{{'codbex-invoices:codbex-invoices-model.messages.noData' | t}}</td>
 					</tr>
 					<tr bk-table-row hoverable="true" ng-repeat="next in data track by $index" selected="next.Id === selectedEntity.Id" ng-click="selectEntity(next)">
 						<td bk-table-cell ng-click="openDetails(next)" hoverable="true" activable="true">{{next.Name}}</td>
@@ -58,14 +58,14 @@
 						<td bk-table-cell fit-content="true">
 							<bk-popover>
 								<bk-popover-control>
-									<bk-button compact="true" glyph="sap-icon--overflow" state="transparent" aria-label="{{'codbex-invoices:aria.tableRowMenuBtn' | t}}" ng-click="setTristate()"></bk-button>
+									<bk-button compact="true" glyph="sap-icon--overflow" state="transparent" aria-label="{{'codbex-invoices:codbex-invoices-model.aria.tableRowMenuBtn' | t}}" ng-click="setTristate()"></bk-button>
 								</bk-popover-control>
 								<bk-popover-body align="bottom-right">
-									<bk-menu aria-label="{{'codbex-invoices:aria.tableRowMenu' | t}}" no-backdrop="true" no-shadow="true">
+									<bk-menu aria-label="{{'codbex-invoices:codbex-invoices-model.aria.tableRowMenu' | t}}" no-backdrop="true" no-shadow="true">
 										<bk-menu-item ng-repeat="action in entityActions" title="{{action.translation.key | t:action.translation.options:action.label}}" ng-click="triggerEntityAction(action)"></bk-menu-item>
-										<bk-menu-item title="{{ 'codbex-invoices:defaults.viewDetails' | t }}" ng-click="openDetails(next)"></bk-menu-item>
-										<bk-menu-item title="{{ 'codbex-invoices:defaults.edit' | t }}" ng-click="updateEntity(next)"></bk-menu-item>
-										<bk-menu-item title="{{ 'codbex-invoices:defaults.delete' | t }}" ng-click="deleteEntity(next)"></bk-menu-item>
+										<bk-menu-item title="{{ 'codbex-invoices:codbex-invoices-model.defaults.viewDetails' | t }}" ng-click="openDetails(next)"></bk-menu-item>
+										<bk-menu-item title="{{ 'codbex-invoices:codbex-invoices-model.defaults.edit' | t }}" ng-click="updateEntity(next)"></bk-menu-item>
+										<bk-menu-item title="{{ 'codbex-invoices:codbex-invoices-model.defaults.delete' | t }}" ng-click="deleteEntity(next)"></bk-menu-item>
 									</bk-menu>
 								</bk-popover-body>
 							</bk-popover>
diff --git a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoiceItem/view.js b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoiceItem/view.js
index ca0bf9e..0534288 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoiceItem/view.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoiceItem/view.js
@@ -7,7 +7,7 @@ const viewData = {
     id: 'SalesInvoiceItem',
     label: 'SalesInvoiceItem',
     translation: {
-        key: 'codbex-invoices:t.SALESINVOICEITEM',
+        key: 'codbex-invoices:codbex-invoices-model.t.SALESINVOICEITEM',
     },
     region: 'bottom',
     lazyLoad: false,
diff --git a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoicePayment/controller.js b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoicePayment/controller.js
index 4f28599..eabb3f6 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoicePayment/controller.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoicePayment/controller.js
@@ -12,10 +12,10 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 		};
 
 		LocaleService.onInit(() => {
-			translated.yes = LocaleService.t('codbex-invoices:defaults.yes');
-			translated.no = LocaleService.t('codbex-invoices:defaults.no');
-			translated.deleteTitle = LocaleService.t('codbex-invoices:defaults.deleteTitle', { name: '$t(codbex-invoices:t.SALESINVOICEPAYMENT)' });
-			translated.deleteConfirm = LocaleService.t('codbex-invoices:messages.deleteConfirm', { name: '$t(codbex-invoices:t.SALESINVOICEPAYMENT)' });
+			translated.yes = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.yes');
+			translated.no = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.no');
+			translated.deleteTitle = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.deleteTitle', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEPAYMENT)' });
+			translated.deleteConfirm = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.deleteConfirm', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEPAYMENT)' });
 		});
 		//-----------------Custom Actions-------------------//
 		Extensions.getWindows(['codbex-invoices-custom-action']).then((response) => {
@@ -120,8 +120,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 				}, (error) => {
 					const message = error.data ? error.data.message : '';
 					Dialogs.showAlert({
-						title: LocaleService.t('codbex-invoices:t.SALESINVOICEPAYMENT'),
-						message: LocaleService.t('codbex-invoices:messages.error.unableToLF', { name: '$t(codbex-invoices:t.SALESINVOICEPAYMENT)', message: message }),
+						title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.SALESINVOICEPAYMENT'),
+						message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLF', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEPAYMENT)', message: message }),
 						type: AlertTypes.Error
 					});
 					console.error('EntityService:', error);
@@ -129,8 +129,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			}, (error) => {
 				const message = error.data ? error.data.message : '';
 				Dialogs.showAlert({
-					title: LocaleService.t('codbex-invoices:t.SALESINVOICEPAYMENT'),
-					message: LocaleService.t('codbex-invoices:messages.error.unableToCount', { name: '$t(codbex-invoices:t.SALESINVOICEPAYMENT)', message: message }),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.SALESINVOICEPAYMENT'),
+					message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToCount', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEPAYMENT)', message: message }),
 					type: AlertTypes.Error
 				});
 				console.error('EntityService:', error);
@@ -220,8 +220,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 					}, (error) => {
 						const message = error.data ? error.data.message : '';
 						Dialogs.showAlert({
-							title: LocaleService.t('codbex-invoices:t.SALESINVOICEPAYMENT'),
-							message: LocaleService.t('codbex-invoices:messages.error.unableToDelete', { name: '$t(codbex-invoices:t.SALESINVOICEPAYMENT)', message: message }),
+							title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.SALESINVOICEPAYMENT'),
+							message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToDelete', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEPAYMENT)', message: message }),
 							type: AlertTypes.Error,
 						});
 						console.error('EntityService:', error);
@@ -245,7 +245,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			const message = error.data ? error.data.message : '';
 			Dialogs.showAlert({
 				title: 'SalesInvoice',
-				message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+				message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 				type: AlertTypes.Error
 			});
 		});
@@ -260,7 +260,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			const message = error.data ? error.data.message : '';
 			Dialogs.showAlert({
 				title: 'CustomerPayment',
-				message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+				message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 				type: AlertTypes.Error
 			});
 		});
diff --git a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoicePayment/dialog-filter/index.html b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoicePayment/dialog-filter/index.html
index 654760d..1137cbf 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoicePayment/dialog-filter/index.html
+++ b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoicePayment/dialog-filter/index.html
@@ -17,10 +17,10 @@
 			<bk-message-strip class="fd-margin--md" ng-show="errorMessage" glyph="sap-icon--message-error" state="error" on-dismiss="clearErrorMessage()">{{ errorMessage }}</bk-message-strip>
 
             <bk-fieldset class="fd-padding-begin-end--sm" ng-form="forms.details">
-                <bk-form-group label="{{ 'codbex-invoices:defaults.formGrpFilter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICEPAYMENT)'} }}" name="entityForm" transclude-classes="fd-container fd-form-layout-grid-container">
+                <bk-form-group label="{{ 'codbex-invoices:codbex-invoices-model.defaults.formGrpFilter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEPAYMENT)'} }}" name="entityForm" transclude-classes="fd-container fd-form-layout-grid-container">
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idCustomerPayment" colon="true">{{ 'codbex-invoices:t.SALESINVOICEPAYMENT_CUSTOMERPAYMENT' | t }}</bk-form-label>
+                        	<bk-form-label for="idCustomerPayment" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICEPAYMENT_CUSTOMERPAYMENT' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--8">
 	                        <bk-combobox-input input-id="idCustomerPayment"
@@ -28,21 +28,21 @@
 	                            state="{{ forms.details['CustomerPayment'].$valid ? '' : 'error' }}"
 	                            ng-model="entity.CustomerPayment"
 	                            dropdown-items="optionsCustomerPayment"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.SALESINVOICEPAYMENT_CUSTOMERPAYMENT)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'CustomerPayment'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'CustomerPayment'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEPAYMENT_CUSTOMERPAYMENT)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'CustomerPayment'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'CustomerPayment'} }}">
 	                        </bk-combobox-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idAmount" colon="true">{{ 'codbex-invoices:t.SALESINVOICEPAYMENT_AMOUNT' | t }}</bk-form-label>
+                        	<bk-form-label for="idAmount" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICEPAYMENT_AMOUNT' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--4">
 	                        <bk-step-input input-id="idAmount"
 								name="Amount"
 								state="{{ forms.details['Amount'].$valid ? '' : 'error' }}"
 								ng-model="entity.Amount"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICEPAYMENT_AMOUNT)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEPAYMENT_AMOUNT)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
@@ -53,13 +53,13 @@
         <bk-bar bar-design="footer" compact="true" ng-show="action !== 'select'">
 			<bk-bar-right>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.filter' | t }}" state="emphasized" ng-click="filter()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.filter' | t }}" state="emphasized" ng-click="filter()"></bk-button>
 				</bk-bar-element>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.reset' | t }}" ng-click="resetFilter()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.reset' | t }}" ng-click="resetFilter()"></bk-button>
 				</bk-bar-element>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
 				</bk-bar-element>
 			</bk-bar-right>
 		</bk-bar>
diff --git a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoicePayment/dialog-filter/view.js b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoicePayment/dialog-filter/view.js
index 20967dd..690852c 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoicePayment/dialog-filter/view.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoicePayment/dialog-filter/view.js
@@ -7,9 +7,9 @@ const viewData = {
     id: 'SalesInvoicePayment-filter',
     label: 'SalesInvoicePayment Filter',
     translation: {
-        key: 'codbex-invoices:extName',
+        key: 'codbex-invoices:codbex-invoices-model.extName',
         options: {
-            content: '$t(codbex-invoices:t.SALESINVOICEPAYMENT) $t(codbex-invoices:defaults.filter)',
+            content: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEPAYMENT) $t(codbex-invoices:codbex-invoices-model.defaults.filter)',
         }
     },
     path: '/services/web/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoicePayment/dialog-filter/index.html',
diff --git a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoicePayment/dialog-window/controller.js b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoicePayment/dialog-window/controller.js
index 77b8874..70655bd 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoicePayment/dialog-window/controller.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoicePayment/dialog-window/controller.js
@@ -20,12 +20,12 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 		$scope.action = 'select';
 
 		LocaleService.onInit(() => {
-			description = LocaleService.t('codbex-invoices:defaults.description');
-			$scope.formHeaders.select = LocaleService.t('codbex-invoices:defaults.formHeadSelect', { name: '$t(codbex-invoices:t.SALESINVOICEPAYMENT)' });
-			$scope.formHeaders.create = LocaleService.t('codbex-invoices:defaults.formHeadCreate', { name: '$t(codbex-invoices:t.SALESINVOICEPAYMENT)' });
-			$scope.formHeaders.update = LocaleService.t('codbex-invoices:defaults.formHeadUpdate', { name: '$t(codbex-invoices:t.SALESINVOICEPAYMENT)' });
-			propertySuccessfullyCreated = LocaleService.t('codbex-invoices:messages.propertySuccessfullyCreated', { name: '$t(codbex-invoices:t.SALESINVOICEPAYMENT)' });
-			propertySuccessfullyUpdated = LocaleService.t('codbex-invoices:messages.propertySuccessfullyUpdated', { name: '$t(codbex-invoices:t.SALESINVOICEPAYMENT)' });
+			description = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.description');
+			$scope.formHeaders.select = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.formHeadSelect', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEPAYMENT)' });
+			$scope.formHeaders.create = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.formHeadCreate', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEPAYMENT)' });
+			$scope.formHeaders.update = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.formHeadUpdate', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEPAYMENT)' });
+			propertySuccessfullyCreated = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.propertySuccessfullyCreated', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEPAYMENT)' });
+			propertySuccessfullyUpdated = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.propertySuccessfullyUpdated', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEPAYMENT)' });
 		});
 
 		let params = ViewParameters.get();
@@ -44,7 +44,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			EntityService.create(entity).then((response) => {
 				Dialogs.postMessage({ topic: 'codbex-invoices.SalesInvoice.SalesInvoicePayment.entityCreated', data: response.data });
 				Notifications.show({
-					title: LocaleService.t('codbex-invoices:t.SALESINVOICEPAYMENT'),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.SALESINVOICEPAYMENT'),
 					description: propertySuccessfullyCreated,
 					type: 'positive'
 				});
@@ -52,8 +52,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			}, (error) => {
 				const message = error.data ? error.data.message : '';
 				Dialogs.showAlert({
-					title: LocaleService.t('codbex-invoices:t.SALESINVOICEPAYMENT'),
-					message: LocaleService.t('codbex-invoices:messages.error.unableToCreate', { name: '$t(codbex-invoices:t.SALESINVOICEPAYMENT)', message: message }),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.SALESINVOICEPAYMENT'),
+					message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToCreate', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEPAYMENT)', message: message }),
 					type: AlertTypes.Error
 				});
 				console.error('EntityService:', error);
@@ -67,7 +67,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			EntityService.update(id, entity).then((response) => {
 				Dialogs.postMessage({ topic: 'codbex-invoices.SalesInvoice.SalesInvoicePayment.entityUpdated', data: response.data });
 				Notifications.show({
-					title: LocaleService.t('codbex-invoices:t.SALESINVOICEPAYMENT'),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.SALESINVOICEPAYMENT'),
 					description: propertySuccessfullyUpdated,
 					type: 'positive'
 				});
@@ -75,8 +75,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			}, (error) => {
 				const message = error.data ? error.data.message : '';
 				Dialogs.showAlert({
-					title: LocaleService.t('codbex-invoices:t.SALESINVOICEPAYMENT'),
-					message: LocaleService.t('codbex-invoices:messages.error.unableToUpdate', { name: '$t(codbex-invoices:t.SALESINVOICEPAYMENT)', message: message }),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.SALESINVOICEPAYMENT'),
+					message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToUpdate', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEPAYMENT)', message: message }),
 					type: AlertTypes.Error
 				});
 				console.error('EntityService:', error);
diff --git a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoicePayment/dialog-window/index.html b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoicePayment/dialog-window/index.html
index 444423f..9c691e9 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoicePayment/dialog-window/index.html
+++ b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoicePayment/dialog-window/index.html
@@ -19,7 +19,7 @@
                 <bk-form-group label="{{formHeaders[action]}}" name="entityForm" transclude-classes="fd-container fd-form-layout-grid-container">
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idCustomerPayment" ng-required="false" colon="true">{{ 'codbex-invoices:t.SALESINVOICEPAYMENT_CUSTOMERPAYMENT' | t }}</bk-form-label>
+                        	<bk-form-label for="idCustomerPayment" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICEPAYMENT_CUSTOMERPAYMENT' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
 	                        <bk-combobox-input input-id="idCustomerPayment"
@@ -29,14 +29,14 @@
 	                            ng-model="entity.CustomerPayment"
 	                            is-readonly="action === 'select'"
 	                            dropdown-items="optionsCustomerPayment"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.SALESINVOICEPAYMENT_CUSTOMERPAYMENT)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'CustomerPayment'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'CustomerPayment'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEPAYMENT_CUSTOMERPAYMENT)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'CustomerPayment'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'CustomerPayment'} }}">
 	                        </bk-combobox-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idAmount" ng-required="true" colon="true">{{ 'codbex-invoices:t.SALESINVOICEPAYMENT_AMOUNT' | t }}</bk-form-label>
+                        	<bk-form-label for="idAmount" ng-required="true" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICEPAYMENT_AMOUNT' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--4 ">
 	                        <bk-step-input input-id="idAmount"
@@ -45,7 +45,7 @@
 								ng-required="true"
 								ng-model="entity.Amount"
 								is-readonly="action === 'select'"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICEPAYMENT_AMOUNT)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICEPAYMENT_AMOUNT)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
@@ -56,11 +56,11 @@
 		<bk-bar bar-design="footer" compact="true" ng-show="action !== 'select'">
 			<bk-bar-right>
 				<bk-bar-element>
-					<bk-button ng-if="action === 'create'" label="{{'codbex-invoices:defaults.create' | t}}" state="emphasized" ng-click="create()" ng-disabled="!forms.details.$valid"></bk-button>
-					<bk-button ng-if="action !== 'create'" label="{{'codbex-invoices:defaults.update' | t}}" state="emphasized" ng-click="update()" ng-disabled="!forms.details.$valid"></bk-button>
+					<bk-button ng-if="action === 'create'" label="{{'codbex-invoices:codbex-invoices-model.defaults.create' | t}}" state="emphasized" ng-click="create()" ng-disabled="!forms.details.$valid"></bk-button>
+					<bk-button ng-if="action !== 'create'" label="{{'codbex-invoices:codbex-invoices-model.defaults.update' | t}}" state="emphasized" ng-click="update()" ng-disabled="!forms.details.$valid"></bk-button>
 				</bk-bar-element>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
 				</bk-bar-element>
 			</bk-bar-right>
 		</bk-bar>
diff --git a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoicePayment/dialog-window/view.js b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoicePayment/dialog-window/view.js
index 4d975ac..5c80567 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoicePayment/dialog-window/view.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoicePayment/dialog-window/view.js
@@ -7,7 +7,7 @@ const viewData = {
     id: 'SalesInvoicePayment-details',
     label: 'SalesInvoicePayment',
     translation: {
-        key: 'codbex-invoices:t.SALESINVOICEPAYMENT',
+        key: 'codbex-invoices:codbex-invoices-model.t.SALESINVOICEPAYMENT',
     },
     path: '/services/web/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoicePayment/dialog-window/index.html',
     perspectiveName: 'SalesInvoice'
diff --git a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoicePayment/index.html b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoicePayment/index.html
index 2c4241b..dcf40f3 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoicePayment/index.html
+++ b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoicePayment/index.html
@@ -15,28 +15,28 @@
 
 	<body class="bk-vbox">
 		<bk-message-page glyph="sap-icon--hint" ng-show="data == null">
-			<bk-message-page-title>{{'codbex-invoices:messages.detailSelectRecord' | t}}</bk-message-page-title>
+			<bk-message-page-title>{{'codbex-invoices:codbex-invoices-model.messages.detailSelectRecord' | t}}</bk-message-page-title>
 		</bk-message-page>
 
 		<bk-toolbar has-title="true" ng-hide="data == null">
-			<bk-toolbar-title>{{'codbex-invoices:defaults.items' | t}} <span bk-object-status text="{{dataCount}}" inverted="true"></bk-toolbar-title>
-			<bk-button compact="true" state="transparent" label="{{ 'codbex-invoices:defaults.filter' | t }}" ng-click="openFilter()"></bk-button>
+			<bk-toolbar-title>{{'codbex-invoices:codbex-invoices-model.defaults.items' | t}} <span bk-object-status text="{{dataCount}}" inverted="true"></bk-toolbar-title>
+			<bk-button compact="true" state="transparent" label="{{ 'codbex-invoices:codbex-invoices-model.defaults.filter' | t }}" ng-click="openFilter()"></bk-button>
 			<bk-button ng-repeat="action in pageActions track by $index" compact="true" state="transparent" label="{{action.translation.key | t:action.translation.options:action.label}}" ng-click="triggerPageAction(action)"></bk-button>
 			<bk-toolbar-spacer></bk-toolbar-spacer>
-			<bk-button compact="true" state="emphasized" label="{{'codbex-invoices:defaults.create' | t}}" ng-click="createEntity()" ng-disabled="selectedMainEntityId == null"></bk-button>
+			<bk-button compact="true" state="emphasized" label="{{'codbex-invoices:codbex-invoices-model.defaults.create' | t}}" ng-click="createEntity()" ng-disabled="selectedMainEntityId == null"></bk-button>
 		</bk-toolbar>
 		<bk-scrollbar class="bk-full-height" ng-hide="data == null">
 			<table bk-table display-mode="compact" inner-borders="top" outer-borders="none">
 				<thead bk-table-header sticky="true">
 					<tr bk-table-row>
-						<th bk-table-header-cell>{{ 'codbex-invoices:t.SALESINVOICEPAYMENT_CUSTOMERPAYMENT' | t:'CustomerPayment' }}</th>
-						<th bk-table-header-cell>{{ 'codbex-invoices:t.SALESINVOICEPAYMENT_AMOUNT' | t:'Amount' }}</th>
+						<th bk-table-header-cell>{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICEPAYMENT_CUSTOMERPAYMENT' | t:'CustomerPayment' }}</th>
+						<th bk-table-header-cell>{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICEPAYMENT_AMOUNT' | t:'Amount' }}</th>
 						<th bk-table-header-cell></th>
 					</tr>
 				</thead>
 				<tbody bk-table-body>
 					<tr bk-table-row hoverable="true" ng-show="data.length == 0">
-						<td bk-table-cell no-data="true">{{'codbex-invoices:messages.noData' | t}}</td>
+						<td bk-table-cell no-data="true">{{'codbex-invoices:codbex-invoices-model.messages.noData' | t}}</td>
 					</tr>
 					<tr bk-table-row hoverable="true" ng-repeat="next in data track by $index" selected="next.Id === selectedEntity.Id" ng-click="selectEntity(next)">
 						<td bk-table-cell ng-click="openDetails(next)" hoverable="true" activable="true">
@@ -46,14 +46,14 @@
 						<td bk-table-cell fit-content="true">
 							<bk-popover>
 								<bk-popover-control>
-									<bk-button compact="true" glyph="sap-icon--overflow" state="transparent" aria-label="{{'codbex-invoices:aria.tableRowMenuBtn' | t}}" ng-click="setTristate()"></bk-button>
+									<bk-button compact="true" glyph="sap-icon--overflow" state="transparent" aria-label="{{'codbex-invoices:codbex-invoices-model.aria.tableRowMenuBtn' | t}}" ng-click="setTristate()"></bk-button>
 								</bk-popover-control>
 								<bk-popover-body align="bottom-right">
-									<bk-menu aria-label="{{'codbex-invoices:aria.tableRowMenu' | t}}" no-backdrop="true" no-shadow="true">
+									<bk-menu aria-label="{{'codbex-invoices:codbex-invoices-model.aria.tableRowMenu' | t}}" no-backdrop="true" no-shadow="true">
 										<bk-menu-item ng-repeat="action in entityActions" title="{{action.translation.key | t:action.translation.options:action.label}}" ng-click="triggerEntityAction(action)"></bk-menu-item>
-										<bk-menu-item title="{{ 'codbex-invoices:defaults.viewDetails' | t }}" ng-click="openDetails(next)"></bk-menu-item>
-										<bk-menu-item title="{{ 'codbex-invoices:defaults.edit' | t }}" ng-click="updateEntity(next)"></bk-menu-item>
-										<bk-menu-item title="{{ 'codbex-invoices:defaults.delete' | t }}" ng-click="deleteEntity(next)"></bk-menu-item>
+										<bk-menu-item title="{{ 'codbex-invoices:codbex-invoices-model.defaults.viewDetails' | t }}" ng-click="openDetails(next)"></bk-menu-item>
+										<bk-menu-item title="{{ 'codbex-invoices:codbex-invoices-model.defaults.edit' | t }}" ng-click="updateEntity(next)"></bk-menu-item>
+										<bk-menu-item title="{{ 'codbex-invoices:codbex-invoices-model.defaults.delete' | t }}" ng-click="deleteEntity(next)"></bk-menu-item>
 									</bk-menu>
 								</bk-popover-body>
 							</bk-popover>
diff --git a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoicePayment/view.js b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoicePayment/view.js
index 180c038..0a76f90 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoicePayment/view.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/SalesInvoicePayment/view.js
@@ -7,7 +7,7 @@ const viewData = {
     id: 'SalesInvoicePayment',
     label: 'SalesInvoicePayment',
     translation: {
-        key: 'codbex-invoices:t.SALESINVOICEPAYMENT',
+        key: 'codbex-invoices:codbex-invoices-model.t.SALESINVOICEPAYMENT',
     },
     region: 'bottom',
     lazyLoad: false,
diff --git a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/controller.js b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/controller.js
index 437616b..23bb862 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/controller.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/controller.js
@@ -12,10 +12,10 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 		};
 
 		LocaleService.onInit(() => {
-			translated.yes = LocaleService.t('codbex-invoices:defaults.yes');
-			translated.no = LocaleService.t('codbex-invoices:defaults.no');
-			translated.deleteTitle = LocaleService.t('codbex-invoices:defaults.deleteTitle', { name: '$t(codbex-invoices:t.SALESINVOICE)' });
-			translated.deleteConfirm = LocaleService.t('codbex-invoices:messages.deleteConfirm', { name: '$t(codbex-invoices:t.SALESINVOICE)' });
+			translated.yes = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.yes');
+			translated.no = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.no');
+			translated.deleteTitle = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.deleteTitle', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE)' });
+			translated.deleteConfirm = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.deleteConfirm', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE)' });
 		});
 		$scope.dataPage = 1;
 		$scope.dataCount = 0;
@@ -114,8 +114,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 				}, (error) => {
 					const message = error.data ? error.data.message : '';
 					Dialogs.showAlert({
-						title: LocaleService.t('codbex-invoices:t.SALESINVOICE'),
-						message: LocaleService.t('codbex-invoices:messages.error.unableToLF', { name: '$t(codbex-invoices:t.SALESINVOICE)', message: message }),
+						title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.SALESINVOICE'),
+						message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLF', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE)', message: message }),
 						type: AlertTypes.Error
 					});
 					console.error('EntityService:', error);
@@ -123,8 +123,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			}, (error) => {
 				const message = error.data ? error.data.message : '';
 				Dialogs.showAlert({
-					title: LocaleService.t('codbex-invoices:t.SALESINVOICE'),
-					message: LocaleService.t('codbex-invoices:messages.error.unableToCount', { name: '$t(codbex-invoices:t.SALESINVOICE)', message: message }),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.SALESINVOICE'),
+					message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToCount', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE)', message: message }),
 					type: AlertTypes.Error
 				});
 				console.error('EntityService:', error);
@@ -203,8 +203,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 					}, (error) => {
 						const message = error.data ? error.data.message : '';
 						Dialogs.showAlert({
-							title: LocaleService.t('codbex-invoices:t.SALESINVOICE'),
-							message: LocaleService.t('codbex-invoices:messages.error.unableToDelete', { name: '$t(codbex-invoices:t.SALESINVOICE)', message: message }),
+							title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.SALESINVOICE'),
+							message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToDelete', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE)', message: message }),
 							type: AlertTypes.Error
 						});
 						console.error('EntityService:', error);
@@ -251,7 +251,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			const message = error.data ? error.data.message : '';
 			Dialogs.showAlert({
 				title: 'Type',
-				message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+				message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 				type: AlertTypes.Error
 			});
 		});
@@ -266,7 +266,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			const message = error.data ? error.data.message : '';
 			Dialogs.showAlert({
 				title: 'Customer',
-				message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+				message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 				type: AlertTypes.Error
 			});
 		});
@@ -281,7 +281,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			const message = error.data ? error.data.message : '';
 			Dialogs.showAlert({
 				title: 'Currency',
-				message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+				message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 				type: AlertTypes.Error
 			});
 		});
@@ -296,7 +296,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			const message = error.data ? error.data.message : '';
 			Dialogs.showAlert({
 				title: 'PaymentMethod',
-				message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+				message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 				type: AlertTypes.Error
 			});
 		});
@@ -311,7 +311,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			const message = error.data ? error.data.message : '';
 			Dialogs.showAlert({
 				title: 'SentMethod',
-				message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+				message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 				type: AlertTypes.Error
 			});
 		});
@@ -326,7 +326,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			const message = error.data ? error.data.message : '';
 			Dialogs.showAlert({
 				title: 'Status',
-				message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+				message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 				type: AlertTypes.Error
 			});
 		});
@@ -341,7 +341,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			const message = error.data ? error.data.message : '';
 			Dialogs.showAlert({
 				title: 'Operator',
-				message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+				message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 				type: AlertTypes.Error
 			});
 		});
@@ -356,7 +356,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			const message = error.data ? error.data.message : '';
 			Dialogs.showAlert({
 				title: 'Company',
-				message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+				message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 				type: AlertTypes.Error
 			});
 		});
diff --git a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/dialog-filter/index.html b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/dialog-filter/index.html
index c22d2d0..84e1b89 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/dialog-filter/index.html
+++ b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/dialog-filter/index.html
@@ -17,27 +17,27 @@
 			<bk-message-strip class="fd-margin--md" ng-show="errorMessage" glyph="sap-icon--message-error" state="error" on-dismiss="clearErrorMessage()">{{ errorMessage }}</bk-message-strip>
 
             <bk-fieldset class="fd-padding-begin-end--sm" ng-form="forms.details">
-                <bk-form-group label="{{ 'codbex-invoices:defaults.formGrpFilter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE)'} }}" name="entityForm" transclude-classes="fd-container fd-form-layout-grid-container">
+                <bk-form-group label="{{ 'codbex-invoices:codbex-invoices-model.defaults.formGrpFilter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE)'} }}" name="entityForm" transclude-classes="fd-container fd-form-layout-grid-container">
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idNumber" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_NUMBER' | t }}</bk-form-label>
+                        	<bk-form-label for="idNumber" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_NUMBER' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--8">
-							<bk-form-input-message state="{{ forms.details['Number'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:messages.error.incorrectInput' | t}}">
+							<bk-form-input-message state="{{ forms.details['Number'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:codbex-invoices-model.messages.error.incorrectInput' | t}}">
 								<bk-input id="idNumber"
 	                                name="Number"
 	                                state="{{ forms.details['Number'].$valid ? '' : 'error' }}"
 	                                ng-model="entity.Number"
 									ng-maxlength="20.0"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_NUMBER)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_NUMBER)'} }}">
 	                            </bk-input>
 							</bk-form-input-message>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idType" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_TYPE' | t }}</bk-form-label>
+                        	<bk-form-label for="idType" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_TYPE' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--8">
 	                        <bk-combobox-input input-id="idType"
@@ -45,14 +45,14 @@
 	                            state="{{ forms.details['Type'].$valid ? '' : 'error' }}"
 	                            ng-model="entity.Type"
 	                            dropdown-items="optionsType"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_TYPE)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'Type'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'Type'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_TYPE)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'Type'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'Type'} }}">
 	                        </bk-combobox-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idCustomer" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_CUSTOMER' | t }}</bk-form-label>
+                        	<bk-form-label for="idCustomer" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_CUSTOMER' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--8">
 	                        <bk-combobox-input input-id="idCustomer"
@@ -60,17 +60,17 @@
 	                            state="{{ forms.details['Customer'].$valid ? '' : 'error' }}"
 	                            ng-model="entity.Customer"
 	                            dropdown-items="optionsCustomer"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_CUSTOMER)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'Customer'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'Customer'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_CUSTOMER)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'Customer'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'Customer'} }}">
 	                        </bk-combobox-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idDateFrom" colon="true">{{ 'codbex-invoices:defaults.from' | t:{'text':'$t(codbex-invoices:t.SALESINVOICE_DATE)'} }}</bk-form-label>
+                        	<bk-form-label for="idDateFrom" colon="true">{{ 'codbex-invoices:codbex-invoices-model.defaults.from' | t:{'text':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_DATE)'} }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--2">
-							<bk-form-input-message state="{{ forms.details['Date'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:messages.error.incorrectInput' | t}}">
+							<bk-form-input-message state="{{ forms.details['Date'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:codbex-invoices-model.messages.error.incorrectInput' | t}}">
 								<bk-input id="idDateFrom"
 	                                name="Date"
 	                                state="{{ forms.details['Date'].$valid ? '' : 'error' }}"
@@ -80,10 +80,10 @@
 							</bk-form-input-message>
 	                    </div>
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idDateTo" colon="true">{{ 'codbex-invoices:defaults.to' | t:{'text':'$t(codbex-invoices:t.SALESINVOICE_DATE)'} }}</bk-form-label>
+                        	<bk-form-label for="idDateTo" colon="true">{{ 'codbex-invoices:codbex-invoices-model.defaults.to' | t:{'text':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_DATE)'} }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--2">
-							<bk-form-input-message state="{{ forms.details['Date'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:messages.error.incorrectInput' | t}}">
+							<bk-form-input-message state="{{ forms.details['Date'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:codbex-invoices-model.messages.error.incorrectInput' | t}}">
 								<bk-input id="idDateTo"
 	                                name="Date"
 	                                state="{{ forms.details['Date'].$valid ? '' : 'error' }}"
@@ -95,10 +95,10 @@
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idDueFrom" colon="true">{{ 'codbex-invoices:defaults.from' | t:{'text':'$t(codbex-invoices:t.SALESINVOICE_DUE)'} }}</bk-form-label>
+                        	<bk-form-label for="idDueFrom" colon="true">{{ 'codbex-invoices:codbex-invoices-model.defaults.from' | t:{'text':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_DUE)'} }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--2">
-							<bk-form-input-message state="{{ forms.details['Due'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:messages.error.incorrectInput' | t}}">
+							<bk-form-input-message state="{{ forms.details['Due'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:codbex-invoices-model.messages.error.incorrectInput' | t}}">
 								<bk-input id="idDueFrom"
 	                                name="Due"
 	                                state="{{ forms.details['Due'].$valid ? '' : 'error' }}"
@@ -108,10 +108,10 @@
 							</bk-form-input-message>
 	                    </div>
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idDueTo" colon="true">{{ 'codbex-invoices:defaults.to' | t:{'text':'$t(codbex-invoices:t.SALESINVOICE_DUE)'} }}</bk-form-label>
+                        	<bk-form-label for="idDueTo" colon="true">{{ 'codbex-invoices:codbex-invoices-model.defaults.to' | t:{'text':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_DUE)'} }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--2">
-							<bk-form-input-message state="{{ forms.details['Due'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:messages.error.incorrectInput' | t}}">
+							<bk-form-input-message state="{{ forms.details['Due'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:codbex-invoices-model.messages.error.incorrectInput' | t}}">
 								<bk-input id="idDueTo"
 	                                name="Due"
 	                                state="{{ forms.details['Due'].$valid ? '' : 'error' }}"
@@ -123,20 +123,20 @@
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idNet" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_NET' | t }}</bk-form-label>
+                        	<bk-form-label for="idNet" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_NET' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--4">
 	                        <bk-step-input input-id="idNet"
 								name="Net"
 								state="{{ forms.details['Net'].$valid ? '' : 'error' }}"
 								ng-model="entity.Net"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_NET)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_NET)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idCurrency" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_CURRENCY' | t }}</bk-form-label>
+                        	<bk-form-label for="idCurrency" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_CURRENCY' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--8">
 	                        <bk-combobox-input input-id="idCurrency"
@@ -144,108 +144,108 @@
 	                            state="{{ forms.details['Currency'].$valid ? '' : 'error' }}"
 	                            ng-model="entity.Currency"
 	                            dropdown-items="optionsCurrency"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_CURRENCY)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'Currency'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'Currency'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_CURRENCY)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'Currency'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'Currency'} }}">
 	                        </bk-combobox-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idGross" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_GROSS' | t }}</bk-form-label>
+                        	<bk-form-label for="idGross" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_GROSS' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--4">
 	                        <bk-step-input input-id="idGross"
 								name="Gross"
 								state="{{ forms.details['Gross'].$valid ? '' : 'error' }}"
 								ng-model="entity.Gross"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_GROSS)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_GROSS)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idDiscount" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_DISCOUNT' | t }}</bk-form-label>
+                        	<bk-form-label for="idDiscount" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_DISCOUNT' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--4">
 	                        <bk-step-input input-id="idDiscount"
 								name="Discount"
 								state="{{ forms.details['Discount'].$valid ? '' : 'error' }}"
 								ng-model="entity.Discount"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_DISCOUNT)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_DISCOUNT)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idTaxes" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_TAXES' | t }}</bk-form-label>
+                        	<bk-form-label for="idTaxes" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_TAXES' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--4">
 	                        <bk-step-input input-id="idTaxes"
 								name="Taxes"
 								state="{{ forms.details['Taxes'].$valid ? '' : 'error' }}"
 								ng-model="entity.Taxes"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_TAXES)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_TAXES)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idVAT" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_VAT' | t }}</bk-form-label>
+                        	<bk-form-label for="idVAT" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_VAT' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--4">
 	                        <bk-step-input input-id="idVAT"
 								name="VAT"
 								state="{{ forms.details['VAT'].$valid ? '' : 'error' }}"
 								ng-model="entity.VAT"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_VAT)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_VAT)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idTotal" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_TOTAL' | t }}</bk-form-label>
+                        	<bk-form-label for="idTotal" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_TOTAL' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--4">
 	                        <bk-step-input input-id="idTotal"
 								name="Total"
 								state="{{ forms.details['Total'].$valid ? '' : 'error' }}"
 								ng-model="entity.Total"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_TOTAL)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_TOTAL)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idPaid" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_PAID' | t }}</bk-form-label>
+                        	<bk-form-label for="idPaid" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_PAID' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--4">
 	                        <bk-step-input input-id="idPaid"
 								name="Paid"
 								state="{{ forms.details['Paid'].$valid ? '' : 'error' }}"
 								ng-model="entity.Paid"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_PAID)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_PAID)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
 					<bk-form-item class="fd-row">
 						<div class="fd-col fd-col-md--2">
-							<bk-form-label for="idConditions" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_CONDITIONS' | t }}</bk-form-label>
+							<bk-form-label for="idConditions" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_CONDITIONS' | t }}</bk-form-label>
 						</div>
 						<div class="fd-col fd-col-md--8">
-							<bk-form-input-message state="{{ forms.details['Conditions'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:messages.error.incorrectInput' | t}}">
+							<bk-form-input-message state="{{ forms.details['Conditions'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:codbex-invoices-model.messages.error.incorrectInput' | t}}">
 								<bk-textarea id="idConditions"
 									name="Conditions"
 									state="{{ forms.details['Conditions'].$valid ? '' : 'error' }}"
 									ng-model="entity.Conditions"
 									ng-maxlength="200.0"
-									placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_CONDITIONS)'} }}">
+									placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_CONDITIONS)'} }}">
 								</bk-textarea>
 							</bk-form-input-message>
 						</div>
 					</bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idPaymentMethod" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_PAYMENTMETHOD' | t }}</bk-form-label>
+                        	<bk-form-label for="idPaymentMethod" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_PAYMENTMETHOD' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--8">
 	                        <bk-combobox-input input-id="idPaymentMethod"
@@ -253,14 +253,14 @@
 	                            state="{{ forms.details['PaymentMethod'].$valid ? '' : 'error' }}"
 	                            ng-model="entity.PaymentMethod"
 	                            dropdown-items="optionsPaymentMethod"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_PAYMENTMETHOD)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'PaymentMethod'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'PaymentMethod'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_PAYMENTMETHOD)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'PaymentMethod'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'PaymentMethod'} }}">
 	                        </bk-combobox-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idSentMethod" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_SENTMETHOD' | t }}</bk-form-label>
+                        	<bk-form-label for="idSentMethod" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_SENTMETHOD' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--8">
 	                        <bk-combobox-input input-id="idSentMethod"
@@ -268,14 +268,14 @@
 	                            state="{{ forms.details['SentMethod'].$valid ? '' : 'error' }}"
 	                            ng-model="entity.SentMethod"
 	                            dropdown-items="optionsSentMethod"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_SENTMETHOD)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'SentMethod'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'SentMethod'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_SENTMETHOD)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'SentMethod'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'SentMethod'} }}">
 	                        </bk-combobox-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idStatus" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_STATUS' | t }}</bk-form-label>
+                        	<bk-form-label for="idStatus" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_STATUS' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--8">
 	                        <bk-combobox-input input-id="idStatus"
@@ -283,14 +283,14 @@
 	                            state="{{ forms.details['Status'].$valid ? '' : 'error' }}"
 	                            ng-model="entity.Status"
 	                            dropdown-items="optionsStatus"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_STATUS)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'Status'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'Status'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_STATUS)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'Status'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'Status'} }}">
 	                        </bk-combobox-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idOperator" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_OPERATOR' | t }}</bk-form-label>
+                        	<bk-form-label for="idOperator" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_OPERATOR' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--8">
 	                        <bk-combobox-input input-id="idOperator"
@@ -298,30 +298,30 @@
 	                            state="{{ forms.details['Operator'].$valid ? '' : 'error' }}"
 	                            ng-model="entity.Operator"
 	                            dropdown-items="optionsOperator"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_OPERATOR)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'Operator'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'Operator'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_OPERATOR)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'Operator'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'Operator'} }}">
 	                        </bk-combobox-input>
 	                    </div>
                     </bk-form-item>
 					<bk-form-item class="fd-row">
 						<div class="fd-col fd-col-md--2">
-							<bk-form-label for="idDocument" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_DOCUMENT' | t }}</bk-form-label>
+							<bk-form-label for="idDocument" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_DOCUMENT' | t }}</bk-form-label>
 						</div>
 						<div class="fd-col fd-col-md--8">
-							<bk-form-input-message state="{{ forms.details['Document'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:messages.error.incorrectInput' | t}}">
+							<bk-form-input-message state="{{ forms.details['Document'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:codbex-invoices-model.messages.error.incorrectInput' | t}}">
 								<bk-textarea id="idDocument"
 									name="Document"
 									state="{{ forms.details['Document'].$valid ? '' : 'error' }}"
 									ng-model="entity.Document"
 									ng-maxlength="200.0"
-									placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_DOCUMENT)'} }}">
+									placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_DOCUMENT)'} }}">
 								</bk-textarea>
 							</bk-form-input-message>
 						</div>
 					</bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idCompany" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_COMPANY' | t }}</bk-form-label>
+                        	<bk-form-label for="idCompany" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_COMPANY' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--8">
 	                        <bk-combobox-input input-id="idCompany"
@@ -329,74 +329,74 @@
 	                            state="{{ forms.details['Company'].$valid ? '' : 'error' }}"
 	                            ng-model="entity.Company"
 	                            dropdown-items="optionsCompany"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_COMPANY)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'Company'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'Company'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_COMPANY)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'Company'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'Company'} }}">
 	                        </bk-combobox-input>
 	                    </div>
                     </bk-form-item>
 					<bk-form-item class="fd-row">
 						<div class="fd-col fd-col-md--2">
-							<bk-form-label for="idName" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_NAME' | t }}</bk-form-label>
+							<bk-form-label for="idName" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_NAME' | t }}</bk-form-label>
 						</div>
 						<div class="fd-col fd-col-md--8">
-							<bk-form-input-message state="{{ forms.details['Name'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:messages.error.incorrectInput' | t}}">
+							<bk-form-input-message state="{{ forms.details['Name'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:codbex-invoices-model.messages.error.incorrectInput' | t}}">
 								<bk-textarea id="idName"
 									name="Name"
 									state="{{ forms.details['Name'].$valid ? '' : 'error' }}"
 									ng-model="entity.Name"
 									ng-maxlength="200.0"
-									placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_NAME)'} }}">
+									placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_NAME)'} }}">
 								</bk-textarea>
 							</bk-form-input-message>
 						</div>
 					</bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idUUID" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_UUID' | t }}</bk-form-label>
+                        	<bk-form-label for="idUUID" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_UUID' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--8">
-							<bk-form-input-message state="{{ forms.details['UUID'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:messages.error.incorrectInput' | t}}">
+							<bk-form-input-message state="{{ forms.details['UUID'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:codbex-invoices-model.messages.error.incorrectInput' | t}}">
 								<bk-input id="idUUID"
 	                                name="UUID"
 	                                state="{{ forms.details['UUID'].$valid ? '' : 'error' }}"
 	                                ng-model="entity.UUID"
 									ng-maxlength="36.0"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_UUID)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_UUID)'} }}">
 	                            </bk-input>
 							</bk-form-input-message>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idProcess" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_PROCESS' | t }}</bk-form-label>
+                        	<bk-form-label for="idProcess" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_PROCESS' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--8">
-							<bk-form-input-message state="{{ forms.details['Process'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:messages.error.incorrectInput' | t}}">
+							<bk-form-input-message state="{{ forms.details['Process'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:codbex-invoices-model.messages.error.incorrectInput' | t}}">
 								<bk-input id="idProcess"
 	                                name="Process"
 	                                state="{{ forms.details['Process'].$valid ? '' : 'error' }}"
 	                                ng-model="entity.Process"
 									ng-maxlength="36.0"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_PROCESS)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_PROCESS)'} }}">
 	                            </bk-input>
 							</bk-form-input-message>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idReference" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_REFERENCE' | t }}</bk-form-label>
+                        	<bk-form-label for="idReference" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_REFERENCE' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--8">
-							<bk-form-input-message state="{{ forms.details['Reference'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:messages.error.incorrectInput' | t}}">
+							<bk-form-input-message state="{{ forms.details['Reference'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:codbex-invoices-model.messages.error.incorrectInput' | t}}">
 								<bk-input id="idReference"
 	                                name="Reference"
 	                                state="{{ forms.details['Reference'].$valid ? '' : 'error' }}"
 	                                ng-model="entity.Reference"
 									ng-maxlength="100.0"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_REFERENCE)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_REFERENCE)'} }}">
 	                            </bk-input>
 							</bk-form-input-message>
 	                    </div>
@@ -408,13 +408,13 @@
         <bk-bar bar-design="footer" compact="true" ng-show="action !== 'select'">
 			<bk-bar-right>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.filter' | t }}" state="emphasized" ng-click="filter()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.filter' | t }}" state="emphasized" ng-click="filter()"></bk-button>
 				</bk-bar-element>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.reset' | t }}" ng-click="resetFilter()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.reset' | t }}" ng-click="resetFilter()"></bk-button>
 				</bk-bar-element>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
 				</bk-bar-element>
 			</bk-bar-right>
 		</bk-bar>
diff --git a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/dialog-filter/view.js b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/dialog-filter/view.js
index 86c50a5..629493e 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/dialog-filter/view.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/dialog-filter/view.js
@@ -7,9 +7,9 @@ const viewData = {
     id: 'SalesInvoice-filter',
     label: 'SalesInvoice Filter',
     translation: {
-        key: 'codbex-invoices:extName',
+        key: 'codbex-invoices:codbex-invoices-model.extName',
         options: {
-            content: '$t(codbex-invoices:t.SALESINVOICE) $t(codbex-invoices:defaults.filter)',
+            content: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE) $t(codbex-invoices:codbex-invoices-model.defaults.filter)',
         }
     },
     path: '/services/web/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/dialog-filter/index.html',
diff --git a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/dialog-window/controller.js b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/dialog-window/controller.js
index ba631d4..1e8ef24 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/dialog-window/controller.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/dialog-window/controller.js
@@ -20,12 +20,12 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 		$scope.action = 'select';
 
 		LocaleService.onInit(() => {
-			description = LocaleService.t('codbex-invoices:defaults.description');
-			$scope.formHeaders.select = LocaleService.t('codbex-invoices:defaults.formHeadSelect', { name: '$t(codbex-invoices:t.SALESINVOICE)' });
-			$scope.formHeaders.create = LocaleService.t('codbex-invoices:defaults.formHeadCreate', { name: '$t(codbex-invoices:t.SALESINVOICE)' });
-			$scope.formHeaders.update = LocaleService.t('codbex-invoices:defaults.formHeadUpdate', { name: '$t(codbex-invoices:t.SALESINVOICE)' });
-			propertySuccessfullyCreated = LocaleService.t('codbex-invoices:messages.propertySuccessfullyCreated', { name: '$t(codbex-invoices:t.SALESINVOICE)' });
-			propertySuccessfullyUpdated = LocaleService.t('codbex-invoices:messages.propertySuccessfullyUpdated', { name: '$t(codbex-invoices:t.SALESINVOICE)' });
+			description = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.description');
+			$scope.formHeaders.select = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.formHeadSelect', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE)' });
+			$scope.formHeaders.create = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.formHeadCreate', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE)' });
+			$scope.formHeaders.update = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.formHeadUpdate', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE)' });
+			propertySuccessfullyCreated = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.propertySuccessfullyCreated', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE)' });
+			propertySuccessfullyUpdated = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.propertySuccessfullyUpdated', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE)' });
 		});
 
 		let params = ViewParameters.get();
@@ -56,7 +56,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			EntityService.create(entity).then((response) => {
 				Dialogs.postMessage({ topic: 'codbex-invoices.SalesInvoice.SalesInvoice.entityCreated', data: response.data });
 				Notifications.show({
-					title: LocaleService.t('codbex-invoices:t.SALESINVOICE'),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.SALESINVOICE'),
 					description: propertySuccessfullyCreated,
 					type: 'positive'
 				});
@@ -64,7 +64,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			}, (error) => {
 				const message = error.data ? error.data.message : '';
 				$scope.$evalAsync(() => {
-					$scope.errorMessage = LocaleService.t('codbex-invoices:messages.error.unableToCreate', { name: '$t(codbex-invoices:t.SALESINVOICE)', message: message });
+					$scope.errorMessage = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToCreate', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE)', message: message });
 				});
 				console.error('EntityService:', error);
 			});
@@ -78,14 +78,14 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 				Dialogs.postMessage({ topic: 'codbex-invoices.SalesInvoice.SalesInvoice.entityUpdated', data: response.data });
 				$scope.cancel();
 				Notifications.show({
-					title: LocaleService.t('codbex-invoices:t.SALESINVOICE'),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.SALESINVOICE'),
 					description: propertySuccessfullyUpdated,
 					type: 'positive'
 				});
 			}, (error) => {
 				const message = error.data ? error.data.message : '';
 				$scope.$evalAsync(() => {
-					$scope.errorMessage = LocaleService.t('codbex-invoices:messages.error.unableToUpdate', { name: '$t(codbex-invoices:t.SALESINVOICE)', message: message });
+					$scope.errorMessage = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToUpdate', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE)', message: message });
 				});
 				console.error('EntityService:', error);
 			});
@@ -105,7 +105,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			const message = error.data ? error.data.message : '';
 			Dialogs.showAlert({
 				title: 'Type',
-				message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+				message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 				type: AlertTypes.Error
 			});
 		});
@@ -123,7 +123,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			const message = error.data ? error.data.message : '';
 			Dialogs.showAlert({
 				title: 'Customer',
-				message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+				message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 				type: AlertTypes.Error
 			});
 		});
@@ -141,7 +141,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			const message = error.data ? error.data.message : '';
 			Dialogs.showAlert({
 				title: 'Currency',
-				message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+				message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 				type: AlertTypes.Error
 			});
 		});
@@ -159,7 +159,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			const message = error.data ? error.data.message : '';
 			Dialogs.showAlert({
 				title: 'PaymentMethod',
-				message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+				message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 				type: AlertTypes.Error
 			});
 		});
@@ -177,7 +177,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			const message = error.data ? error.data.message : '';
 			Dialogs.showAlert({
 				title: 'SentMethod',
-				message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+				message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 				type: AlertTypes.Error
 			});
 		});
@@ -195,7 +195,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			const message = error.data ? error.data.message : '';
 			Dialogs.showAlert({
 				title: 'Status',
-				message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+				message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 				type: AlertTypes.Error
 			});
 		});
@@ -213,7 +213,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			const message = error.data ? error.data.message : '';
 			Dialogs.showAlert({
 				title: 'Operator',
-				message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+				message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 				type: AlertTypes.Error
 			});
 		});
@@ -231,7 +231,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			const message = error.data ? error.data.message : '';
 			Dialogs.showAlert({
 				title: 'Company',
-				message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+				message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 				type: AlertTypes.Error
 			});
 		});
diff --git a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/dialog-window/index.html b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/dialog-window/index.html
index 2fb7b55..8011f67 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/dialog-window/index.html
+++ b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/dialog-window/index.html
@@ -21,7 +21,7 @@
                 <bk-form-group label="{{formHeaders[action]}}" name="entityForm" transclude-classes="fd-container fd-form-layout-grid-container">
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idNumber" ng-required="false" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_NUMBER' | t }}</bk-form-label>
+                        	<bk-form-label for="idNumber" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_NUMBER' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
 								<bk-input id="idNumber"
@@ -29,13 +29,13 @@
 	                                ng-model="entity.Number"
 	                                ng-readonly="true"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_NUMBER)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_NUMBER)'} }}">
 	                            </bk-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idType" ng-required="false" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_TYPE' | t }}</bk-form-label>
+                        	<bk-form-label for="idType" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_TYPE' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
 	                        <bk-combobox-input input-id="idType"
@@ -45,14 +45,14 @@
 	                            ng-model="entity.Type"
 	                            is-readonly="action === 'select'"
 	                            dropdown-items="optionsType"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_TYPE)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'Type'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'Type'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_TYPE)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'Type'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'Type'} }}">
 	                        </bk-combobox-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idCustomer" ng-required="true" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_CUSTOMER' | t }}</bk-form-label>
+                        	<bk-form-label for="idCustomer" ng-required="true" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_CUSTOMER' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
 	                        <bk-combobox-input input-id="idCustomer"
@@ -62,17 +62,17 @@
 	                            ng-model="entity.Customer"
 	                            is-readonly="action === 'select'"
 	                            dropdown-items="optionsCustomer"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_CUSTOMER)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'Customer'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'Customer'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_CUSTOMER)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'Customer'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'Customer'} }}">
 	                        </bk-combobox-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idDate" ng-required="true" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_DATE' | t }}</bk-form-label>
+                        	<bk-form-label for="idDate" ng-required="true" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_DATE' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--2 ">
-							<bk-form-input-message state="{{ forms.details['Date'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:messages.error.incorrectInput' | t}}">
+							<bk-form-input-message state="{{ forms.details['Date'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:codbex-invoices-model.messages.error.incorrectInput' | t}}">
 								<bk-input id="idDate"
 	                                name="Date"
 	                                state="{{ forms.details['Date'].$valid ? '' : 'error' }}"
@@ -86,10 +86,10 @@
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idDue" ng-required="true" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_DUE' | t }}</bk-form-label>
+                        	<bk-form-label for="idDue" ng-required="true" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_DUE' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--2 ">
-							<bk-form-input-message state="{{ forms.details['Due'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:messages.error.incorrectInput' | t}}">
+							<bk-form-input-message state="{{ forms.details['Due'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:codbex-invoices-model.messages.error.incorrectInput' | t}}">
 								<bk-input id="idDue"
 	                                name="Due"
 	                                state="{{ forms.details['Due'].$valid ? '' : 'error' }}"
@@ -103,7 +103,7 @@
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idNet" ng-required="false" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_NET' | t }}</bk-form-label>
+                        	<bk-form-label for="idNet" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_NET' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--4 ">
 	                        <bk-step-input input-id="idNet"
@@ -112,13 +112,13 @@
 								is-required="false"
 								ng-model="entity.Net"
 								is-readonly="action === 'select'"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_NET)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_NET)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idCurrency" ng-required="true" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_CURRENCY' | t }}</bk-form-label>
+                        	<bk-form-label for="idCurrency" ng-required="true" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_CURRENCY' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
 	                        <bk-combobox-input input-id="idCurrency"
@@ -128,14 +128,14 @@
 	                            ng-model="entity.Currency"
 	                            is-readonly="action === 'select'"
 	                            dropdown-items="optionsCurrency"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_CURRENCY)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'Currency'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'Currency'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_CURRENCY)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'Currency'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'Currency'} }}">
 	                        </bk-combobox-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idGross" ng-required="false" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_GROSS' | t }}</bk-form-label>
+                        	<bk-form-label for="idGross" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_GROSS' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--4 ">
 	                        <bk-step-input input-id="idGross"
@@ -144,13 +144,13 @@
 								is-required="false"
 								ng-model="entity.Gross"
 								is-readonly="action === 'select'"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_GROSS)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_GROSS)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idDiscount" ng-required="false" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_DISCOUNT' | t }}</bk-form-label>
+                        	<bk-form-label for="idDiscount" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_DISCOUNT' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--4 ">
 	                        <bk-step-input input-id="idDiscount"
@@ -159,13 +159,13 @@
 								is-required="false"
 								ng-model="entity.Discount"
 								is-readonly="action === 'select'"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_DISCOUNT)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_DISCOUNT)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idTaxes" ng-required="false" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_TAXES' | t }}</bk-form-label>
+                        	<bk-form-label for="idTaxes" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_TAXES' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--4 ">
 	                        <bk-step-input input-id="idTaxes"
@@ -174,13 +174,13 @@
 								is-required="false"
 								ng-model="entity.Taxes"
 								is-readonly="action === 'select'"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_TAXES)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_TAXES)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idVAT" ng-required="false" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_VAT' | t }}</bk-form-label>
+                        	<bk-form-label for="idVAT" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_VAT' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--4 ">
 	                        <bk-step-input input-id="idVAT"
@@ -189,13 +189,13 @@
 								is-required="false"
 								ng-model="entity.VAT"
 								is-readonly="action === 'select'"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_VAT)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_VAT)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idTotal" ng-required="false" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_TOTAL' | t }}</bk-form-label>
+                        	<bk-form-label for="idTotal" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_TOTAL' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--4 ">
 	                        <bk-step-input input-id="idTotal"
@@ -204,13 +204,13 @@
 								is-required="false"
 								ng-model="entity.Total"
 								is-readonly="action === 'select'"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_TOTAL)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_TOTAL)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idPaid" ng-required="false" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_PAID' | t }}</bk-form-label>
+                        	<bk-form-label for="idPaid" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_PAID' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--4 ">
 	                        <bk-step-input input-id="idPaid"
@@ -219,16 +219,16 @@
 								is-required="false"
 								ng-model="entity.Paid"
 								is-readonly="action === 'select'"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_PAID)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_PAID)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
 					<bk-form-item class="fd-row">
 						<div class="fd-col fd-col-md--2">
-							<bk-form-label for="idConditions" ng-required="false" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_CONDITIONS' | t }}</bk-form-label>
+							<bk-form-label for="idConditions" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_CONDITIONS' | t }}</bk-form-label>
 						</div>
 						<div class="fd-col  fd-col-md--8 ">
-							<bk-form-input-message state="{{ forms.details['Conditions'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:messages.error.pattern' | t:{'rule':''} }}">
+							<bk-form-input-message state="{{ forms.details['Conditions'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:codbex-invoices-model.messages.error.pattern' | t:{'rule':''} }}">
 								<bk-textarea id="idConditions"
 									name="Conditions"
 									state="{{ forms.details['Conditions'].$valid ? '' : 'error' }}"
@@ -237,14 +237,14 @@
 	                            	ng-readonly="action === 'select'"
 									ng-maxlength="200.0"
 									input-rules="{ patterns: [''] }"
-									placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_CONDITIONS)'} }}">
+									placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_CONDITIONS)'} }}">
 								</bk-textarea>
 							</bk-form-input-message>
 						</div>
 					</bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idPaymentMethod" ng-required="false" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_PAYMENTMETHOD' | t }}</bk-form-label>
+                        	<bk-form-label for="idPaymentMethod" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_PAYMENTMETHOD' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
 	                        <bk-combobox-input input-id="idPaymentMethod"
@@ -254,14 +254,14 @@
 	                            ng-model="entity.PaymentMethod"
 	                            is-readonly="action === 'select'"
 	                            dropdown-items="optionsPaymentMethod"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_PAYMENTMETHOD)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'PaymentMethod'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'PaymentMethod'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_PAYMENTMETHOD)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'PaymentMethod'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'PaymentMethod'} }}">
 	                        </bk-combobox-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idSentMethod" ng-required="false" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_SENTMETHOD' | t }}</bk-form-label>
+                        	<bk-form-label for="idSentMethod" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_SENTMETHOD' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
 	                        <bk-combobox-input input-id="idSentMethod"
@@ -271,14 +271,14 @@
 	                            ng-model="entity.SentMethod"
 	                            is-readonly="action === 'select'"
 	                            dropdown-items="optionsSentMethod"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_SENTMETHOD)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'SentMethod'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'SentMethod'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_SENTMETHOD)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'SentMethod'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'SentMethod'} }}">
 	                        </bk-combobox-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idStatus" ng-required="true" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_STATUS' | t }}</bk-form-label>
+                        	<bk-form-label for="idStatus" ng-required="true" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_STATUS' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
 	                        <bk-combobox-input input-id="idStatus"
@@ -288,14 +288,14 @@
 	                            ng-model="entity.Status"
 	                            is-readonly="action === 'select'"
 	                            dropdown-items="optionsStatus"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_STATUS)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'Status'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'Status'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_STATUS)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'Status'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'Status'} }}">
 	                        </bk-combobox-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idOperator" ng-required="true" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_OPERATOR' | t }}</bk-form-label>
+                        	<bk-form-label for="idOperator" ng-required="true" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_OPERATOR' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
 	                        <bk-combobox-input input-id="idOperator"
@@ -305,17 +305,17 @@
 	                            ng-model="entity.Operator"
 	                            is-readonly="action === 'select'"
 	                            dropdown-items="optionsOperator"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_OPERATOR)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'Operator'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'Operator'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_OPERATOR)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'Operator'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'Operator'} }}">
 	                        </bk-combobox-input>
 	                    </div>
                     </bk-form-item>
 					<bk-form-item class="fd-row">
 						<div class="fd-col fd-col-md--2">
-							<bk-form-label for="idDocument" ng-required="false" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_DOCUMENT' | t }}</bk-form-label>
+							<bk-form-label for="idDocument" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_DOCUMENT' | t }}</bk-form-label>
 						</div>
 						<div class="fd-col  fd-col-md--8 ">
-							<bk-form-input-message state="{{ forms.details['Document'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:messages.error.pattern' | t:{'rule':''} }}">
+							<bk-form-input-message state="{{ forms.details['Document'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:codbex-invoices-model.messages.error.pattern' | t:{'rule':''} }}">
 								<bk-textarea id="idDocument"
 									name="Document"
 									state="{{ forms.details['Document'].$valid ? '' : 'error' }}"
@@ -324,14 +324,14 @@
 	                            	ng-readonly="action === 'select'"
 									ng-maxlength="200.0"
 									input-rules="{ patterns: [''] }"
-									placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_DOCUMENT)'} }}">
+									placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_DOCUMENT)'} }}">
 								</bk-textarea>
 							</bk-form-input-message>
 						</div>
 					</bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idCompany" ng-required="false" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_COMPANY' | t }}</bk-form-label>
+                        	<bk-form-label for="idCompany" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_COMPANY' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
 	                        <bk-combobox-input input-id="idCompany"
@@ -341,27 +341,27 @@
 	                            ng-model="entity.Company"
 	                            is-readonly="action === 'select'"
 	                            dropdown-items="optionsCompany"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_COMPANY)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'Company'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'Company'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_COMPANY)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'Company'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'Company'} }}">
 	                        </bk-combobox-input>
 	                    </div>
                     </bk-form-item>
 					<bk-form-item class="fd-row">
 						<div class="fd-col fd-col-md--2">
-							<bk-form-label for="idName" ng-required="false" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_NAME' | t }}</bk-form-label>
+							<bk-form-label for="idName" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_NAME' | t }}</bk-form-label>
 						</div>
 						<div class="fd-col  fd-col-md--8 ">
 								<bk-textarea id="idName"
 									name="Name"
 									ng-model="entity.Name"
 	                            	ng-readonly="true"
-									placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_NAME)'} }}">
+									placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_NAME)'} }}">
 								</bk-textarea>
 						</div>
 					</bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idUUID" ng-required="false" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_UUID' | t }}</bk-form-label>
+                        	<bk-form-label for="idUUID" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_UUID' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
 								<bk-input id="idUUID"
@@ -369,13 +369,13 @@
 	                                ng-model="entity.UUID"
 	                                ng-readonly="true"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_UUID)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_UUID)'} }}">
 	                            </bk-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idProcess" ng-required="false" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_PROCESS' | t }}</bk-form-label>
+                        	<bk-form-label for="idProcess" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_PROCESS' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
 								<bk-input id="idProcess"
@@ -383,16 +383,16 @@
 	                                ng-model="entity.Process"
 	                                ng-readonly="true"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_PROCESS)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_PROCESS)'} }}">
 	                            </bk-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idReference" ng-required="false" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_REFERENCE' | t }}</bk-form-label>
+                        	<bk-form-label for="idReference" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_REFERENCE' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
-							<bk-form-input-message state="{{ forms.details['Reference'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:messages.error.pattern' | t:{'rule':''} }}">
+							<bk-form-input-message state="{{ forms.details['Reference'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:codbex-invoices-model.messages.error.pattern' | t:{'rule':''} }}">
 								<bk-input id="idReference"
 	                                name="Reference"
 	                                state="{{ forms.details['Reference'].$valid ? '' : 'error' }}"
@@ -402,7 +402,7 @@
 									ng-maxlength="100.0"
 	                                input-rules="{ patterns: [''] }"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_REFERENCE)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_REFERENCE)'} }}">
 	                            </bk-input>
 							</bk-form-input-message>
 	                    </div>
@@ -414,11 +414,11 @@
 		<bk-bar bar-design="footer" compact="true" ng-show="action !== 'select'">
 			<bk-bar-right>
 				<bk-bar-element>
-					<bk-button ng-if="action === 'create'" label="{{'codbex-invoices:defaults.create' | t}}" state="emphasized" ng-click="create()" ng-disabled="!forms.details.$valid"></bk-button>
-					<bk-button ng-if="action !== 'create'" label="{{'codbex-invoices:defaults.update' | t}}" state="emphasized" ng-click="update()" ng-disabled="!forms.details.$valid"></bk-button>
+					<bk-button ng-if="action === 'create'" label="{{'codbex-invoices:codbex-invoices-model.defaults.create' | t}}" state="emphasized" ng-click="create()" ng-disabled="!forms.details.$valid"></bk-button>
+					<bk-button ng-if="action !== 'create'" label="{{'codbex-invoices:codbex-invoices-model.defaults.update' | t}}" state="emphasized" ng-click="update()" ng-disabled="!forms.details.$valid"></bk-button>
 				</bk-bar-element>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
 				</bk-bar-element>
 			</bk-bar-right>
 		</bk-bar>
diff --git a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/dialog-window/view.js b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/dialog-window/view.js
index 8616ecd..52695bc 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/dialog-window/view.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/dialog-window/view.js
@@ -7,7 +7,7 @@ const viewData = {
     id: "SalesInvoice-details",
     label: "SalesInvoice",
     translation: {
-        key: 'codbex-invoices:t.SALESINVOICE',
+        key: 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE',
     },
     path: "/services/web/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/dialog-window/index.html",
     perspectiveName: "SalesInvoice",
diff --git a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/index.html b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/index.html
index 84fc9ce..b01155a 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/index.html
+++ b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/index.html
@@ -15,18 +15,18 @@
 
 	<body class="bk-vbox">
 		<bk-toolbar has-title="true">
-			<bk-toolbar-title>{{'codbex-invoices:defaults.items' | t}} <span bk-object-status text="{{dataCount}}" inverted="true"></bk-toolbar-title>
+			<bk-toolbar-title>{{'codbex-invoices:codbex-invoices-model.defaults.items' | t}} <span bk-object-status text="{{dataCount}}" inverted="true"></bk-toolbar-title>
 			<bk-toolbar-spacer></bk-toolbar-spacer>
-			<bk-button compact="true" state="transparent" glyph="sap-icon--add" aria-label="{{ 'codbex-invoices:aria.addEntity' | t }}" ng-disabled="action == 'update'" ng-click="createEntity()"></bk-button>
-			<bk-button compact="true" state="transparent" glyph="sap-icon--edit" aria-label="{{ 'codbex-invoices:aria.editEntity' | t }}" ng-disabled="selectedEntity == null" ng-click="updateEntity()"></bk-button>
-			<bk-button compact="true" state="transparent" glyph="sap-icon--delete" aria-label="{{ 'codbex-invoices:aria.deleteEntity' | t }}" ng-disabled="selectedEntity == null || action == 'update'" ng-click="deleteEntity()"></bk-button>
+			<bk-button compact="true" state="transparent" glyph="sap-icon--add" aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.addEntity' | t }}" ng-disabled="action == 'update'" ng-click="createEntity()"></bk-button>
+			<bk-button compact="true" state="transparent" glyph="sap-icon--edit" aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.editEntity' | t }}" ng-disabled="selectedEntity == null" ng-click="updateEntity()"></bk-button>
+			<bk-button compact="true" state="transparent" glyph="sap-icon--delete" aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.deleteEntity' | t }}" ng-disabled="selectedEntity == null || action == 'update'" ng-click="deleteEntity()"></bk-button>
 			<bk-popover>
 				<bk-popover-control>
-					<bk-button compact="true" glyph="sap-icon--overflow" state="transparent" aria-label="{{ 'codbex-invoices:aria.headerMenuBtn' | t }}"></bk-button>
+					<bk-button compact="true" glyph="sap-icon--overflow" state="transparent" aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.headerMenuBtn' | t }}"></bk-button>
 				</bk-popover-control>
 				<bk-popover-body align="bottom-right">
-					<bk-menu aria-label="{{ 'codbex-invoices:aria.headerMenu' | t }}" no-backdrop="true" no-shadow="true">
-						<bk-menu-item title="{{ 'codbex-invoices:defaults.filter' | t }}" ng-click="openFilter()"></bk-menu-item>
+					<bk-menu aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.headerMenu' | t }}" no-backdrop="true" no-shadow="true">
+						<bk-menu-item title="{{ 'codbex-invoices:codbex-invoices-model.defaults.filter' | t }}" ng-click="openFilter()"></bk-menu-item>
 						<bk-menu-item ng-repeat="action in pageActions track by $index" title="{{action.translation.key | t:action.translation.options:action.label}}" ng-click="triggerPageAction(action)"></bk-menu-item>
 					</bk-menu>
 				</bk-popover-body>
@@ -70,7 +70,7 @@
 				</bk-list-item>
 			</bk-list>
 			<bk-list-action-item ng-show="dataPage <= dataPages && dataCount > dataLimit" ng-click="loadPage()">
-				{{ 'codbex-invoices:defaults.loadMore' | t }}
+				{{ 'codbex-invoices:codbex-invoices-model.defaults.loadMore' | t }}
 			</bk-list-action-item>
 		</bk-scrollbar>
 		<theme></theme>
diff --git a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/main-details/controller.js b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/main-details/controller.js
index 1c484da..aecc3b7 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/main-details/controller.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/main-details/controller.js
@@ -20,12 +20,12 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 		$scope.action = 'select';
 
 		LocaleService.onInit(() => {
-			description = LocaleService.t('codbex-invoices:defaults.description');
-			$scope.formHeaders.select = LocaleService.t('codbex-invoices:defaults.formHeadSelect', { name: '$t(codbex-invoices:t.SALESINVOICE)' });
-			$scope.formHeaders.create = LocaleService.t('codbex-invoices:defaults.formHeadCreate', { name: '$t(codbex-invoices:t.SALESINVOICE)' });
-			$scope.formHeaders.update = LocaleService.t('codbex-invoices:defaults.formHeadUpdate', { name: '$t(codbex-invoices:t.SALESINVOICE)' });
-			propertySuccessfullyCreated = LocaleService.t('codbex-invoices:messages.propertySuccessfullyCreated', { name: '$t(codbex-invoices:t.SALESINVOICE)' });
-			propertySuccessfullyUpdated = LocaleService.t('codbex-invoices:messages.propertySuccessfullyUpdated', { name: '$t(codbex-invoices:t.SALESINVOICE)' });
+			description = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.description');
+			$scope.formHeaders.select = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.formHeadSelect', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE)' });
+			$scope.formHeaders.create = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.formHeadCreate', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE)' });
+			$scope.formHeaders.update = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.formHeadUpdate', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE)' });
+			propertySuccessfullyCreated = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.propertySuccessfullyCreated', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE)' });
+			propertySuccessfullyUpdated = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.propertySuccessfullyUpdated', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE)' });
 		});
 
 		//-----------------Custom Actions-------------------//
@@ -132,15 +132,15 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 				Dialogs.postMessage({ topic: 'codbex-invoices.SalesInvoice.SalesInvoice.entityCreated', data: response.data });
 				Dialogs.postMessage({ topic: 'codbex-invoices.SalesInvoice.SalesInvoice.clearDetails' , data: response.data });
 				Notifications.show({
-					title: LocaleService.t('codbex-invoices:t.SALESINVOICE'),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.SALESINVOICE'),
 					description: propertySuccessfullyCreated,
 					type: 'positive'
 				});
 			}, (error) => {
 				const message = error.data ? error.data.message : '';
 				Dialogs.showAlert({
-					title: LocaleService.t('codbex-invoices:t.SALESINVOICE'),
-					message: LocaleService.t('codbex-invoices:messages.error.unableToCreate', { name: '$t(codbex-invoices:t.SALESINVOICE)', message: message }),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.SALESINVOICE'),
+					message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToCreate', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE)', message: message }),
 					type: AlertTypes.Error
 				});
 				console.error('EntityService:', error);
@@ -152,15 +152,15 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 				Dialogs.postMessage({ topic: 'codbex-invoices.SalesInvoice.SalesInvoice.entityUpdated', data: response.data });
 				Dialogs.postMessage({ topic: 'codbex-invoices.SalesInvoice.SalesInvoice.clearDetails', data: response.data });
 				Notifications.show({
-					title: LocaleService.t('codbex-invoices:t.SALESINVOICE'),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.SALESINVOICE'),
 					description: propertySuccessfullyUpdated,
 					type: 'positive'
 				});
 			}, (error) => {
 				const message = error.data ? error.data.message : '';
 				Dialogs.showAlert({
-					title: LocaleService.t('codbex-invoices:t.SALESINVOICE'),
-					message: LocaleService.t('codbex-invoices:messages.error.unableToCreate', { name: '$t(codbex-invoices:t.SALESINVOICE)', message: message }),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.SALESINVOICE'),
+					message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToCreate', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE)', message: message }),
 					type: AlertTypes.Error
 				});
 				console.error('EntityService:', error);
@@ -280,7 +280,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 				const message = error.data ? error.data.message : '';
 				Dialogs.showAlert({
 					title: 'Type',
-					message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+					message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 					type: AlertTypes.Error
 				});
 			});
@@ -297,7 +297,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 				const message = error.data ? error.data.message : '';
 				Dialogs.showAlert({
 					title: 'Customer',
-					message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+					message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 					type: AlertTypes.Error
 				});
 			});
@@ -314,7 +314,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 				const message = error.data ? error.data.message : '';
 				Dialogs.showAlert({
 					title: 'Currency',
-					message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+					message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 					type: AlertTypes.Error
 				});
 			});
@@ -331,7 +331,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 				const message = error.data ? error.data.message : '';
 				Dialogs.showAlert({
 					title: 'PaymentMethod',
-					message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+					message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 					type: AlertTypes.Error
 				});
 			});
@@ -348,7 +348,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 				const message = error.data ? error.data.message : '';
 				Dialogs.showAlert({
 					title: 'SentMethod',
-					message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+					message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 					type: AlertTypes.Error
 				});
 			});
@@ -365,7 +365,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 				const message = error.data ? error.data.message : '';
 				Dialogs.showAlert({
 					title: 'Status',
-					message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+					message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 					type: AlertTypes.Error
 				});
 			});
@@ -382,7 +382,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 				const message = error.data ? error.data.message : '';
 				Dialogs.showAlert({
 					title: 'Operator',
-					message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+					message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 					type: AlertTypes.Error
 				});
 			});
@@ -399,7 +399,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 				const message = error.data ? error.data.message : '';
 				Dialogs.showAlert({
 					title: 'Company',
-					message: LocaleService.t('codbex-invoices:messages.error.unableToLoad', { message: message }),
+					message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLoad', { message: message }),
 					type: AlertTypes.Error
 				});
 			});
diff --git a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/main-details/index.html b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/main-details/index.html
index d074cd6..e290250 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/main-details/index.html
+++ b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/main-details/index.html
@@ -19,7 +19,7 @@
                 <bk-form-group label="{{formHeaders[action]}}" name="entityForm" transclude-classes="fd-container fd-form-layout-grid-container">
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idNumber" ng-required="false" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_NUMBER' | t }}</bk-form-label>
+                        	<bk-form-label for="idNumber" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_NUMBER' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
 								<bk-input id="idNumber"
@@ -27,13 +27,13 @@
 	                                ng-model="entity.Number"
 	                                ng-readonly="true"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_NUMBER)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_NUMBER)'} }}">
 	                            </bk-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idType" ng-required="false" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_TYPE' | t }}</bk-form-label>
+                        	<bk-form-label for="idType" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_TYPE' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--7 ">
 	                        <bk-combobox-input input-id="idType"
@@ -43,18 +43,18 @@
 	                            ng-model="entity.Type"
 	                            is-readonly="action === 'select'"
 	                            dropdown-items="optionsType"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_TYPE)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'Type'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'Type'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_TYPE)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'Type'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'Type'} }}">
 	                        </bk-combobox-input>
 	                    </div>
 	                    <div class="fd-col fd-col--full">
-							<bk-button glyph="sap-icon--add" aria-label="{{ 'codbex-invoices:defaults.add' | t }}" ng-click="createType()" ng-hide="action === 'select'"></bk-button>
-							<bk-button glyph="sap-icon--refresh" aria-label="{{ 'codbex-invoices:defaults.refresh' | t }}" ng-click="refreshType()" ng-hide="action === 'select'"></bk-button>
+							<bk-button glyph="sap-icon--add" aria-label="{{ 'codbex-invoices:codbex-invoices-model.defaults.add' | t }}" ng-click="createType()" ng-hide="action === 'select'"></bk-button>
+							<bk-button glyph="sap-icon--refresh" aria-label="{{ 'codbex-invoices:codbex-invoices-model.defaults.refresh' | t }}" ng-click="refreshType()" ng-hide="action === 'select'"></bk-button>
 						</div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idCustomer" ng-required="true" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_CUSTOMER' | t }}</bk-form-label>
+                        	<bk-form-label for="idCustomer" ng-required="true" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_CUSTOMER' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--7 ">
 	                        <bk-combobox-input input-id="idCustomer"
@@ -64,21 +64,21 @@
 	                            ng-model="entity.Customer"
 	                            is-readonly="action === 'select'"
 	                            dropdown-items="optionsCustomer"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_CUSTOMER)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'Customer'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'Customer'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_CUSTOMER)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'Customer'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'Customer'} }}">
 	                        </bk-combobox-input>
 	                    </div>
 	                    <div class="fd-col fd-col--full">
-							<bk-button glyph="sap-icon--add" aria-label="{{ 'codbex-invoices:defaults.add' | t }}" ng-click="createCustomer()" ng-hide="action === 'select'"></bk-button>
-							<bk-button glyph="sap-icon--refresh" aria-label="{{ 'codbex-invoices:defaults.refresh' | t }}" ng-click="refreshCustomer()" ng-hide="action === 'select'"></bk-button>
+							<bk-button glyph="sap-icon--add" aria-label="{{ 'codbex-invoices:codbex-invoices-model.defaults.add' | t }}" ng-click="createCustomer()" ng-hide="action === 'select'"></bk-button>
+							<bk-button glyph="sap-icon--refresh" aria-label="{{ 'codbex-invoices:codbex-invoices-model.defaults.refresh' | t }}" ng-click="refreshCustomer()" ng-hide="action === 'select'"></bk-button>
 						</div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idDate" ng-required="true" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_DATE' | t }}</bk-form-label>
+                        	<bk-form-label for="idDate" ng-required="true" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_DATE' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--2 ">
-							<bk-form-input-message state="{{ forms.details['Date'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:messages.error.incorrectInput' | t}}">
+							<bk-form-input-message state="{{ forms.details['Date'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:codbex-invoices-model.messages.error.incorrectInput' | t}}">
 								<bk-input id="idDate"
 	                                name="Date"
 	                                state="{{ forms.details['Date'].$valid ? '' : 'error' }}"
@@ -92,10 +92,10 @@
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idDue" ng-required="true" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_DUE' | t }}</bk-form-label>
+                        	<bk-form-label for="idDue" ng-required="true" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_DUE' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--2 ">
-							<bk-form-input-message state="{{ forms.details['Due'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:messages.error.incorrectInput' | t}}">
+							<bk-form-input-message state="{{ forms.details['Due'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:codbex-invoices-model.messages.error.incorrectInput' | t}}">
 								<bk-input id="idDue"
 	                                name="Due"
 	                                state="{{ forms.details['Due'].$valid ? '' : 'error' }}"
@@ -109,7 +109,7 @@
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idNet" ng-required="false" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_NET' | t }}</bk-form-label>
+                        	<bk-form-label for="idNet" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_NET' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--4 ">
 							<bk-step-input input-id="idNet"
@@ -118,13 +118,13 @@
 								is-required="false"
 								ng-model="entity.Net"
 								is-readonly="action === 'select'"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_NET)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_NET)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idCurrency" ng-required="true" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_CURRENCY' | t }}</bk-form-label>
+                        	<bk-form-label for="idCurrency" ng-required="true" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_CURRENCY' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--7 ">
 	                        <bk-combobox-input input-id="idCurrency"
@@ -134,18 +134,18 @@
 	                            ng-model="entity.Currency"
 	                            is-readonly="action === 'select'"
 	                            dropdown-items="optionsCurrency"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_CURRENCY)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'Currency'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'Currency'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_CURRENCY)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'Currency'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'Currency'} }}">
 	                        </bk-combobox-input>
 	                    </div>
 	                    <div class="fd-col fd-col--full">
-							<bk-button glyph="sap-icon--add" aria-label="{{ 'codbex-invoices:defaults.add' | t }}" ng-click="createCurrency()" ng-hide="action === 'select'"></bk-button>
-							<bk-button glyph="sap-icon--refresh" aria-label="{{ 'codbex-invoices:defaults.refresh' | t }}" ng-click="refreshCurrency()" ng-hide="action === 'select'"></bk-button>
+							<bk-button glyph="sap-icon--add" aria-label="{{ 'codbex-invoices:codbex-invoices-model.defaults.add' | t }}" ng-click="createCurrency()" ng-hide="action === 'select'"></bk-button>
+							<bk-button glyph="sap-icon--refresh" aria-label="{{ 'codbex-invoices:codbex-invoices-model.defaults.refresh' | t }}" ng-click="refreshCurrency()" ng-hide="action === 'select'"></bk-button>
 						</div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idGross" ng-required="false" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_GROSS' | t }}</bk-form-label>
+                        	<bk-form-label for="idGross" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_GROSS' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--4 ">
 							<bk-step-input input-id="idGross"
@@ -154,13 +154,13 @@
 								is-required="false"
 								ng-model="entity.Gross"
 								is-readonly="action === 'select'"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_GROSS)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_GROSS)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idDiscount" ng-required="false" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_DISCOUNT' | t }}</bk-form-label>
+                        	<bk-form-label for="idDiscount" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_DISCOUNT' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--4 ">
 							<bk-step-input input-id="idDiscount"
@@ -169,13 +169,13 @@
 								is-required="false"
 								ng-model="entity.Discount"
 								is-readonly="action === 'select'"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_DISCOUNT)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_DISCOUNT)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idTaxes" ng-required="false" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_TAXES' | t }}</bk-form-label>
+                        	<bk-form-label for="idTaxes" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_TAXES' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--4 ">
 							<bk-step-input input-id="idTaxes"
@@ -184,13 +184,13 @@
 								is-required="false"
 								ng-model="entity.Taxes"
 								is-readonly="action === 'select'"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_TAXES)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_TAXES)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idVAT" ng-required="false" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_VAT' | t }}</bk-form-label>
+                        	<bk-form-label for="idVAT" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_VAT' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--4 ">
 							<bk-step-input input-id="idVAT"
@@ -199,13 +199,13 @@
 								is-required="false"
 								ng-model="entity.VAT"
 								is-readonly="action === 'select'"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_VAT)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_VAT)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idTotal" ng-required="false" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_TOTAL' | t }}</bk-form-label>
+                        	<bk-form-label for="idTotal" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_TOTAL' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--4 ">
 							<bk-step-input input-id="idTotal"
@@ -214,13 +214,13 @@
 								is-required="false"
 								ng-model="entity.Total"
 								is-readonly="action === 'select'"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_TOTAL)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_TOTAL)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idPaid" ng-required="false" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_PAID' | t }}</bk-form-label>
+                        	<bk-form-label for="idPaid" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_PAID' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--4 ">
 							<bk-step-input input-id="idPaid"
@@ -229,16 +229,16 @@
 								is-required="false"
 								ng-model="entity.Paid"
 								is-readonly="action === 'select'"
-								placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_PAID)'} }}">
+								placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_PAID)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
 					<bk-form-item class="fd-row">
 						<div class="fd-col fd-col-md--2">
-							<bk-form-label for="idConditions" ng-required="false" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_CONDITIONS' | t }}</bk-form-label>
+							<bk-form-label for="idConditions" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_CONDITIONS' | t }}</bk-form-label>
 						</div>
 						<div class="fd-col  fd-col-md--8 ">
-							<bk-form-input-message state="{{ forms.details['Conditions'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:messages.error.pattern' | t:{'rule':''} }}">
+							<bk-form-input-message state="{{ forms.details['Conditions'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:codbex-invoices-model.messages.error.pattern' | t:{'rule':''} }}">
 								<bk-textarea id="idConditions"
 									name="Conditions"
 									state="{{ forms.details['Conditions'].$valid ? '' : 'error' }}"
@@ -247,14 +247,14 @@
 	                            	ng-readonly="action === 'select'"
 									ng-maxlength="200.0"
 									input-rules="{ patterns: [''] }"
-									placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_CONDITIONS)'} }}">
+									placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_CONDITIONS)'} }}">
 								</bk-textarea>
 							</bk-form-input-message>
 						</div>
 					</bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idPaymentMethod" ng-required="false" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_PAYMENTMETHOD' | t }}</bk-form-label>
+                        	<bk-form-label for="idPaymentMethod" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_PAYMENTMETHOD' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--7 ">
 	                        <bk-combobox-input input-id="idPaymentMethod"
@@ -264,18 +264,18 @@
 	                            ng-model="entity.PaymentMethod"
 	                            is-readonly="action === 'select'"
 	                            dropdown-items="optionsPaymentMethod"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_PAYMENTMETHOD)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'PaymentMethod'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'PaymentMethod'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_PAYMENTMETHOD)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'PaymentMethod'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'PaymentMethod'} }}">
 	                        </bk-combobox-input>
 	                    </div>
 	                    <div class="fd-col fd-col--full">
-							<bk-button glyph="sap-icon--add" aria-label="{{ 'codbex-invoices:defaults.add' | t }}" ng-click="createPaymentMethod()" ng-hide="action === 'select'"></bk-button>
-							<bk-button glyph="sap-icon--refresh" aria-label="{{ 'codbex-invoices:defaults.refresh' | t }}" ng-click="refreshPaymentMethod()" ng-hide="action === 'select'"></bk-button>
+							<bk-button glyph="sap-icon--add" aria-label="{{ 'codbex-invoices:codbex-invoices-model.defaults.add' | t }}" ng-click="createPaymentMethod()" ng-hide="action === 'select'"></bk-button>
+							<bk-button glyph="sap-icon--refresh" aria-label="{{ 'codbex-invoices:codbex-invoices-model.defaults.refresh' | t }}" ng-click="refreshPaymentMethod()" ng-hide="action === 'select'"></bk-button>
 						</div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idSentMethod" ng-required="false" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_SENTMETHOD' | t }}</bk-form-label>
+                        	<bk-form-label for="idSentMethod" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_SENTMETHOD' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--7 ">
 	                        <bk-combobox-input input-id="idSentMethod"
@@ -285,18 +285,18 @@
 	                            ng-model="entity.SentMethod"
 	                            is-readonly="action === 'select'"
 	                            dropdown-items="optionsSentMethod"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_SENTMETHOD)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'SentMethod'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'SentMethod'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_SENTMETHOD)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'SentMethod'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'SentMethod'} }}">
 	                        </bk-combobox-input>
 	                    </div>
 	                    <div class="fd-col fd-col--full">
-							<bk-button glyph="sap-icon--add" aria-label="{{ 'codbex-invoices:defaults.add' | t }}" ng-click="createSentMethod()" ng-hide="action === 'select'"></bk-button>
-							<bk-button glyph="sap-icon--refresh" aria-label="{{ 'codbex-invoices:defaults.refresh' | t }}" ng-click="refreshSentMethod()" ng-hide="action === 'select'"></bk-button>
+							<bk-button glyph="sap-icon--add" aria-label="{{ 'codbex-invoices:codbex-invoices-model.defaults.add' | t }}" ng-click="createSentMethod()" ng-hide="action === 'select'"></bk-button>
+							<bk-button glyph="sap-icon--refresh" aria-label="{{ 'codbex-invoices:codbex-invoices-model.defaults.refresh' | t }}" ng-click="refreshSentMethod()" ng-hide="action === 'select'"></bk-button>
 						</div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idStatus" ng-required="true" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_STATUS' | t }}</bk-form-label>
+                        	<bk-form-label for="idStatus" ng-required="true" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_STATUS' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--7 ">
 	                        <bk-combobox-input input-id="idStatus"
@@ -306,18 +306,18 @@
 	                            ng-model="entity.Status"
 	                            is-readonly="action === 'select'"
 	                            dropdown-items="optionsStatus"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_STATUS)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'Status'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'Status'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_STATUS)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'Status'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'Status'} }}">
 	                        </bk-combobox-input>
 	                    </div>
 	                    <div class="fd-col fd-col--full">
-							<bk-button glyph="sap-icon--add" aria-label="{{ 'codbex-invoices:defaults.add' | t }}" ng-click="createStatus()" ng-hide="action === 'select'"></bk-button>
-							<bk-button glyph="sap-icon--refresh" aria-label="{{ 'codbex-invoices:defaults.refresh' | t }}" ng-click="refreshStatus()" ng-hide="action === 'select'"></bk-button>
+							<bk-button glyph="sap-icon--add" aria-label="{{ 'codbex-invoices:codbex-invoices-model.defaults.add' | t }}" ng-click="createStatus()" ng-hide="action === 'select'"></bk-button>
+							<bk-button glyph="sap-icon--refresh" aria-label="{{ 'codbex-invoices:codbex-invoices-model.defaults.refresh' | t }}" ng-click="refreshStatus()" ng-hide="action === 'select'"></bk-button>
 						</div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idOperator" ng-required="true" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_OPERATOR' | t }}</bk-form-label>
+                        	<bk-form-label for="idOperator" ng-required="true" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_OPERATOR' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--7 ">
 	                        <bk-combobox-input input-id="idOperator"
@@ -327,21 +327,21 @@
 	                            ng-model="entity.Operator"
 	                            is-readonly="action === 'select'"
 	                            dropdown-items="optionsOperator"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_OPERATOR)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'Operator'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'Operator'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_OPERATOR)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'Operator'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'Operator'} }}">
 	                        </bk-combobox-input>
 	                    </div>
 	                    <div class="fd-col fd-col--full">
-							<bk-button glyph="sap-icon--add" aria-label="{{ 'codbex-invoices:defaults.add' | t }}" ng-click="createOperator()" ng-hide="action === 'select'"></bk-button>
-							<bk-button glyph="sap-icon--refresh" aria-label="{{ 'codbex-invoices:defaults.refresh' | t }}" ng-click="refreshOperator()" ng-hide="action === 'select'"></bk-button>
+							<bk-button glyph="sap-icon--add" aria-label="{{ 'codbex-invoices:codbex-invoices-model.defaults.add' | t }}" ng-click="createOperator()" ng-hide="action === 'select'"></bk-button>
+							<bk-button glyph="sap-icon--refresh" aria-label="{{ 'codbex-invoices:codbex-invoices-model.defaults.refresh' | t }}" ng-click="refreshOperator()" ng-hide="action === 'select'"></bk-button>
 						</div>
                     </bk-form-item>
 					<bk-form-item class="fd-row">
 						<div class="fd-col fd-col-md--2">
-							<bk-form-label for="idDocument" ng-required="false" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_DOCUMENT' | t }}</bk-form-label>
+							<bk-form-label for="idDocument" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_DOCUMENT' | t }}</bk-form-label>
 						</div>
 						<div class="fd-col  fd-col-md--8 ">
-							<bk-form-input-message state="{{ forms.details['Document'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:messages.error.pattern' | t:{'rule':''} }}">
+							<bk-form-input-message state="{{ forms.details['Document'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:codbex-invoices-model.messages.error.pattern' | t:{'rule':''} }}">
 								<bk-textarea id="idDocument"
 									name="Document"
 									state="{{ forms.details['Document'].$valid ? '' : 'error' }}"
@@ -350,14 +350,14 @@
 	                            	ng-readonly="action === 'select'"
 									ng-maxlength="200.0"
 									input-rules="{ patterns: [''] }"
-									placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_DOCUMENT)'} }}">
+									placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_DOCUMENT)'} }}">
 								</bk-textarea>
 							</bk-form-input-message>
 						</div>
 					</bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idCompany" ng-required="false" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_COMPANY' | t }}</bk-form-label>
+                        	<bk-form-label for="idCompany" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_COMPANY' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--7 ">
 	                        <bk-combobox-input input-id="idCompany"
@@ -367,31 +367,31 @@
 	                            ng-model="entity.Company"
 	                            is-readonly="action === 'select'"
 	                            dropdown-items="optionsCompany"
-	                            placeholder="{{ 'codbex-invoices:messages.inputSearch' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_COMPANY)'} }}"
-								btn-aria-label="{{ 'codbex-invoices:aria.showHide' | t:{'name':'Company'} }}" list-aria-label="{{ 'codbex-invoices:aria.options' | t:{'name':'Company'} }}">
+	                            placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputSearch' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_COMPANY)'} }}"
+								btn-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.showHide' | t:{'name':'Company'} }}" list-aria-label="{{ 'codbex-invoices:codbex-invoices-model.aria.options' | t:{'name':'Company'} }}">
 	                        </bk-combobox-input>
 	                    </div>
 	                    <div class="fd-col fd-col--full">
-							<bk-button glyph="sap-icon--add" aria-label="{{ 'codbex-invoices:defaults.add' | t }}" ng-click="createCompany()" ng-hide="action === 'select'"></bk-button>
-							<bk-button glyph="sap-icon--refresh" aria-label="{{ 'codbex-invoices:defaults.refresh' | t }}" ng-click="refreshCompany()" ng-hide="action === 'select'"></bk-button>
+							<bk-button glyph="sap-icon--add" aria-label="{{ 'codbex-invoices:codbex-invoices-model.defaults.add' | t }}" ng-click="createCompany()" ng-hide="action === 'select'"></bk-button>
+							<bk-button glyph="sap-icon--refresh" aria-label="{{ 'codbex-invoices:codbex-invoices-model.defaults.refresh' | t }}" ng-click="refreshCompany()" ng-hide="action === 'select'"></bk-button>
 						</div>
                     </bk-form-item>
 					<bk-form-item class="fd-row">
 						<div class="fd-col fd-col-md--2">
-							<bk-form-label for="idName" ng-required="false" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_NAME' | t }}</bk-form-label>
+							<bk-form-label for="idName" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_NAME' | t }}</bk-form-label>
 						</div>
 						<div class="fd-col  fd-col-md--8 ">
 								<bk-textarea id="idName"
 									name="Name"
 									ng-model="entity.Name"
 	                            	ng-readonly="true"
-									placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_NAME)'} }}">
+									placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_NAME)'} }}">
 								</bk-textarea>
 						</div>
 					</bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idUUID" ng-required="false" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_UUID' | t }}</bk-form-label>
+                        	<bk-form-label for="idUUID" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_UUID' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
 								<bk-input id="idUUID"
@@ -399,13 +399,13 @@
 	                                ng-model="entity.UUID"
 	                                ng-readonly="true"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_UUID)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_UUID)'} }}">
 	                            </bk-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idProcess" ng-required="false" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_PROCESS' | t }}</bk-form-label>
+                        	<bk-form-label for="idProcess" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_PROCESS' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
 								<bk-input id="idProcess"
@@ -413,16 +413,16 @@
 	                                ng-model="entity.Process"
 	                                ng-readonly="true"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_PROCESS)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_PROCESS)'} }}">
 	                            </bk-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idReference" ng-required="false" colon="true">{{ 'codbex-invoices:t.SALESINVOICE_REFERENCE' | t }}</bk-form-label>
+                        	<bk-form-label for="idReference" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE_REFERENCE' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
-							<bk-form-input-message state="{{ forms.details['Reference'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:messages.error.pattern' | t:{'rule':''} }}">
+							<bk-form-input-message state="{{ forms.details['Reference'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:codbex-invoices-model.messages.error.pattern' | t:{'rule':''} }}">
 								<bk-input id="idReference"
 	                                name="Reference"
 	                                state="{{ forms.details['Reference'].$valid ? '' : 'error' }}"
@@ -432,7 +432,7 @@
 									ng-maxlength="100.0"
 	                                input-rules="{ patterns: [''] }"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICE_REFERENCE)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICE_REFERENCE)'} }}">
 	                            </bk-input>
 							</bk-form-input-message>
 	                    </div>
@@ -444,11 +444,11 @@
 		<bk-bar bar-design="footer" compact="true" ng-show="action !== 'select'">
 			<bk-bar-right>
 				<bk-bar-element>
-					<bk-button ng-if="action === 'create'" label="{{'codbex-invoices:defaults.create' | t}}" state="emphasized" ng-click="create()" ng-disabled="!forms.details.$valid"></bk-button>
-					<bk-button ng-if="action !== 'create'" label="{{'codbex-invoices:defaults.update' | t}}" state="emphasized" ng-click="update()" ng-disabled="!forms.details.$valid"></bk-button>
+					<bk-button ng-if="action === 'create'" label="{{'codbex-invoices:codbex-invoices-model.defaults.create' | t}}" state="emphasized" ng-click="create()" ng-disabled="!forms.details.$valid"></bk-button>
+					<bk-button ng-if="action !== 'create'" label="{{'codbex-invoices:codbex-invoices-model.defaults.update' | t}}" state="emphasized" ng-click="update()" ng-disabled="!forms.details.$valid"></bk-button>
 				</bk-bar-element>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
 				</bk-bar-element>
 			</bk-bar-right>
 		</bk-bar>
diff --git a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/main-details/view.js b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/main-details/view.js
index 5b4129f..e3bb952 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/main-details/view.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/main-details/view.js
@@ -7,7 +7,7 @@ const viewData = {
     id: 'SalesInvoice-details',
     label: 'SalesInvoice',
     translation: {
-        key: 'codbex-invoices:t.SALESINVOICE',
+        key: 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE',
     },
     region: 'center',
     lazyLoad: false,
diff --git a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/view.js b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/view.js
index bd30f5c..504c335 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/view.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/SalesInvoice/view.js
@@ -7,7 +7,7 @@ const viewData = {
     id: 'SalesInvoice',
     label: 'SalesInvoice',
     translation: {
-        key: 'codbex-invoices:t.SALESINVOICE',
+        key: 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE',
     },
     region: 'left',
     lazyLoad: false,
diff --git a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/index.html b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/index.html
index a529925..932fd42 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/index.html
+++ b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/index.html
@@ -21,10 +21,10 @@
     <body>
         <layout ng-if="!state.error && !state.isBusy" config="::layoutConfig"></layout>
         <bk-busy-indicator-extended ng-if="!state.error && state.isBusy" class="bk-fill-parent" size="l">
-            {{'codbex-invoices:state.busy' | t}}
+            {{'codbex-invoices:codbex-invoices-model.state.busy' | t}}
         </bk-busy-indicator-extended>
         <bk-message-page glyph="sap-icon--error" ng-if="state.error">
-            <bk-message-page-title>{{'codbex-invoices:messages.error.loading' | t}}</bk-message-page-title>
+            <bk-message-page-title>{{'codbex-invoices:codbex-invoices-model.messages.error.loading' | t}}</bk-message-page-title>
         </bk-message-page>
         <script type="text/javascript">
             angular.module('app', ['platformView', 'platformLayout', 'platformLocale', 'blimpKit']).controller('ApplicationController', ($scope, Extensions) => {
diff --git a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/perspective.js b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/perspective.js
index 0edb6f7..c064a4d 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/perspective.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/perspective.js
@@ -7,7 +7,7 @@ const perspectiveData = {
 	id: 'SalesInvoice',
 	label: 'SalesInvoice',
 	translation: {
-        key: 'codbex-invoices:t.SALESINVOICE',
+        key: 'codbex-invoices:codbex-invoices-model.t.SALESINVOICE',
     },
 	path: '/services/web/codbex-invoices/gen/codbex-invoices/ui/SalesInvoice/index.html',
 	groupId: 'sales-navigation-group',
diff --git a/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceStatus/controller.js b/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceStatus/controller.js
index dfc4792..f86a376 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceStatus/controller.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceStatus/controller.js
@@ -12,10 +12,10 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 		};
 
 		LocaleService.onInit(() => {
-			translated.yes = LocaleService.t('codbex-invoices:defaults.yes');
-			translated.no = LocaleService.t('codbex-invoices:defaults.no');
-			translated.deleteTitle = LocaleService.t('codbex-invoices:defaults.deleteTitle', { name: '$t(codbex-invoices:t.PURCHASEINVOICESTATUS)' });
-			translated.deleteConfirm = LocaleService.t('codbex-invoices:messages.deleteConfirm', { name: '$t(codbex-invoices:t.PURCHASEINVOICESTATUS)' });
+			translated.yes = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.yes');
+			translated.no = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.no');
+			translated.deleteTitle = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.deleteTitle', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICESTATUS)' });
+			translated.deleteConfirm = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.deleteConfirm', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICESTATUS)' });
 		});
 
 		$scope.dataPage = 1;
@@ -98,8 +98,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 				}, (error) => {
 					const message = error.data ? error.data.message : '';
 					Dialogs.showAlert({
-						title: LocaleService.t('codbex-invoices:t.PURCHASEINVOICESTATUS'),
-						message: LocaleService.t('codbex-invoices:messages.error.unableToLF', { name: '$t(codbex-invoices:t.PURCHASEINVOICESTATUS)', message: message }),
+						title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICESTATUS'),
+						message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLF', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICESTATUS)', message: message }),
 						type: AlertTypes.Error
 					});
 					console.error('EntityService:', error);
@@ -107,8 +107,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			}, (error) => {
 				const message = error.data ? error.data.message : '';
 				Dialogs.showAlert({
-					title: LocaleService.t('codbex-invoices:t.PURCHASEINVOICESTATUS'),
-					message: LocaleService.t('codbex-invoices:messages.error.unableToCount', { name: '$t(codbex-invoices:t.PURCHASEINVOICESTATUS)', message: message }),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICESTATUS'),
+					message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToCount', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICESTATUS)', message: message }),
 					type: AlertTypes.Error
 				});
 				console.error('EntityService:', error);
@@ -186,8 +186,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 					}, (error) => {
 						const message = error.data ? error.data.message : '';
 						Dialogs.showAlert({
-							title: LocaleService.t('codbex-invoices:t.PURCHASEINVOICESTATUS'),
-							message: LocaleService.t('codbex-invoices:messages.error.unableToDelete', { name: '$t(codbex-invoices:t.PURCHASEINVOICESTATUS)', message: message }),
+							title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICESTATUS'),
+							message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToDelete', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICESTATUS)', message: message }),
 							type: AlertTypes.Error
 						});
 						console.error('EntityService:', error);
diff --git a/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceStatus/dialog-filter/controller.js b/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceStatus/dialog-filter/controller.js
index dcd1e46..b7c38dc 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceStatus/dialog-filter/controller.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceStatus/dialog-filter/controller.js
@@ -7,7 +7,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale']).controlle
 	};
 
 	LocaleService.onInit(() => {
-		description = LocaleService.t('codbex-invoices:defaults.description');
+		description = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.description');
 	});
 
 	let params = ViewParameters.get();
diff --git a/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceStatus/dialog-filter/index.html b/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceStatus/dialog-filter/index.html
index fce71e5..9986360 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceStatus/dialog-filter/index.html
+++ b/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceStatus/dialog-filter/index.html
@@ -17,20 +17,20 @@
             <bk-message-strip class="fd-margin--md" ng-show="errorMessage" glyph="sap-icon--message-error" state="error" on-dismiss="clearErrorMessage()">{{ errorMessage }}</bk-message-strip>
 
             <bk-fieldset class="fd-padding-begin-end--sm" ng-form="forms.details">
-                <bk-form-group label="{{ 'codbex-invoices:defaults.formGrpFilter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICESTATUS)'} }}" name="entityForm" transclude-classes="fd-container fd-form-layout-grid-container">
+                <bk-form-group label="{{ 'codbex-invoices:codbex-invoices-model.defaults.formGrpFilter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICESTATUS)'} }}" name="entityForm" transclude-classes="fd-container fd-form-layout-grid-container">
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idName" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICESTATUS_NAME' | t }}</bk-form-label>
+                        	<bk-form-label for="idName" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICESTATUS_NAME' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--8">
-							<bk-form-input-message state="{{ forms.details['Name'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:messages.error.incorrectInput' | t}}">
+							<bk-form-input-message state="{{ forms.details['Name'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:codbex-invoices-model.messages.error.incorrectInput' | t}}">
 								<bk-input id="idName"
 	                                name="Name"
 	                                state="{{ forms.details['Name'].$valid ? '' : 'error' }}"
 	                                ng-model="entity.Name"
 									ng-maxlength="20.0"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICESTATUS_NAME)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICESTATUS_NAME)'} }}">
 	                            </bk-input>
 							</bk-form-input-message>
 	                    </div>
@@ -42,13 +42,13 @@
 		<bk-bar bar-design="footer" compact="true" ng-show="action !== 'select'">
 			<bk-bar-right>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.filter' | t }}" state="emphasized" ng-click="filter()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.filter' | t }}" state="emphasized" ng-click="filter()"></bk-button>
 				</bk-bar-element>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.reset' | t }}" ng-click="resetFilter()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.reset' | t }}" ng-click="resetFilter()"></bk-button>
 				</bk-bar-element>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
 				</bk-bar-element>
 			</bk-bar-right>
 		</bk-bar>
diff --git a/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceStatus/dialog-filter/view.js b/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceStatus/dialog-filter/view.js
index 72383f3..d00ea97 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceStatus/dialog-filter/view.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceStatus/dialog-filter/view.js
@@ -7,9 +7,9 @@ const viewData = {
     id: 'PurchaseInvoiceStatus-filter',
     label: 'PurchaseInvoiceStatus Filter',
     translation: {
-        key: 'codbex-invoices:extName',
+        key: 'codbex-invoices:codbex-invoices-model.extName',
         options: {
-            content: '$t(codbex-invoices:t.PURCHASEINVOICESTATUS) $t(codbex-invoices:defaults.filter)',
+            content: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICESTATUS) $t(codbex-invoices:codbex-invoices-model.defaults.filter)',
         }
     },
     path: '/services/web/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceStatus/dialog-filter/index.html',
diff --git a/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceStatus/dialog-window/controller.js b/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceStatus/dialog-window/controller.js
index e2cb102..16499b4 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceStatus/dialog-window/controller.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceStatus/dialog-window/controller.js
@@ -21,12 +21,12 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 		$scope.action = 'select';
 
 		LocaleService.onInit(() => {
-			description = LocaleService.t('codbex-invoices:defaults.description');
-			$scope.formHeaders.select = LocaleService.t('codbex-invoices:defaults.formHeadSelect', { name: '$t(codbex-invoices:t.PURCHASEINVOICESTATUS)' });
-			$scope.formHeaders.create = LocaleService.t('codbex-invoices:defaults.formHeadCreate', { name: '$t(codbex-invoices:t.PURCHASEINVOICESTATUS)' });
-			$scope.formHeaders.update = LocaleService.t('codbex-invoices:defaults.formHeadUpdate', { name: '$t(codbex-invoices:t.PURCHASEINVOICESTATUS)' });
-			propertySuccessfullyCreated = LocaleService.t('codbex-invoices:messages.propertySuccessfullyCreated', { name: '$t(codbex-invoices:t.PURCHASEINVOICESTATUS)' });
-			propertySuccessfullyUpdated = LocaleService.t('codbex-invoices:messages.propertySuccessfullyUpdated', { name: '$t(codbex-invoices:t.PURCHASEINVOICESTATUS)' });
+			description = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.description');
+			$scope.formHeaders.select = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.formHeadSelect', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICESTATUS)' });
+			$scope.formHeaders.create = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.formHeadCreate', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICESTATUS)' });
+			$scope.formHeaders.update = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.formHeadUpdate', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICESTATUS)' });
+			propertySuccessfullyCreated = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.propertySuccessfullyCreated', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICESTATUS)' });
+			propertySuccessfullyUpdated = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.propertySuccessfullyUpdated', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICESTATUS)' });
 		});
 
 		let params = ViewParameters.get();
@@ -43,7 +43,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			EntityService.create(entity).then((response) => {
 				Dialogs.postMessage({ topic: 'codbex-invoices.Settings.PurchaseInvoiceStatus.entityCreated', data: response.data });
 				Notifications.show({
-					title: LocaleService.t('codbex-invoices:t.PURCHASEINVOICESTATUS'),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICESTATUS'),
 					description: propertySuccessfullyCreated,
 					type: 'positive'
 				});
@@ -51,7 +51,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			}, (error) => {
 				const message = error.data ? error.data.message : '';
 				$scope.$evalAsync(() => {
-					$scope.errorMessage = LocaleService.t('codbex-invoices:messages.error.unableToCreate', { name: '$t(codbex-invoices:t.PURCHASEINVOICESTATUS)', message: message });
+					$scope.errorMessage = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToCreate', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICESTATUS)', message: message });
 				});
 				console.error('EntityService:', error);
 			});
@@ -64,7 +64,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			EntityService.update(id, entity).then((response) => {
 				Dialogs.postMessage({ topic: 'codbex-invoices.Settings.PurchaseInvoiceStatus.entityUpdated', data: response.data });
 				Notifications.show({
-					title: LocaleService.t('codbex-invoices:t.PURCHASEINVOICESTATUS'),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICESTATUS'),
 					description: propertySuccessfullyUpdated,
 					type: 'positive'
 				});
@@ -72,7 +72,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			}, (error) => {
 				const message = error.data ? error.data.message : '';
 				$scope.$evalAsync(() => {
-					$scope.errorMessage = LocaleService.t('codbex-invoices:messages.error.unableToUpdate', { name: '$t(codbex-invoices:t.PURCHASEINVOICESTATUS)', message: message });
+					$scope.errorMessage = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToUpdate', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICESTATUS)', message: message });
 				});
 				console.error('EntityService:', error);
 			});
diff --git a/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceStatus/dialog-window/index.html b/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceStatus/dialog-window/index.html
index fd99541..f83360a 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceStatus/dialog-window/index.html
+++ b/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceStatus/dialog-window/index.html
@@ -21,10 +21,10 @@
                 <bk-form-group label="{{formHeaders[action]}}" name="entityForm" transclude-classes="fd-container fd-form-layout-grid-container">
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idName" ng-required="false" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICESTATUS_NAME' | t }}</bk-form-label>
+                        	<bk-form-label for="idName" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICESTATUS_NAME' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
-							<bk-form-input-message state="{{ forms.details['Name'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:messages.error.pattern' | t:{'rule':''} }}">
+							<bk-form-input-message state="{{ forms.details['Name'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:codbex-invoices-model.messages.error.pattern' | t:{'rule':''} }}">
 								<bk-input id="idName"
 	                                name="Name"
 	                                state="{{ forms.details['Name'].$valid ? '' : 'error' }}"
@@ -34,7 +34,7 @@
 									ng-maxlength="20.0"
 	                                input-rules="{ patterns: [''] }"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICESTATUS_NAME)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICESTATUS_NAME)'} }}">
 	                            </bk-input>
 							</bk-form-input-message>
 	                    </div>
@@ -46,11 +46,11 @@
 		<bk-bar bar-design="footer" compact="true" ng-show="action !== 'select'">
 			<bk-bar-right>
 				<bk-bar-element>
-					<bk-button ng-if="action === 'create'" label="{{'codbex-invoices:defaults.create' | t}}" state="emphasized" ng-click="create()" ng-disabled="!forms.details.$valid"></bk-button>
-					<bk-button ng-if="action !== 'create'" label="{{'codbex-invoices:defaults.update' | t}}" state="emphasized" ng-click="update()" ng-disabled="!forms.details.$valid"></bk-button>
+					<bk-button ng-if="action === 'create'" label="{{'codbex-invoices:codbex-invoices-model.defaults.create' | t}}" state="emphasized" ng-click="create()" ng-disabled="!forms.details.$valid"></bk-button>
+					<bk-button ng-if="action !== 'create'" label="{{'codbex-invoices:codbex-invoices-model.defaults.update' | t}}" state="emphasized" ng-click="update()" ng-disabled="!forms.details.$valid"></bk-button>
 				</bk-bar-element>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
 				</bk-bar-element>
 			</bk-bar-right>
 		</bk-bar>
diff --git a/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceStatus/dialog-window/view.js b/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceStatus/dialog-window/view.js
index e6f209c..9ab39c7 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceStatus/dialog-window/view.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceStatus/dialog-window/view.js
@@ -7,7 +7,7 @@ const viewData = {
     id: 'PurchaseInvoiceStatus-details',
     label: 'PurchaseInvoiceStatus',
     translation: {
-        key: 'codbex-invoices:t.PURCHASEINVOICESTATUS',
+        key: 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICESTATUS',
     },
     path: '/services/web/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceStatus/dialog-window/index.html',
     perspectiveName: 'Settings'
diff --git a/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceStatus/index.html b/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceStatus/index.html
index 3623f07..93fbbf5 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceStatus/index.html
+++ b/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceStatus/index.html
@@ -15,24 +15,24 @@
 
 	<body class="bk-vbox">
 		<bk-toolbar has-title="true">
-			<bk-toolbar-title>{{'codbex-invoices:defaults.items' | t}} <span bk-object-status text="{{dataCount}}" inverted="true"></bk-toolbar-title>
-			<bk-button compact="true" state="transparent" label="{{ 'codbex-invoices:defaults.filter' | t }}" ng-click="openFilter()"></bk-button>
+			<bk-toolbar-title>{{'codbex-invoices:codbex-invoices-model.defaults.items' | t}} <span bk-object-status text="{{dataCount}}" inverted="true"></bk-toolbar-title>
+			<bk-button compact="true" state="transparent" label="{{ 'codbex-invoices:codbex-invoices-model.defaults.filter' | t }}" ng-click="openFilter()"></bk-button>
 			<bk-button ng-repeat="action in pageActions track by $index" compact="true" state="transparent" label="{{action.translation.key | t:action.translation.options:action.label}}" ng-click="triggerPageAction(action)"></bk-button>
 			<bk-toolbar-spacer></bk-toolbar-spacer>
-			<bk-button compact="true" state="emphasized" label="{{'codbex-invoices:defaults.create' | t}}" ng-click="createEntity()"></bk-button>
+			<bk-button compact="true" state="emphasized" label="{{'codbex-invoices:codbex-invoices-model.defaults.create' | t}}" ng-click="createEntity()"></bk-button>
 		</bk-toolbar>
 
 		<bk-scrollbar class="bk-full-height" ng-hide="data == null">
 			<table bk-table display-mode="compact" inner-borders="top" outer-borders="none">
 				<thead bk-table-header sticky="true">
 					<tr bk-table-row>
-						<th bk-table-header-cell>{{ 'codbex-invoices:t.PURCHASEINVOICESTATUS_NAME' | t:'Name' }}</th>
+						<th bk-table-header-cell>{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICESTATUS_NAME' | t:'Name' }}</th>
 						<th bk-table-header-cell></th>
 					</tr>
 				</thead>
 				<tbody bk-table-body>
 					<tr bk-table-row hoverable="true" ng-show="data.length == 0">
-						<td bk-table-cell no-data="true">{{'codbex-invoices:messages.noData' | t}}</td>
+						<td bk-table-cell no-data="true">{{'codbex-invoices:codbex-invoices-model.messages.noData' | t}}</td>
 					</tr>
 					<tr bk-table-row hoverable="true" ng-repeat="next in data track by $index"
 						selected="next.Id === selectedEntity.Id" ng-click="selectEntity(next)">
@@ -40,14 +40,14 @@
 						<td bk-table-cell fit-content="true">
 							<bk-popover>
 								<bk-popover-control>
-									<bk-button compact="true" glyph="sap-icon--overflow" state="transparent" aria-label="{{'codbex-invoices:aria.tableRowMenuBtn' | t}}" ng-click="setTristate()"></bk-button>
+									<bk-button compact="true" glyph="sap-icon--overflow" state="transparent" aria-label="{{'codbex-invoices:codbex-invoices-model.aria.tableRowMenuBtn' | t}}" ng-click="setTristate()"></bk-button>
 								</bk-popover-control>
 								<bk-popover-body align="bottom-right">
-									<bk-menu aria-label="{{'codbex-invoices:aria.tableRowMenu' | t}}" no-backdrop="true" no-shadow="true">
+									<bk-menu aria-label="{{'codbex-invoices:codbex-invoices-model.aria.tableRowMenu' | t}}" no-backdrop="true" no-shadow="true">
 										<bk-menu-item ng-repeat="action in entityActions track by $index" title="{{action.translation.key | t:action.translation.options:action.label}}" ng-click="triggerEntityAction(action)"></bk-menu-item>
-										<bk-menu-item title="{{ 'codbex-invoices:defaults.viewDetails' | t }}" ng-click="openDetails(next)"></bk-menu-item>
-										<bk-menu-item title="{{ 'codbex-invoices:defaults.edit' | t }}" ng-click="updateEntity(next)"></bk-menu-item>
-										<bk-menu-item title="{{ 'codbex-invoices:defaults.delete' | t }}" ng-click="deleteEntity(next)"></bk-menu-item>
+										<bk-menu-item title="{{ 'codbex-invoices:codbex-invoices-model.defaults.viewDetails' | t }}" ng-click="openDetails(next)"></bk-menu-item>
+										<bk-menu-item title="{{ 'codbex-invoices:codbex-invoices-model.defaults.edit' | t }}" ng-click="updateEntity(next)"></bk-menu-item>
+										<bk-menu-item title="{{ 'codbex-invoices:codbex-invoices-model.defaults.delete' | t }}" ng-click="deleteEntity(next)"></bk-menu-item>
 									</bk-menu>
 								</bk-popover-body>
 							</bk-popover>
diff --git a/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceStatus/view.js b/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceStatus/view.js
index b8a28d9..eae71b1 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceStatus/view.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceStatus/view.js
@@ -7,7 +7,7 @@ const viewData = {
     id: 'PurchaseInvoiceStatus',
     label: 'PurchaseInvoiceStatus',
     translation: {
-        key: 'codbex-invoices:t.PURCHASEINVOICESTATUS',
+        key: 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICESTATUS',
     },
     region: 'center',
     lazyLoad: true,
diff --git a/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceType/controller.js b/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceType/controller.js
index af62d6c..b04e6c7 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceType/controller.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceType/controller.js
@@ -12,10 +12,10 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 		};
 
 		LocaleService.onInit(() => {
-			translated.yes = LocaleService.t('codbex-invoices:defaults.yes');
-			translated.no = LocaleService.t('codbex-invoices:defaults.no');
-			translated.deleteTitle = LocaleService.t('codbex-invoices:defaults.deleteTitle', { name: '$t(codbex-invoices:t.PURCHASEINVOICETYPE)' });
-			translated.deleteConfirm = LocaleService.t('codbex-invoices:messages.deleteConfirm', { name: '$t(codbex-invoices:t.PURCHASEINVOICETYPE)' });
+			translated.yes = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.yes');
+			translated.no = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.no');
+			translated.deleteTitle = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.deleteTitle', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICETYPE)' });
+			translated.deleteConfirm = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.deleteConfirm', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICETYPE)' });
 		});
 
 		$scope.dataPage = 1;
@@ -98,8 +98,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 				}, (error) => {
 					const message = error.data ? error.data.message : '';
 					Dialogs.showAlert({
-						title: LocaleService.t('codbex-invoices:t.PURCHASEINVOICETYPE'),
-						message: LocaleService.t('codbex-invoices:messages.error.unableToLF', { name: '$t(codbex-invoices:t.PURCHASEINVOICETYPE)', message: message }),
+						title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICETYPE'),
+						message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLF', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICETYPE)', message: message }),
 						type: AlertTypes.Error
 					});
 					console.error('EntityService:', error);
@@ -107,8 +107,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			}, (error) => {
 				const message = error.data ? error.data.message : '';
 				Dialogs.showAlert({
-					title: LocaleService.t('codbex-invoices:t.PURCHASEINVOICETYPE'),
-					message: LocaleService.t('codbex-invoices:messages.error.unableToCount', { name: '$t(codbex-invoices:t.PURCHASEINVOICETYPE)', message: message }),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICETYPE'),
+					message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToCount', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICETYPE)', message: message }),
 					type: AlertTypes.Error
 				});
 				console.error('EntityService:', error);
@@ -186,8 +186,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 					}, (error) => {
 						const message = error.data ? error.data.message : '';
 						Dialogs.showAlert({
-							title: LocaleService.t('codbex-invoices:t.PURCHASEINVOICETYPE'),
-							message: LocaleService.t('codbex-invoices:messages.error.unableToDelete', { name: '$t(codbex-invoices:t.PURCHASEINVOICETYPE)', message: message }),
+							title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICETYPE'),
+							message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToDelete', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICETYPE)', message: message }),
 							type: AlertTypes.Error
 						});
 						console.error('EntityService:', error);
diff --git a/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceType/dialog-filter/controller.js b/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceType/dialog-filter/controller.js
index b589c72..0fc068b 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceType/dialog-filter/controller.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceType/dialog-filter/controller.js
@@ -7,7 +7,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale']).controlle
 	};
 
 	LocaleService.onInit(() => {
-		description = LocaleService.t('codbex-invoices:defaults.description');
+		description = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.description');
 	});
 
 	let params = ViewParameters.get();
diff --git a/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceType/dialog-filter/index.html b/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceType/dialog-filter/index.html
index df085cb..79f5b04 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceType/dialog-filter/index.html
+++ b/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceType/dialog-filter/index.html
@@ -17,36 +17,36 @@
             <bk-message-strip class="fd-margin--md" ng-show="errorMessage" glyph="sap-icon--message-error" state="error" on-dismiss="clearErrorMessage()">{{ errorMessage }}</bk-message-strip>
 
             <bk-fieldset class="fd-padding-begin-end--sm" ng-form="forms.details">
-                <bk-form-group label="{{ 'codbex-invoices:defaults.formGrpFilter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICETYPE)'} }}" name="entityForm" transclude-classes="fd-container fd-form-layout-grid-container">
+                <bk-form-group label="{{ 'codbex-invoices:codbex-invoices-model.defaults.formGrpFilter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICETYPE)'} }}" name="entityForm" transclude-classes="fd-container fd-form-layout-grid-container">
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idName" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICETYPE_NAME' | t }}</bk-form-label>
+                        	<bk-form-label for="idName" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICETYPE_NAME' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--8">
-							<bk-form-input-message state="{{ forms.details['Name'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:messages.error.incorrectInput' | t}}">
+							<bk-form-input-message state="{{ forms.details['Name'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:codbex-invoices-model.messages.error.incorrectInput' | t}}">
 								<bk-input id="idName"
 	                                name="Name"
 	                                state="{{ forms.details['Name'].$valid ? '' : 'error' }}"
 	                                ng-model="entity.Name"
 									ng-maxlength="20.0"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICETYPE_NAME)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICETYPE_NAME)'} }}">
 	                            </bk-input>
 							</bk-form-input-message>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idDirection" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICETYPE_DIRECTION' | t }}</bk-form-label>
+                        	<bk-form-label for="idDirection" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICETYPE_DIRECTION' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--8">
-							<bk-form-input-message state="{{ forms.details['Direction'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:messages.error.incorrectInput' | t}}">
+							<bk-form-input-message state="{{ forms.details['Direction'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:codbex-invoices-model.messages.error.incorrectInput' | t}}">
 								<bk-input id="idDirection"
 	                                name="Direction"
 	                                state="{{ forms.details['Direction'].$valid ? '' : 'error' }}"
 	                                ng-model="entity.Direction"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICETYPE_DIRECTION)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICETYPE_DIRECTION)'} }}">
 	                            </bk-input>
 							</bk-form-input-message>
 	                    </div>
@@ -58,13 +58,13 @@
 		<bk-bar bar-design="footer" compact="true" ng-show="action !== 'select'">
 			<bk-bar-right>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.filter' | t }}" state="emphasized" ng-click="filter()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.filter' | t }}" state="emphasized" ng-click="filter()"></bk-button>
 				</bk-bar-element>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.reset' | t }}" ng-click="resetFilter()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.reset' | t }}" ng-click="resetFilter()"></bk-button>
 				</bk-bar-element>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
 				</bk-bar-element>
 			</bk-bar-right>
 		</bk-bar>
diff --git a/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceType/dialog-filter/view.js b/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceType/dialog-filter/view.js
index 6277258..2c8473e 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceType/dialog-filter/view.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceType/dialog-filter/view.js
@@ -7,9 +7,9 @@ const viewData = {
     id: 'PurchaseInvoiceType-filter',
     label: 'PurchaseInvoiceType Filter',
     translation: {
-        key: 'codbex-invoices:extName',
+        key: 'codbex-invoices:codbex-invoices-model.extName',
         options: {
-            content: '$t(codbex-invoices:t.PURCHASEINVOICETYPE) $t(codbex-invoices:defaults.filter)',
+            content: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICETYPE) $t(codbex-invoices:codbex-invoices-model.defaults.filter)',
         }
     },
     path: '/services/web/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceType/dialog-filter/index.html',
diff --git a/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceType/dialog-window/controller.js b/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceType/dialog-window/controller.js
index 7c4c248..e3a2693 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceType/dialog-window/controller.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceType/dialog-window/controller.js
@@ -21,12 +21,12 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 		$scope.action = 'select';
 
 		LocaleService.onInit(() => {
-			description = LocaleService.t('codbex-invoices:defaults.description');
-			$scope.formHeaders.select = LocaleService.t('codbex-invoices:defaults.formHeadSelect', { name: '$t(codbex-invoices:t.PURCHASEINVOICETYPE)' });
-			$scope.formHeaders.create = LocaleService.t('codbex-invoices:defaults.formHeadCreate', { name: '$t(codbex-invoices:t.PURCHASEINVOICETYPE)' });
-			$scope.formHeaders.update = LocaleService.t('codbex-invoices:defaults.formHeadUpdate', { name: '$t(codbex-invoices:t.PURCHASEINVOICETYPE)' });
-			propertySuccessfullyCreated = LocaleService.t('codbex-invoices:messages.propertySuccessfullyCreated', { name: '$t(codbex-invoices:t.PURCHASEINVOICETYPE)' });
-			propertySuccessfullyUpdated = LocaleService.t('codbex-invoices:messages.propertySuccessfullyUpdated', { name: '$t(codbex-invoices:t.PURCHASEINVOICETYPE)' });
+			description = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.description');
+			$scope.formHeaders.select = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.formHeadSelect', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICETYPE)' });
+			$scope.formHeaders.create = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.formHeadCreate', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICETYPE)' });
+			$scope.formHeaders.update = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.formHeadUpdate', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICETYPE)' });
+			propertySuccessfullyCreated = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.propertySuccessfullyCreated', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICETYPE)' });
+			propertySuccessfullyUpdated = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.propertySuccessfullyUpdated', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICETYPE)' });
 		});
 
 		let params = ViewParameters.get();
@@ -43,7 +43,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			EntityService.create(entity).then((response) => {
 				Dialogs.postMessage({ topic: 'codbex-invoices.Settings.PurchaseInvoiceType.entityCreated', data: response.data });
 				Notifications.show({
-					title: LocaleService.t('codbex-invoices:t.PURCHASEINVOICETYPE'),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICETYPE'),
 					description: propertySuccessfullyCreated,
 					type: 'positive'
 				});
@@ -51,7 +51,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			}, (error) => {
 				const message = error.data ? error.data.message : '';
 				$scope.$evalAsync(() => {
-					$scope.errorMessage = LocaleService.t('codbex-invoices:messages.error.unableToCreate', { name: '$t(codbex-invoices:t.PURCHASEINVOICETYPE)', message: message });
+					$scope.errorMessage = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToCreate', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICETYPE)', message: message });
 				});
 				console.error('EntityService:', error);
 			});
@@ -64,7 +64,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			EntityService.update(id, entity).then((response) => {
 				Dialogs.postMessage({ topic: 'codbex-invoices.Settings.PurchaseInvoiceType.entityUpdated', data: response.data });
 				Notifications.show({
-					title: LocaleService.t('codbex-invoices:t.PURCHASEINVOICETYPE'),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICETYPE'),
 					description: propertySuccessfullyUpdated,
 					type: 'positive'
 				});
@@ -72,7 +72,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			}, (error) => {
 				const message = error.data ? error.data.message : '';
 				$scope.$evalAsync(() => {
-					$scope.errorMessage = LocaleService.t('codbex-invoices:messages.error.unableToUpdate', { name: '$t(codbex-invoices:t.PURCHASEINVOICETYPE)', message: message });
+					$scope.errorMessage = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToUpdate', { name: '$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICETYPE)', message: message });
 				});
 				console.error('EntityService:', error);
 			});
diff --git a/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceType/dialog-window/index.html b/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceType/dialog-window/index.html
index ef803fb..c844705 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceType/dialog-window/index.html
+++ b/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceType/dialog-window/index.html
@@ -21,10 +21,10 @@
                 <bk-form-group label="{{formHeaders[action]}}" name="entityForm" transclude-classes="fd-container fd-form-layout-grid-container">
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idName" ng-required="true" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICETYPE_NAME' | t }}</bk-form-label>
+                        	<bk-form-label for="idName" ng-required="true" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICETYPE_NAME' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
-							<bk-form-input-message state="{{ forms.details['Name'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:messages.error.pattern' | t:{'rule':''} }}">
+							<bk-form-input-message state="{{ forms.details['Name'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:codbex-invoices-model.messages.error.pattern' | t:{'rule':''} }}">
 								<bk-input id="idName"
 	                                name="Name"
 	                                state="{{ forms.details['Name'].$valid ? '' : 'error' }}"
@@ -34,17 +34,17 @@
 									ng-maxlength="20.0"
 	                                input-rules="{ patterns: [''] }"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICETYPE_NAME)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICETYPE_NAME)'} }}">
 	                            </bk-input>
 							</bk-form-input-message>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idDirection" ng-required="true" colon="true">{{ 'codbex-invoices:t.PURCHASEINVOICETYPE_DIRECTION' | t }}</bk-form-label>
+                        	<bk-form-label for="idDirection" ng-required="true" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICETYPE_DIRECTION' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
-							<bk-form-input-message state="{{ forms.details['Direction'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:messages.error.pattern' | t:{'rule':''} }}">
+							<bk-form-input-message state="{{ forms.details['Direction'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:codbex-invoices-model.messages.error.pattern' | t:{'rule':''} }}">
 								<bk-input id="idDirection"
 	                                name="Direction"
 	                                state="{{ forms.details['Direction'].$valid ? '' : 'error' }}"
@@ -53,7 +53,7 @@
 	                                ng-readonly="action === 'select'"
 	                                input-rules="{ patterns: [''] }"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.PURCHASEINVOICETYPE_DIRECTION)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICETYPE_DIRECTION)'} }}">
 	                            </bk-input>
 							</bk-form-input-message>
 	                    </div>
@@ -65,11 +65,11 @@
 		<bk-bar bar-design="footer" compact="true" ng-show="action !== 'select'">
 			<bk-bar-right>
 				<bk-bar-element>
-					<bk-button ng-if="action === 'create'" label="{{'codbex-invoices:defaults.create' | t}}" state="emphasized" ng-click="create()" ng-disabled="!forms.details.$valid"></bk-button>
-					<bk-button ng-if="action !== 'create'" label="{{'codbex-invoices:defaults.update' | t}}" state="emphasized" ng-click="update()" ng-disabled="!forms.details.$valid"></bk-button>
+					<bk-button ng-if="action === 'create'" label="{{'codbex-invoices:codbex-invoices-model.defaults.create' | t}}" state="emphasized" ng-click="create()" ng-disabled="!forms.details.$valid"></bk-button>
+					<bk-button ng-if="action !== 'create'" label="{{'codbex-invoices:codbex-invoices-model.defaults.update' | t}}" state="emphasized" ng-click="update()" ng-disabled="!forms.details.$valid"></bk-button>
 				</bk-bar-element>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
 				</bk-bar-element>
 			</bk-bar-right>
 		</bk-bar>
diff --git a/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceType/dialog-window/view.js b/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceType/dialog-window/view.js
index d7e5276..e58cce0 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceType/dialog-window/view.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceType/dialog-window/view.js
@@ -7,7 +7,7 @@ const viewData = {
     id: 'PurchaseInvoiceType-details',
     label: 'PurchaseInvoiceType',
     translation: {
-        key: 'codbex-invoices:t.PURCHASEINVOICETYPE',
+        key: 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICETYPE',
     },
     path: '/services/web/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceType/dialog-window/index.html',
     perspectiveName: 'Settings'
diff --git a/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceType/index.html b/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceType/index.html
index 0878fb4..6e347aa 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceType/index.html
+++ b/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceType/index.html
@@ -15,25 +15,25 @@
 
 	<body class="bk-vbox">
 		<bk-toolbar has-title="true">
-			<bk-toolbar-title>{{'codbex-invoices:defaults.items' | t}} <span bk-object-status text="{{dataCount}}" inverted="true"></bk-toolbar-title>
-			<bk-button compact="true" state="transparent" label="{{ 'codbex-invoices:defaults.filter' | t }}" ng-click="openFilter()"></bk-button>
+			<bk-toolbar-title>{{'codbex-invoices:codbex-invoices-model.defaults.items' | t}} <span bk-object-status text="{{dataCount}}" inverted="true"></bk-toolbar-title>
+			<bk-button compact="true" state="transparent" label="{{ 'codbex-invoices:codbex-invoices-model.defaults.filter' | t }}" ng-click="openFilter()"></bk-button>
 			<bk-button ng-repeat="action in pageActions track by $index" compact="true" state="transparent" label="{{action.translation.key | t:action.translation.options:action.label}}" ng-click="triggerPageAction(action)"></bk-button>
 			<bk-toolbar-spacer></bk-toolbar-spacer>
-			<bk-button compact="true" state="emphasized" label="{{'codbex-invoices:defaults.create' | t}}" ng-click="createEntity()"></bk-button>
+			<bk-button compact="true" state="emphasized" label="{{'codbex-invoices:codbex-invoices-model.defaults.create' | t}}" ng-click="createEntity()"></bk-button>
 		</bk-toolbar>
 
 		<bk-scrollbar class="bk-full-height" ng-hide="data == null">
 			<table bk-table display-mode="compact" inner-borders="top" outer-borders="none">
 				<thead bk-table-header sticky="true">
 					<tr bk-table-row>
-						<th bk-table-header-cell>{{ 'codbex-invoices:t.PURCHASEINVOICETYPE_NAME' | t:'Name' }}</th>
-						<th bk-table-header-cell>{{ 'codbex-invoices:t.PURCHASEINVOICETYPE_DIRECTION' | t:'Direction' }}</th>
+						<th bk-table-header-cell>{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICETYPE_NAME' | t:'Name' }}</th>
+						<th bk-table-header-cell>{{ 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICETYPE_DIRECTION' | t:'Direction' }}</th>
 						<th bk-table-header-cell></th>
 					</tr>
 				</thead>
 				<tbody bk-table-body>
 					<tr bk-table-row hoverable="true" ng-show="data.length == 0">
-						<td bk-table-cell no-data="true">{{'codbex-invoices:messages.noData' | t}}</td>
+						<td bk-table-cell no-data="true">{{'codbex-invoices:codbex-invoices-model.messages.noData' | t}}</td>
 					</tr>
 					<tr bk-table-row hoverable="true" ng-repeat="next in data track by $index"
 						selected="next.Id === selectedEntity.Id" ng-click="selectEntity(next)">
@@ -42,14 +42,14 @@
 						<td bk-table-cell fit-content="true">
 							<bk-popover>
 								<bk-popover-control>
-									<bk-button compact="true" glyph="sap-icon--overflow" state="transparent" aria-label="{{'codbex-invoices:aria.tableRowMenuBtn' | t}}" ng-click="setTristate()"></bk-button>
+									<bk-button compact="true" glyph="sap-icon--overflow" state="transparent" aria-label="{{'codbex-invoices:codbex-invoices-model.aria.tableRowMenuBtn' | t}}" ng-click="setTristate()"></bk-button>
 								</bk-popover-control>
 								<bk-popover-body align="bottom-right">
-									<bk-menu aria-label="{{'codbex-invoices:aria.tableRowMenu' | t}}" no-backdrop="true" no-shadow="true">
+									<bk-menu aria-label="{{'codbex-invoices:codbex-invoices-model.aria.tableRowMenu' | t}}" no-backdrop="true" no-shadow="true">
 										<bk-menu-item ng-repeat="action in entityActions track by $index" title="{{action.translation.key | t:action.translation.options:action.label}}" ng-click="triggerEntityAction(action)"></bk-menu-item>
-										<bk-menu-item title="{{ 'codbex-invoices:defaults.viewDetails' | t }}" ng-click="openDetails(next)"></bk-menu-item>
-										<bk-menu-item title="{{ 'codbex-invoices:defaults.edit' | t }}" ng-click="updateEntity(next)"></bk-menu-item>
-										<bk-menu-item title="{{ 'codbex-invoices:defaults.delete' | t }}" ng-click="deleteEntity(next)"></bk-menu-item>
+										<bk-menu-item title="{{ 'codbex-invoices:codbex-invoices-model.defaults.viewDetails' | t }}" ng-click="openDetails(next)"></bk-menu-item>
+										<bk-menu-item title="{{ 'codbex-invoices:codbex-invoices-model.defaults.edit' | t }}" ng-click="updateEntity(next)"></bk-menu-item>
+										<bk-menu-item title="{{ 'codbex-invoices:codbex-invoices-model.defaults.delete' | t }}" ng-click="deleteEntity(next)"></bk-menu-item>
 									</bk-menu>
 								</bk-popover-body>
 							</bk-popover>
diff --git a/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceType/view.js b/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceType/view.js
index 5a236aa..ca4356b 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceType/view.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/Settings/PurchaseInvoiceType/view.js
@@ -7,7 +7,7 @@ const viewData = {
     id: 'PurchaseInvoiceType',
     label: 'PurchaseInvoiceType',
     translation: {
-        key: 'codbex-invoices:t.PURCHASEINVOICETYPE',
+        key: 'codbex-invoices:codbex-invoices-model.t.PURCHASEINVOICETYPE',
     },
     region: 'center',
     lazyLoad: true,
diff --git a/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceStatus/controller.js b/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceStatus/controller.js
index b418be8..90dfc96 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceStatus/controller.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceStatus/controller.js
@@ -12,10 +12,10 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 		};
 
 		LocaleService.onInit(() => {
-			translated.yes = LocaleService.t('codbex-invoices:defaults.yes');
-			translated.no = LocaleService.t('codbex-invoices:defaults.no');
-			translated.deleteTitle = LocaleService.t('codbex-invoices:defaults.deleteTitle', { name: '$t(codbex-invoices:t.SALESINVOICESTATUS)' });
-			translated.deleteConfirm = LocaleService.t('codbex-invoices:messages.deleteConfirm', { name: '$t(codbex-invoices:t.SALESINVOICESTATUS)' });
+			translated.yes = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.yes');
+			translated.no = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.no');
+			translated.deleteTitle = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.deleteTitle', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICESTATUS)' });
+			translated.deleteConfirm = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.deleteConfirm', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICESTATUS)' });
 		});
 
 		$scope.dataPage = 1;
@@ -98,8 +98,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 				}, (error) => {
 					const message = error.data ? error.data.message : '';
 					Dialogs.showAlert({
-						title: LocaleService.t('codbex-invoices:t.SALESINVOICESTATUS'),
-						message: LocaleService.t('codbex-invoices:messages.error.unableToLF', { name: '$t(codbex-invoices:t.SALESINVOICESTATUS)', message: message }),
+						title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.SALESINVOICESTATUS'),
+						message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLF', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICESTATUS)', message: message }),
 						type: AlertTypes.Error
 					});
 					console.error('EntityService:', error);
@@ -107,8 +107,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			}, (error) => {
 				const message = error.data ? error.data.message : '';
 				Dialogs.showAlert({
-					title: LocaleService.t('codbex-invoices:t.SALESINVOICESTATUS'),
-					message: LocaleService.t('codbex-invoices:messages.error.unableToCount', { name: '$t(codbex-invoices:t.SALESINVOICESTATUS)', message: message }),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.SALESINVOICESTATUS'),
+					message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToCount', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICESTATUS)', message: message }),
 					type: AlertTypes.Error
 				});
 				console.error('EntityService:', error);
@@ -186,8 +186,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 					}, (error) => {
 						const message = error.data ? error.data.message : '';
 						Dialogs.showAlert({
-							title: LocaleService.t('codbex-invoices:t.SALESINVOICESTATUS'),
-							message: LocaleService.t('codbex-invoices:messages.error.unableToDelete', { name: '$t(codbex-invoices:t.SALESINVOICESTATUS)', message: message }),
+							title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.SALESINVOICESTATUS'),
+							message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToDelete', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICESTATUS)', message: message }),
 							type: AlertTypes.Error
 						});
 						console.error('EntityService:', error);
diff --git a/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceStatus/dialog-filter/controller.js b/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceStatus/dialog-filter/controller.js
index fa293c4..05230c6 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceStatus/dialog-filter/controller.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceStatus/dialog-filter/controller.js
@@ -7,7 +7,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale']).controlle
 	};
 
 	LocaleService.onInit(() => {
-		description = LocaleService.t('codbex-invoices:defaults.description');
+		description = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.description');
 	});
 
 	let params = ViewParameters.get();
diff --git a/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceStatus/dialog-filter/index.html b/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceStatus/dialog-filter/index.html
index bcc765b..ded9c55 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceStatus/dialog-filter/index.html
+++ b/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceStatus/dialog-filter/index.html
@@ -17,20 +17,20 @@
             <bk-message-strip class="fd-margin--md" ng-show="errorMessage" glyph="sap-icon--message-error" state="error" on-dismiss="clearErrorMessage()">{{ errorMessage }}</bk-message-strip>
 
             <bk-fieldset class="fd-padding-begin-end--sm" ng-form="forms.details">
-                <bk-form-group label="{{ 'codbex-invoices:defaults.formGrpFilter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICESTATUS)'} }}" name="entityForm" transclude-classes="fd-container fd-form-layout-grid-container">
+                <bk-form-group label="{{ 'codbex-invoices:codbex-invoices-model.defaults.formGrpFilter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICESTATUS)'} }}" name="entityForm" transclude-classes="fd-container fd-form-layout-grid-container">
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idName" colon="true">{{ 'codbex-invoices:t.SALESINVOICESTATUS_NAME' | t }}</bk-form-label>
+                        	<bk-form-label for="idName" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICESTATUS_NAME' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--8">
-							<bk-form-input-message state="{{ forms.details['Name'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:messages.error.incorrectInput' | t}}">
+							<bk-form-input-message state="{{ forms.details['Name'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:codbex-invoices-model.messages.error.incorrectInput' | t}}">
 								<bk-input id="idName"
 	                                name="Name"
 	                                state="{{ forms.details['Name'].$valid ? '' : 'error' }}"
 	                                ng-model="entity.Name"
 									ng-maxlength="20.0"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICESTATUS_NAME)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICESTATUS_NAME)'} }}">
 	                            </bk-input>
 							</bk-form-input-message>
 	                    </div>
@@ -42,13 +42,13 @@
 		<bk-bar bar-design="footer" compact="true" ng-show="action !== 'select'">
 			<bk-bar-right>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.filter' | t }}" state="emphasized" ng-click="filter()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.filter' | t }}" state="emphasized" ng-click="filter()"></bk-button>
 				</bk-bar-element>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.reset' | t }}" ng-click="resetFilter()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.reset' | t }}" ng-click="resetFilter()"></bk-button>
 				</bk-bar-element>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
 				</bk-bar-element>
 			</bk-bar-right>
 		</bk-bar>
diff --git a/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceStatus/dialog-filter/view.js b/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceStatus/dialog-filter/view.js
index 70dd40c..6f115e9 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceStatus/dialog-filter/view.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceStatus/dialog-filter/view.js
@@ -7,9 +7,9 @@ const viewData = {
     id: 'SalesInvoiceStatus-filter',
     label: 'SalesInvoiceStatus Filter',
     translation: {
-        key: 'codbex-invoices:extName',
+        key: 'codbex-invoices:codbex-invoices-model.extName',
         options: {
-            content: '$t(codbex-invoices:t.SALESINVOICESTATUS) $t(codbex-invoices:defaults.filter)',
+            content: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICESTATUS) $t(codbex-invoices:codbex-invoices-model.defaults.filter)',
         }
     },
     path: '/services/web/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceStatus/dialog-filter/index.html',
diff --git a/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceStatus/dialog-window/controller.js b/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceStatus/dialog-window/controller.js
index e242cdd..a9463ee 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceStatus/dialog-window/controller.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceStatus/dialog-window/controller.js
@@ -21,12 +21,12 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 		$scope.action = 'select';
 
 		LocaleService.onInit(() => {
-			description = LocaleService.t('codbex-invoices:defaults.description');
-			$scope.formHeaders.select = LocaleService.t('codbex-invoices:defaults.formHeadSelect', { name: '$t(codbex-invoices:t.SALESINVOICESTATUS)' });
-			$scope.formHeaders.create = LocaleService.t('codbex-invoices:defaults.formHeadCreate', { name: '$t(codbex-invoices:t.SALESINVOICESTATUS)' });
-			$scope.formHeaders.update = LocaleService.t('codbex-invoices:defaults.formHeadUpdate', { name: '$t(codbex-invoices:t.SALESINVOICESTATUS)' });
-			propertySuccessfullyCreated = LocaleService.t('codbex-invoices:messages.propertySuccessfullyCreated', { name: '$t(codbex-invoices:t.SALESINVOICESTATUS)' });
-			propertySuccessfullyUpdated = LocaleService.t('codbex-invoices:messages.propertySuccessfullyUpdated', { name: '$t(codbex-invoices:t.SALESINVOICESTATUS)' });
+			description = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.description');
+			$scope.formHeaders.select = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.formHeadSelect', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICESTATUS)' });
+			$scope.formHeaders.create = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.formHeadCreate', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICESTATUS)' });
+			$scope.formHeaders.update = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.formHeadUpdate', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICESTATUS)' });
+			propertySuccessfullyCreated = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.propertySuccessfullyCreated', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICESTATUS)' });
+			propertySuccessfullyUpdated = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.propertySuccessfullyUpdated', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICESTATUS)' });
 		});
 
 		let params = ViewParameters.get();
@@ -43,7 +43,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			EntityService.create(entity).then((response) => {
 				Dialogs.postMessage({ topic: 'codbex-invoices.Settings.SalesInvoiceStatus.entityCreated', data: response.data });
 				Notifications.show({
-					title: LocaleService.t('codbex-invoices:t.SALESINVOICESTATUS'),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.SALESINVOICESTATUS'),
 					description: propertySuccessfullyCreated,
 					type: 'positive'
 				});
@@ -51,7 +51,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			}, (error) => {
 				const message = error.data ? error.data.message : '';
 				$scope.$evalAsync(() => {
-					$scope.errorMessage = LocaleService.t('codbex-invoices:messages.error.unableToCreate', { name: '$t(codbex-invoices:t.SALESINVOICESTATUS)', message: message });
+					$scope.errorMessage = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToCreate', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICESTATUS)', message: message });
 				});
 				console.error('EntityService:', error);
 			});
@@ -64,7 +64,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			EntityService.update(id, entity).then((response) => {
 				Dialogs.postMessage({ topic: 'codbex-invoices.Settings.SalesInvoiceStatus.entityUpdated', data: response.data });
 				Notifications.show({
-					title: LocaleService.t('codbex-invoices:t.SALESINVOICESTATUS'),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.SALESINVOICESTATUS'),
 					description: propertySuccessfullyUpdated,
 					type: 'positive'
 				});
@@ -72,7 +72,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			}, (error) => {
 				const message = error.data ? error.data.message : '';
 				$scope.$evalAsync(() => {
-					$scope.errorMessage = LocaleService.t('codbex-invoices:messages.error.unableToUpdate', { name: '$t(codbex-invoices:t.SALESINVOICESTATUS)', message: message });
+					$scope.errorMessage = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToUpdate', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICESTATUS)', message: message });
 				});
 				console.error('EntityService:', error);
 			});
diff --git a/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceStatus/dialog-window/index.html b/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceStatus/dialog-window/index.html
index ddc431c..3470320 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceStatus/dialog-window/index.html
+++ b/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceStatus/dialog-window/index.html
@@ -21,10 +21,10 @@
                 <bk-form-group label="{{formHeaders[action]}}" name="entityForm" transclude-classes="fd-container fd-form-layout-grid-container">
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idName" ng-required="false" colon="true">{{ 'codbex-invoices:t.SALESINVOICESTATUS_NAME' | t }}</bk-form-label>
+                        	<bk-form-label for="idName" ng-required="false" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICESTATUS_NAME' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
-							<bk-form-input-message state="{{ forms.details['Name'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:messages.error.pattern' | t:{'rule':''} }}">
+							<bk-form-input-message state="{{ forms.details['Name'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:codbex-invoices-model.messages.error.pattern' | t:{'rule':''} }}">
 								<bk-input id="idName"
 	                                name="Name"
 	                                state="{{ forms.details['Name'].$valid ? '' : 'error' }}"
@@ -34,7 +34,7 @@
 									ng-maxlength="20.0"
 	                                input-rules="{ patterns: [''] }"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICESTATUS_NAME)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICESTATUS_NAME)'} }}">
 	                            </bk-input>
 							</bk-form-input-message>
 	                    </div>
@@ -46,11 +46,11 @@
 		<bk-bar bar-design="footer" compact="true" ng-show="action !== 'select'">
 			<bk-bar-right>
 				<bk-bar-element>
-					<bk-button ng-if="action === 'create'" label="{{'codbex-invoices:defaults.create' | t}}" state="emphasized" ng-click="create()" ng-disabled="!forms.details.$valid"></bk-button>
-					<bk-button ng-if="action !== 'create'" label="{{'codbex-invoices:defaults.update' | t}}" state="emphasized" ng-click="update()" ng-disabled="!forms.details.$valid"></bk-button>
+					<bk-button ng-if="action === 'create'" label="{{'codbex-invoices:codbex-invoices-model.defaults.create' | t}}" state="emphasized" ng-click="create()" ng-disabled="!forms.details.$valid"></bk-button>
+					<bk-button ng-if="action !== 'create'" label="{{'codbex-invoices:codbex-invoices-model.defaults.update' | t}}" state="emphasized" ng-click="update()" ng-disabled="!forms.details.$valid"></bk-button>
 				</bk-bar-element>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
 				</bk-bar-element>
 			</bk-bar-right>
 		</bk-bar>
diff --git a/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceStatus/dialog-window/view.js b/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceStatus/dialog-window/view.js
index bca3d2f..bc7b44e 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceStatus/dialog-window/view.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceStatus/dialog-window/view.js
@@ -7,7 +7,7 @@ const viewData = {
     id: 'SalesInvoiceStatus-details',
     label: 'SalesInvoiceStatus',
     translation: {
-        key: 'codbex-invoices:t.SALESINVOICESTATUS',
+        key: 'codbex-invoices:codbex-invoices-model.t.SALESINVOICESTATUS',
     },
     path: '/services/web/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceStatus/dialog-window/index.html',
     perspectiveName: 'Settings'
diff --git a/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceStatus/index.html b/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceStatus/index.html
index 36ae205..189acb0 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceStatus/index.html
+++ b/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceStatus/index.html
@@ -15,24 +15,24 @@
 
 	<body class="bk-vbox">
 		<bk-toolbar has-title="true">
-			<bk-toolbar-title>{{'codbex-invoices:defaults.items' | t}} <span bk-object-status text="{{dataCount}}" inverted="true"></bk-toolbar-title>
-			<bk-button compact="true" state="transparent" label="{{ 'codbex-invoices:defaults.filter' | t }}" ng-click="openFilter()"></bk-button>
+			<bk-toolbar-title>{{'codbex-invoices:codbex-invoices-model.defaults.items' | t}} <span bk-object-status text="{{dataCount}}" inverted="true"></bk-toolbar-title>
+			<bk-button compact="true" state="transparent" label="{{ 'codbex-invoices:codbex-invoices-model.defaults.filter' | t }}" ng-click="openFilter()"></bk-button>
 			<bk-button ng-repeat="action in pageActions track by $index" compact="true" state="transparent" label="{{action.translation.key | t:action.translation.options:action.label}}" ng-click="triggerPageAction(action)"></bk-button>
 			<bk-toolbar-spacer></bk-toolbar-spacer>
-			<bk-button compact="true" state="emphasized" label="{{'codbex-invoices:defaults.create' | t}}" ng-click="createEntity()"></bk-button>
+			<bk-button compact="true" state="emphasized" label="{{'codbex-invoices:codbex-invoices-model.defaults.create' | t}}" ng-click="createEntity()"></bk-button>
 		</bk-toolbar>
 
 		<bk-scrollbar class="bk-full-height" ng-hide="data == null">
 			<table bk-table display-mode="compact" inner-borders="top" outer-borders="none">
 				<thead bk-table-header sticky="true">
 					<tr bk-table-row>
-						<th bk-table-header-cell>{{ 'codbex-invoices:t.SALESINVOICESTATUS_NAME' | t:'Name' }}</th>
+						<th bk-table-header-cell>{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICESTATUS_NAME' | t:'Name' }}</th>
 						<th bk-table-header-cell></th>
 					</tr>
 				</thead>
 				<tbody bk-table-body>
 					<tr bk-table-row hoverable="true" ng-show="data.length == 0">
-						<td bk-table-cell no-data="true">{{'codbex-invoices:messages.noData' | t}}</td>
+						<td bk-table-cell no-data="true">{{'codbex-invoices:codbex-invoices-model.messages.noData' | t}}</td>
 					</tr>
 					<tr bk-table-row hoverable="true" ng-repeat="next in data track by $index"
 						selected="next.Id === selectedEntity.Id" ng-click="selectEntity(next)">
@@ -40,14 +40,14 @@
 						<td bk-table-cell fit-content="true">
 							<bk-popover>
 								<bk-popover-control>
-									<bk-button compact="true" glyph="sap-icon--overflow" state="transparent" aria-label="{{'codbex-invoices:aria.tableRowMenuBtn' | t}}" ng-click="setTristate()"></bk-button>
+									<bk-button compact="true" glyph="sap-icon--overflow" state="transparent" aria-label="{{'codbex-invoices:codbex-invoices-model.aria.tableRowMenuBtn' | t}}" ng-click="setTristate()"></bk-button>
 								</bk-popover-control>
 								<bk-popover-body align="bottom-right">
-									<bk-menu aria-label="{{'codbex-invoices:aria.tableRowMenu' | t}}" no-backdrop="true" no-shadow="true">
+									<bk-menu aria-label="{{'codbex-invoices:codbex-invoices-model.aria.tableRowMenu' | t}}" no-backdrop="true" no-shadow="true">
 										<bk-menu-item ng-repeat="action in entityActions track by $index" title="{{action.translation.key | t:action.translation.options:action.label}}" ng-click="triggerEntityAction(action)"></bk-menu-item>
-										<bk-menu-item title="{{ 'codbex-invoices:defaults.viewDetails' | t }}" ng-click="openDetails(next)"></bk-menu-item>
-										<bk-menu-item title="{{ 'codbex-invoices:defaults.edit' | t }}" ng-click="updateEntity(next)"></bk-menu-item>
-										<bk-menu-item title="{{ 'codbex-invoices:defaults.delete' | t }}" ng-click="deleteEntity(next)"></bk-menu-item>
+										<bk-menu-item title="{{ 'codbex-invoices:codbex-invoices-model.defaults.viewDetails' | t }}" ng-click="openDetails(next)"></bk-menu-item>
+										<bk-menu-item title="{{ 'codbex-invoices:codbex-invoices-model.defaults.edit' | t }}" ng-click="updateEntity(next)"></bk-menu-item>
+										<bk-menu-item title="{{ 'codbex-invoices:codbex-invoices-model.defaults.delete' | t }}" ng-click="deleteEntity(next)"></bk-menu-item>
 									</bk-menu>
 								</bk-popover-body>
 							</bk-popover>
diff --git a/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceStatus/view.js b/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceStatus/view.js
index 782f104..f444123 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceStatus/view.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceStatus/view.js
@@ -7,7 +7,7 @@ const viewData = {
     id: 'SalesInvoiceStatus',
     label: 'SalesInvoiceStatus',
     translation: {
-        key: 'codbex-invoices:t.SALESINVOICESTATUS',
+        key: 'codbex-invoices:codbex-invoices-model.t.SALESINVOICESTATUS',
     },
     region: 'center',
     lazyLoad: true,
diff --git a/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceType/controller.js b/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceType/controller.js
index 9430b07..f2b89e0 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceType/controller.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceType/controller.js
@@ -12,10 +12,10 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 		};
 
 		LocaleService.onInit(() => {
-			translated.yes = LocaleService.t('codbex-invoices:defaults.yes');
-			translated.no = LocaleService.t('codbex-invoices:defaults.no');
-			translated.deleteTitle = LocaleService.t('codbex-invoices:defaults.deleteTitle', { name: '$t(codbex-invoices:t.SALESINVOICETYPE)' });
-			translated.deleteConfirm = LocaleService.t('codbex-invoices:messages.deleteConfirm', { name: '$t(codbex-invoices:t.SALESINVOICETYPE)' });
+			translated.yes = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.yes');
+			translated.no = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.no');
+			translated.deleteTitle = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.deleteTitle', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICETYPE)' });
+			translated.deleteConfirm = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.deleteConfirm', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICETYPE)' });
 		});
 
 		$scope.dataPage = 1;
@@ -98,8 +98,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 				}, (error) => {
 					const message = error.data ? error.data.message : '';
 					Dialogs.showAlert({
-						title: LocaleService.t('codbex-invoices:t.SALESINVOICETYPE'),
-						message: LocaleService.t('codbex-invoices:messages.error.unableToLF', { name: '$t(codbex-invoices:t.SALESINVOICETYPE)', message: message }),
+						title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.SALESINVOICETYPE'),
+						message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToLF', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICETYPE)', message: message }),
 						type: AlertTypes.Error
 					});
 					console.error('EntityService:', error);
@@ -107,8 +107,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			}, (error) => {
 				const message = error.data ? error.data.message : '';
 				Dialogs.showAlert({
-					title: LocaleService.t('codbex-invoices:t.SALESINVOICETYPE'),
-					message: LocaleService.t('codbex-invoices:messages.error.unableToCount', { name: '$t(codbex-invoices:t.SALESINVOICETYPE)', message: message }),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.SALESINVOICETYPE'),
+					message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToCount', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICETYPE)', message: message }),
 					type: AlertTypes.Error
 				});
 				console.error('EntityService:', error);
@@ -186,8 +186,8 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 					}, (error) => {
 						const message = error.data ? error.data.message : '';
 						Dialogs.showAlert({
-							title: LocaleService.t('codbex-invoices:t.SALESINVOICETYPE'),
-							message: LocaleService.t('codbex-invoices:messages.error.unableToDelete', { name: '$t(codbex-invoices:t.SALESINVOICETYPE)', message: message }),
+							title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.SALESINVOICETYPE'),
+							message: LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToDelete', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICETYPE)', message: message }),
 							type: AlertTypes.Error
 						});
 						console.error('EntityService:', error);
diff --git a/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceType/dialog-filter/controller.js b/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceType/dialog-filter/controller.js
index cfcbb41..b869d1a 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceType/dialog-filter/controller.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceType/dialog-filter/controller.js
@@ -7,7 +7,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale']).controlle
 	};
 
 	LocaleService.onInit(() => {
-		description = LocaleService.t('codbex-invoices:defaults.description');
+		description = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.description');
 	});
 
 	let params = ViewParameters.get();
diff --git a/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceType/dialog-filter/index.html b/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceType/dialog-filter/index.html
index d77391b..edc58ea 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceType/dialog-filter/index.html
+++ b/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceType/dialog-filter/index.html
@@ -17,36 +17,36 @@
             <bk-message-strip class="fd-margin--md" ng-show="errorMessage" glyph="sap-icon--message-error" state="error" on-dismiss="clearErrorMessage()">{{ errorMessage }}</bk-message-strip>
 
             <bk-fieldset class="fd-padding-begin-end--sm" ng-form="forms.details">
-                <bk-form-group label="{{ 'codbex-invoices:defaults.formGrpFilter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICETYPE)'} }}" name="entityForm" transclude-classes="fd-container fd-form-layout-grid-container">
+                <bk-form-group label="{{ 'codbex-invoices:codbex-invoices-model.defaults.formGrpFilter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICETYPE)'} }}" name="entityForm" transclude-classes="fd-container fd-form-layout-grid-container">
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idName" colon="true">{{ 'codbex-invoices:t.SALESINVOICETYPE_NAME' | t }}</bk-form-label>
+                        	<bk-form-label for="idName" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICETYPE_NAME' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--8">
-							<bk-form-input-message state="{{ forms.details['Name'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:messages.error.incorrectInput' | t}}">
+							<bk-form-input-message state="{{ forms.details['Name'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:codbex-invoices-model.messages.error.incorrectInput' | t}}">
 								<bk-input id="idName"
 	                                name="Name"
 	                                state="{{ forms.details['Name'].$valid ? '' : 'error' }}"
 	                                ng-model="entity.Name"
 									ng-maxlength="20.0"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICETYPE_NAME)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICETYPE_NAME)'} }}">
 	                            </bk-input>
 							</bk-form-input-message>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idDirection" colon="true">{{ 'codbex-invoices:t.SALESINVOICETYPE_DIRECTION' | t }}</bk-form-label>
+                        	<bk-form-label for="idDirection" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICETYPE_DIRECTION' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--8">
-							<bk-form-input-message state="{{ forms.details['Direction'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:messages.error.incorrectInput' | t}}">
+							<bk-form-input-message state="{{ forms.details['Direction'].$valid ? '' : 'error' }}" text="{{'codbex-invoices:codbex-invoices-model.messages.error.incorrectInput' | t}}">
 								<bk-input id="idDirection"
 	                                name="Direction"
 	                                state="{{ forms.details['Direction'].$valid ? '' : 'error' }}"
 	                                ng-model="entity.Direction"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICETYPE_DIRECTION)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICETYPE_DIRECTION)'} }}">
 	                            </bk-input>
 							</bk-form-input-message>
 	                    </div>
@@ -58,13 +58,13 @@
 		<bk-bar bar-design="footer" compact="true" ng-show="action !== 'select'">
 			<bk-bar-right>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.filter' | t }}" state="emphasized" ng-click="filter()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.filter' | t }}" state="emphasized" ng-click="filter()"></bk-button>
 				</bk-bar-element>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.reset' | t }}" ng-click="resetFilter()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.reset' | t }}" ng-click="resetFilter()"></bk-button>
 				</bk-bar-element>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
 				</bk-bar-element>
 			</bk-bar-right>
 		</bk-bar>
diff --git a/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceType/dialog-filter/view.js b/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceType/dialog-filter/view.js
index b4b5a90..050b918 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceType/dialog-filter/view.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceType/dialog-filter/view.js
@@ -7,9 +7,9 @@ const viewData = {
     id: 'SalesInvoiceType-filter',
     label: 'SalesInvoiceType Filter',
     translation: {
-        key: 'codbex-invoices:extName',
+        key: 'codbex-invoices:codbex-invoices-model.extName',
         options: {
-            content: '$t(codbex-invoices:t.SALESINVOICETYPE) $t(codbex-invoices:defaults.filter)',
+            content: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICETYPE) $t(codbex-invoices:codbex-invoices-model.defaults.filter)',
         }
     },
     path: '/services/web/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceType/dialog-filter/index.html',
diff --git a/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceType/dialog-window/controller.js b/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceType/dialog-window/controller.js
index 2fe609c..f88786c 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceType/dialog-window/controller.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceType/dialog-window/controller.js
@@ -21,12 +21,12 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 		$scope.action = 'select';
 
 		LocaleService.onInit(() => {
-			description = LocaleService.t('codbex-invoices:defaults.description');
-			$scope.formHeaders.select = LocaleService.t('codbex-invoices:defaults.formHeadSelect', { name: '$t(codbex-invoices:t.SALESINVOICETYPE)' });
-			$scope.formHeaders.create = LocaleService.t('codbex-invoices:defaults.formHeadCreate', { name: '$t(codbex-invoices:t.SALESINVOICETYPE)' });
-			$scope.formHeaders.update = LocaleService.t('codbex-invoices:defaults.formHeadUpdate', { name: '$t(codbex-invoices:t.SALESINVOICETYPE)' });
-			propertySuccessfullyCreated = LocaleService.t('codbex-invoices:messages.propertySuccessfullyCreated', { name: '$t(codbex-invoices:t.SALESINVOICETYPE)' });
-			propertySuccessfullyUpdated = LocaleService.t('codbex-invoices:messages.propertySuccessfullyUpdated', { name: '$t(codbex-invoices:t.SALESINVOICETYPE)' });
+			description = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.description');
+			$scope.formHeaders.select = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.formHeadSelect', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICETYPE)' });
+			$scope.formHeaders.create = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.formHeadCreate', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICETYPE)' });
+			$scope.formHeaders.update = LocaleService.t('codbex-invoices:codbex-invoices-model.defaults.formHeadUpdate', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICETYPE)' });
+			propertySuccessfullyCreated = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.propertySuccessfullyCreated', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICETYPE)' });
+			propertySuccessfullyUpdated = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.propertySuccessfullyUpdated', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICETYPE)' });
 		});
 
 		let params = ViewParameters.get();
@@ -43,7 +43,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			EntityService.create(entity).then((response) => {
 				Dialogs.postMessage({ topic: 'codbex-invoices.Settings.SalesInvoiceType.entityCreated', data: response.data });
 				Notifications.show({
-					title: LocaleService.t('codbex-invoices:t.SALESINVOICETYPE'),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.SALESINVOICETYPE'),
 					description: propertySuccessfullyCreated,
 					type: 'positive'
 				});
@@ -51,7 +51,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			}, (error) => {
 				const message = error.data ? error.data.message : '';
 				$scope.$evalAsync(() => {
-					$scope.errorMessage = LocaleService.t('codbex-invoices:messages.error.unableToCreate', { name: '$t(codbex-invoices:t.SALESINVOICETYPE)', message: message });
+					$scope.errorMessage = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToCreate', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICETYPE)', message: message });
 				});
 				console.error('EntityService:', error);
 			});
@@ -64,7 +64,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			EntityService.update(id, entity).then((response) => {
 				Dialogs.postMessage({ topic: 'codbex-invoices.Settings.SalesInvoiceType.entityUpdated', data: response.data });
 				Notifications.show({
-					title: LocaleService.t('codbex-invoices:t.SALESINVOICETYPE'),
+					title: LocaleService.t('codbex-invoices:codbex-invoices-model.t.SALESINVOICETYPE'),
 					description: propertySuccessfullyUpdated,
 					type: 'positive'
 				});
@@ -72,7 +72,7 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale', 'EntitySer
 			}, (error) => {
 				const message = error.data ? error.data.message : '';
 				$scope.$evalAsync(() => {
-					$scope.errorMessage = LocaleService.t('codbex-invoices:messages.error.unableToUpdate', { name: '$t(codbex-invoices:t.SALESINVOICETYPE)', message: message });
+					$scope.errorMessage = LocaleService.t('codbex-invoices:codbex-invoices-model.messages.error.unableToUpdate', { name: '$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICETYPE)', message: message });
 				});
 				console.error('EntityService:', error);
 			});
diff --git a/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceType/dialog-window/index.html b/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceType/dialog-window/index.html
index 60b7a47..4889d8d 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceType/dialog-window/index.html
+++ b/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceType/dialog-window/index.html
@@ -21,10 +21,10 @@
                 <bk-form-group label="{{formHeaders[action]}}" name="entityForm" transclude-classes="fd-container fd-form-layout-grid-container">
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idName" ng-required="true" colon="true">{{ 'codbex-invoices:t.SALESINVOICETYPE_NAME' | t }}</bk-form-label>
+                        	<bk-form-label for="idName" ng-required="true" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICETYPE_NAME' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
-							<bk-form-input-message state="{{ forms.details['Name'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:messages.error.pattern' | t:{'rule':''} }}">
+							<bk-form-input-message state="{{ forms.details['Name'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:codbex-invoices-model.messages.error.pattern' | t:{'rule':''} }}">
 								<bk-input id="idName"
 	                                name="Name"
 	                                state="{{ forms.details['Name'].$valid ? '' : 'error' }}"
@@ -34,17 +34,17 @@
 									ng-maxlength="20.0"
 	                                input-rules="{ patterns: [''] }"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICETYPE_NAME)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICETYPE_NAME)'} }}">
 	                            </bk-input>
 							</bk-form-input-message>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idDirection" ng-required="true" colon="true">{{ 'codbex-invoices:t.SALESINVOICETYPE_DIRECTION' | t }}</bk-form-label>
+                        	<bk-form-label for="idDirection" ng-required="true" colon="true">{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICETYPE_DIRECTION' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
-							<bk-form-input-message state="{{ forms.details['Direction'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:messages.error.pattern' | t:{'rule':''} }}">
+							<bk-form-input-message state="{{ forms.details['Direction'].$valid ? '' : 'error' }}" text="{{ 'codbex-invoices:codbex-invoices-model.messages.error.pattern' | t:{'rule':''} }}">
 								<bk-input id="idDirection"
 	                                name="Direction"
 	                                state="{{ forms.details['Direction'].$valid ? '' : 'error' }}"
@@ -53,7 +53,7 @@
 	                                ng-readonly="action === 'select'"
 	                                input-rules="{ patterns: [''] }"
 	                                type="text"
-	                                placeholder="{{ 'codbex-invoices:messages.inputEnter' | t:{'name':'$t(codbex-invoices:t.SALESINVOICETYPE_DIRECTION)'} }}">
+	                                placeholder="{{ 'codbex-invoices:codbex-invoices-model.messages.inputEnter' | t:{'name':'$t(codbex-invoices:codbex-invoices-model.t.SALESINVOICETYPE_DIRECTION)'} }}">
 	                            </bk-input>
 							</bk-form-input-message>
 	                    </div>
@@ -65,11 +65,11 @@
 		<bk-bar bar-design="footer" compact="true" ng-show="action !== 'select'">
 			<bk-bar-right>
 				<bk-bar-element>
-					<bk-button ng-if="action === 'create'" label="{{'codbex-invoices:defaults.create' | t}}" state="emphasized" ng-click="create()" ng-disabled="!forms.details.$valid"></bk-button>
-					<bk-button ng-if="action !== 'create'" label="{{'codbex-invoices:defaults.update' | t}}" state="emphasized" ng-click="update()" ng-disabled="!forms.details.$valid"></bk-button>
+					<bk-button ng-if="action === 'create'" label="{{'codbex-invoices:codbex-invoices-model.defaults.create' | t}}" state="emphasized" ng-click="create()" ng-disabled="!forms.details.$valid"></bk-button>
+					<bk-button ng-if="action !== 'create'" label="{{'codbex-invoices:codbex-invoices-model.defaults.update' | t}}" state="emphasized" ng-click="update()" ng-disabled="!forms.details.$valid"></bk-button>
 				</bk-bar-element>
 				<bk-bar-element>
-					<bk-button label="{{ 'codbex-invoices:defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
+					<bk-button label="{{ 'codbex-invoices:codbex-invoices-model.defaults.cancel' | t }}" ng-click="cancel()"></bk-button>
 				</bk-bar-element>
 			</bk-bar-right>
 		</bk-bar>
diff --git a/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceType/dialog-window/view.js b/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceType/dialog-window/view.js
index 5d879fd..be51c8b 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceType/dialog-window/view.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceType/dialog-window/view.js
@@ -7,7 +7,7 @@ const viewData = {
     id: 'SalesInvoiceType-details',
     label: 'SalesInvoiceType',
     translation: {
-        key: 'codbex-invoices:t.SALESINVOICETYPE',
+        key: 'codbex-invoices:codbex-invoices-model.t.SALESINVOICETYPE',
     },
     path: '/services/web/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceType/dialog-window/index.html',
     perspectiveName: 'Settings'
diff --git a/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceType/index.html b/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceType/index.html
index 966cb7a..c3f5b23 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceType/index.html
+++ b/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceType/index.html
@@ -15,25 +15,25 @@
 
 	<body class="bk-vbox">
 		<bk-toolbar has-title="true">
-			<bk-toolbar-title>{{'codbex-invoices:defaults.items' | t}} <span bk-object-status text="{{dataCount}}" inverted="true"></bk-toolbar-title>
-			<bk-button compact="true" state="transparent" label="{{ 'codbex-invoices:defaults.filter' | t }}" ng-click="openFilter()"></bk-button>
+			<bk-toolbar-title>{{'codbex-invoices:codbex-invoices-model.defaults.items' | t}} <span bk-object-status text="{{dataCount}}" inverted="true"></bk-toolbar-title>
+			<bk-button compact="true" state="transparent" label="{{ 'codbex-invoices:codbex-invoices-model.defaults.filter' | t }}" ng-click="openFilter()"></bk-button>
 			<bk-button ng-repeat="action in pageActions track by $index" compact="true" state="transparent" label="{{action.translation.key | t:action.translation.options:action.label}}" ng-click="triggerPageAction(action)"></bk-button>
 			<bk-toolbar-spacer></bk-toolbar-spacer>
-			<bk-button compact="true" state="emphasized" label="{{'codbex-invoices:defaults.create' | t}}" ng-click="createEntity()"></bk-button>
+			<bk-button compact="true" state="emphasized" label="{{'codbex-invoices:codbex-invoices-model.defaults.create' | t}}" ng-click="createEntity()"></bk-button>
 		</bk-toolbar>
 
 		<bk-scrollbar class="bk-full-height" ng-hide="data == null">
 			<table bk-table display-mode="compact" inner-borders="top" outer-borders="none">
 				<thead bk-table-header sticky="true">
 					<tr bk-table-row>
-						<th bk-table-header-cell>{{ 'codbex-invoices:t.SALESINVOICETYPE_NAME' | t:'Name' }}</th>
-						<th bk-table-header-cell>{{ 'codbex-invoices:t.SALESINVOICETYPE_DIRECTION' | t:'Direction' }}</th>
+						<th bk-table-header-cell>{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICETYPE_NAME' | t:'Name' }}</th>
+						<th bk-table-header-cell>{{ 'codbex-invoices:codbex-invoices-model.t.SALESINVOICETYPE_DIRECTION' | t:'Direction' }}</th>
 						<th bk-table-header-cell></th>
 					</tr>
 				</thead>
 				<tbody bk-table-body>
 					<tr bk-table-row hoverable="true" ng-show="data.length == 0">
-						<td bk-table-cell no-data="true">{{'codbex-invoices:messages.noData' | t}}</td>
+						<td bk-table-cell no-data="true">{{'codbex-invoices:codbex-invoices-model.messages.noData' | t}}</td>
 					</tr>
 					<tr bk-table-row hoverable="true" ng-repeat="next in data track by $index"
 						selected="next.Id === selectedEntity.Id" ng-click="selectEntity(next)">
@@ -42,14 +42,14 @@
 						<td bk-table-cell fit-content="true">
 							<bk-popover>
 								<bk-popover-control>
-									<bk-button compact="true" glyph="sap-icon--overflow" state="transparent" aria-label="{{'codbex-invoices:aria.tableRowMenuBtn' | t}}" ng-click="setTristate()"></bk-button>
+									<bk-button compact="true" glyph="sap-icon--overflow" state="transparent" aria-label="{{'codbex-invoices:codbex-invoices-model.aria.tableRowMenuBtn' | t}}" ng-click="setTristate()"></bk-button>
 								</bk-popover-control>
 								<bk-popover-body align="bottom-right">
-									<bk-menu aria-label="{{'codbex-invoices:aria.tableRowMenu' | t}}" no-backdrop="true" no-shadow="true">
+									<bk-menu aria-label="{{'codbex-invoices:codbex-invoices-model.aria.tableRowMenu' | t}}" no-backdrop="true" no-shadow="true">
 										<bk-menu-item ng-repeat="action in entityActions track by $index" title="{{action.translation.key | t:action.translation.options:action.label}}" ng-click="triggerEntityAction(action)"></bk-menu-item>
-										<bk-menu-item title="{{ 'codbex-invoices:defaults.viewDetails' | t }}" ng-click="openDetails(next)"></bk-menu-item>
-										<bk-menu-item title="{{ 'codbex-invoices:defaults.edit' | t }}" ng-click="updateEntity(next)"></bk-menu-item>
-										<bk-menu-item title="{{ 'codbex-invoices:defaults.delete' | t }}" ng-click="deleteEntity(next)"></bk-menu-item>
+										<bk-menu-item title="{{ 'codbex-invoices:codbex-invoices-model.defaults.viewDetails' | t }}" ng-click="openDetails(next)"></bk-menu-item>
+										<bk-menu-item title="{{ 'codbex-invoices:codbex-invoices-model.defaults.edit' | t }}" ng-click="updateEntity(next)"></bk-menu-item>
+										<bk-menu-item title="{{ 'codbex-invoices:codbex-invoices-model.defaults.delete' | t }}" ng-click="deleteEntity(next)"></bk-menu-item>
 									</bk-menu>
 								</bk-popover-body>
 							</bk-popover>
diff --git a/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceType/view.js b/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceType/view.js
index a2ee612..ea92d3b 100644
--- a/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceType/view.js
+++ b/codbex-invoices/gen/codbex-invoices/ui/Settings/SalesInvoiceType/view.js
@@ -7,7 +7,7 @@ const viewData = {
     id: 'SalesInvoiceType',
     label: 'SalesInvoiceType',
     translation: {
-        key: 'codbex-invoices:t.SALESINVOICETYPE',
+        key: 'codbex-invoices:codbex-invoices-model.t.SALESINVOICETYPE',
     },
     region: 'center',
     lazyLoad: true,
diff --git a/codbex-invoices/translations/en-US/codbex-invoices.model.json b/codbex-invoices/translations/en-US/codbex-invoices.model.json
new file mode 100644
index 0000000..d70c521
--- /dev/null
+++ b/codbex-invoices/translations/en-US/codbex-invoices.model.json
@@ -0,0 +1,300 @@
+{
+  "codbex-invoices-model": {
+    "aria": {
+      "showHide": "show/hide {{name}} options",
+      "options": "{{name}} options",
+      "tableRowMenu": "Table Row Menu",
+      "tableRowMenuBtn": "Table Row Menu Button",
+      "headerMenu": "Header Menu",
+      "headerMenuBtn": "Header Menu Button",
+      "addEntity": "add entity",
+      "editEntity": "edit entity",
+      "deleteEntity": "delete entity"
+    },
+    "state": {
+      "busy": "Loading..."
+    },
+    "messages": {
+      "error": {
+        "incorrectInput": "Incorrect Input",
+        "loading": "Encounterd an error while loading",
+        "unableToCreate": "Unable to create {{name}}: '{{message}}'",
+        "unableToUpdate": "Unable to update {{name}}: '{{message}}'",
+        "unableToDelete": "Unable to delete {{name}}: '{{message}}'",
+        "unableToLoad": "Unable to load data: '{{message}}'",
+        "unableToLF": "Unable to list/filter {{name}}: '{{message}}'",
+        "unableToCount": "Unable to count {{name}}: '{{message}}'",
+        "pattern": "The value doesn't match the required pattern: {{rule}}"
+      },
+      "propertySuccessfullyCreated": "{{name}} successfully created",
+      "propertySuccessfullyUpdated": "{{name}} successfully updated",
+      "inputSearch": "Search {{name}}...",
+      "inputEnter": "Enter {{name}}...",
+      "noData": "No data available.",
+      "deleteConfirm": "Are you sure you want to delete {{name}}? This action cannot be undone.",
+      "detailSelectRecord": "Select a record to get a list of it's details."
+    },
+    "defaults": {
+      "yes": "Yes",
+      "no": "No",
+      "add": "Add",
+      "refresh": "Refresh",
+      "to": "To {{text}}",
+      "from": "From {{text}}",
+      "filter": "Filter",
+      "print": "Print",
+      "reset": "Reset",
+      "create": "Create",
+      "edit": "Edit",
+      "update": "Update",
+      "delete": "Delete",
+      "cancel": "Cancel",
+      "items": "Items",
+      "description": "Description",
+      "formGrpFilter": "{{name}} Filter",
+      "formHeadSelect": "{{name}} Details",
+      "formHeadCreate": "Create {{name}}",
+      "formHeadUpdate": "Update {{name}}",
+      "reportTitle": "{{name}} Report",
+      "reportFilter": "Report Filter",
+      "viewDetails": "View Details",
+      "deleteTitle": "Delete {{name}}?",
+      "loadMore": "Load More..."
+    },
+    "extName": "{{content}}",
+    "t": {
+      "SALESINVOICEITEM": "SalesInvoiceItem",
+      "SALESINVOICEITEM_ID": "Id",
+      "SALESINVOICEITEM_SALESINVOICE": "SalesInvoice",
+      "SALESINVOICEITEM_NAME": "Name",
+      "SALESINVOICEITEM_QUANTITY": "Quantity",
+      "SALESINVOICEITEM_UOM": "UoM",
+      "SALESINVOICEITEM_PRICE": "Price",
+      "SALESINVOICEITEM_NET": "Net",
+      "SALESINVOICEITEM_VATRATE": "VATRate",
+      "SALESINVOICEITEM_VAT": "VAT",
+      "SALESINVOICEITEM_GROSS": "Gross",
+      "SALESINVOICE": "SalesInvoice",
+      "SALESINVOICE_ID": "Id",
+      "SALESINVOICE_NUMBER": "Number",
+      "SALESINVOICE_TYPE": "Type",
+      "SALESINVOICE_CUSTOMER": "Customer",
+      "SALESINVOICE_DATE": "Date",
+      "SALESINVOICE_DUE": "Due",
+      "SALESINVOICE_NET": "Net",
+      "SALESINVOICE_CURRENCY": "Currency",
+      "SALESINVOICE_GROSS": "Gross",
+      "SALESINVOICE_DISCOUNT": "Discount",
+      "SALESINVOICE_TAXES": "Taxes",
+      "SALESINVOICE_VAT": "VAT",
+      "SALESINVOICE_TOTAL": "Total",
+      "SALESINVOICE_PAID": "Paid",
+      "SALESINVOICE_CONDITIONS": "Conditions",
+      "SALESINVOICE_PAYMENTMETHOD": "PaymentMethod",
+      "SALESINVOICE_SENTMETHOD": "SentMethod",
+      "SALESINVOICE_STATUS": "Status",
+      "SALESINVOICE_OPERATOR": "Operator",
+      "SALESINVOICE_DOCUMENT": "Document",
+      "SALESINVOICE_COMPANY": "Company",
+      "SALESINVOICE_NAME": "Name",
+      "SALESINVOICE_UUID": "UUID",
+      "SALESINVOICE_PROCESS": "Process",
+      "SALESINVOICE_REFERENCE": "Reference",
+      "PURCHASEINVOICE": "PurchaseInvoice",
+      "PURCHASEINVOICE_ID": "Id",
+      "PURCHASEINVOICE_NUMBER": "Number",
+      "PURCHASEINVOICE_ORIGINALNUMBER": "OriginalNumber",
+      "PURCHASEINVOICE_PURCHASEINVOICETYPE": "Type",
+      "PURCHASEINVOICE_DATE": "Date",
+      "PURCHASEINVOICE_DUE": "Due",
+      "PURCHASEINVOICE_SUPPLIER": "Supplier",
+      "PURCHASEINVOICE_NET": "Net",
+      "PURCHASEINVOICE_CURRENCY": "Currency",
+      "PURCHASEINVOICE_GROSS": "Gross",
+      "PURCHASEINVOICE_DISCOUNT": "Discount",
+      "PURCHASEINVOICE_TAXES": "Taxes",
+      "PURCHASEINVOICE_VAT": "VAT",
+      "PURCHASEINVOICE_TOTAL": "Total",
+      "PURCHASEINVOICE_PAID": "Paid",
+      "PURCHASEINVOICE_CONDITIONS": "Conditions",
+      "PURCHASEINVOICE_PAYMENTMETHOD": "PaymentMethod",
+      "PURCHASEINVOICE_SENTMETHOD": "SentMethod",
+      "PURCHASEINVOICE_STATUS": "Status",
+      "PURCHASEINVOICE_OPERATOR": "Operator",
+      "PURCHASEINVOICE_DOCUMENT": "Document",
+      "PURCHASEINVOICE_COMPANY": "Company",
+      "PURCHASEINVOICE_NAME": "Name",
+      "PURCHASEINVOICE_UUID": "UUID",
+      "PURCHASEINVOICE_PROCESS": "Process",
+      "PURCHASEINVOICE_REFERENCE": "Reference",
+      "PURCHASEINVOICEITEM": "PurchaseInvoiceItem",
+      "PURCHASEINVOICEITEM_ID": "Id",
+      "PURCHASEINVOICEITEM_PURCHASEINVOICE": "PurchaseInvoice",
+      "PURCHASEINVOICEITEM_NAME": "Name",
+      "PURCHASEINVOICEITEM_QUANTITY": "Quantity",
+      "PURCHASEINVOICEITEM_UOM": "UoM",
+      "PURCHASEINVOICEITEM_PRICE": "Price",
+      "PURCHASEINVOICEITEM_NET": "Net",
+      "PURCHASEINVOICEITEM_VATRATE": "VATRate",
+      "PURCHASEINVOICEITEM_VAT": "VAT",
+      "PURCHASEINVOICEITEM_GROSS": "Gross",
+      "SALESINVOICESTATUS": "SalesInvoiceStatus",
+      "SALESINVOICESTATUS_ID": "Id",
+      "SALESINVOICESTATUS_NAME": "Name",
+      "PURCHASEINVOICESTATUS": "PurchaseInvoiceStatus",
+      "PURCHASEINVOICESTATUS_ID": "Id",
+      "PURCHASEINVOICESTATUS_NAME": "Name",
+      "CUSTOMER": "Customer",
+      "CUSTOMER_ID": "Id",
+      "CUSTOMER_NAME": "Name",
+      "CUSTOMER_ADDRESS": "Address",
+      "CUSTOMER_POSTALCODE": "PostalCode",
+      "CUSTOMER_EMAIL": "Email",
+      "CUSTOMER_PHONE": "Phone",
+      "CUSTOMER_FAX": "Fax",
+      "CUSTOMER_CITY": "City",
+      "CUSTOMER_COUNTRYID": "Country",
+      "CUSTOMER_TIN": "TIN",
+      "CUSTOMER_IBAN": "IBAN",
+      "SUPPLIER": "Supplier",
+      "SUPPLIER_ID": "Id",
+      "SUPPLIER_NAME": "Name",
+      "SUPPLIER_ADDRESS": "Address",
+      "SUPPLIER_POSTALCODE": "PostalCode",
+      "SUPPLIER_EMAIL": "Email",
+      "SUPPLIER_PHONE": "Phone",
+      "SUPPLIER_FAX": "Fax",
+      "SUPPLIER_CITY": "City",
+      "SUPPLIER_COUNTRY": "Country",
+      "SUPPLIER_TIN": "TIN",
+      "SUPPLIER_IBAN": "IBAN",
+      "COMPANY": "Company",
+      "COMPANY_ID": "Id",
+      "COMPANY_NAME": "Name",
+      "COMPANY_MANAGER": "Manager",
+      "COMPANY_EMAIL": "Email",
+      "COMPANY_PHONE": "Phone",
+      "COMPANY_ADDRESS": "Address",
+      "COMPANY_POSTCODE": "PostCode",
+      "COMPANY_CITY": "City",
+      "COMPANY_COUNTRY": "Country",
+      "COMPANY_TIN": "TIN",
+      "COMPANY_IBAN": "IBAN",
+      "CURRENCY": "Currency",
+      "CURRENCY_ID": "Id",
+      "CURRENCY_CODE": "Code",
+      "CURRENCY_NAME": "Name",
+      "CURRENCY_NUMERIC": "Numeric",
+      "CURRENCY_ROUNDING": "Rounding",
+      "CURRENCY_BASE": "Base",
+      "CURRENCY_RATE": "Rate",
+      "EMPLOYEE": "Employee",
+      "EMPLOYEE_ID": "Id",
+      "EMPLOYEE_FIRSTNAME": "First Name",
+      "EMPLOYEE_MIDDLENAME": "Middle Name",
+      "EMPLOYEE_LASTNAME": "Last Name",
+      "EMPLOYEE_EMAIL": "e-mail",
+      "EMPLOYEE_PHONE": "Phone",
+      "EMPLOYEE_ORGANISATION": "Organisation",
+      "EMPLOYEE_NAME": "Name",
+      "SALESINVOICEPAYMENT": "SalesInvoicePayment",
+      "SALESINVOICEPAYMENT_ID": "Id",
+      "SALESINVOICEPAYMENT_SALESINVOICE": "SalesInvoice",
+      "SALESINVOICEPAYMENT_CUSTOMERPAYMENT": "CustomerPayment",
+      "SALESINVOICEPAYMENT_AMOUNT": "Amount",
+      "PURCHASEINVOICEPAYMENT": "PurchaseInvoicePayment",
+      "PURCHASEINVOICEPAYMENT_ID": "Id",
+      "PURCHASEINVOICEPAYMENT_PURCHASEINVOICE": "PurchaseInvoice",
+      "PURCHASEINVOICEPAYMENT_SUPPLIERPAYMENT": "SupplierPayment",
+      "PURCHASEINVOICEPAYMENT_AMOUNT": "Amount",
+      "UOM": "UoM",
+      "UOM_ID": "Id",
+      "UOM_NAME": "Name",
+      "UOM_ISO": "ISO",
+      "UOM_SAP": "SAP",
+      "UOM_DIMENSION": "Dimension",
+      "UOM_NUMERATOR": "Numerator",
+      "UOM_DENOMINATOR": "Denominator",
+      "UOM_ROUNDING": "Rounding",
+      "UOM_BASE": "Base",
+      "SALESINVOICETYPE": "SalesInvoiceType",
+      "SALESINVOICETYPE_ID": "Id",
+      "SALESINVOICETYPE_NAME": "Name",
+      "SALESINVOICETYPE_DIRECTION": "Direction",
+      "SALESORDER": "SalesOrder",
+      "SALESORDER_ID": "Id",
+      "SALESORDER_NUMBER": "Number",
+      "SALESORDER_DATE": "Date",
+      "SALESORDER_DUE": "Due",
+      "SALESORDER_CUSTOMER": "Customer",
+      "SALESORDER_NET": "Net",
+      "SALESORDER_CURRENCY": "Currency",
+      "SALESORDER_GROSS": "Gross",
+      "SALESORDER_DISCOUNT": "Discount",
+      "SALESORDER_TAXES": "Taxes",
+      "SALESORDER_VAT": "VAT",
+      "SALESORDER_TOTAL": "Total",
+      "SALESORDER_PAID": "Paid",
+      "SALESORDER_CONDITIONS": "Conditions",
+      "SALESORDER_SENTMETHOD": "SentMethod",
+      "SALESORDER_SALESORDERSTATUS": "SalesOrderStatus",
+      "SALESORDER_OPERATOR": "Operator",
+      "SALESORDER_COMPANY": "Company",
+      "SALESORDER_NAME": "Name",
+      "SALESORDER_UUID": "UUID",
+      "SALESORDER_REFERENCE": "Reference",
+      "SALESORDER_STORE": "Store",
+      "DEDUCTION": "Deduction",
+      "DEDUCTION_ID": "Id",
+      "DEDUCTION_DEDUCTIONINVOICE": "DeductionInvoice",
+      "DEDUCTION_ADVANCEINVOICE": "AdvanceInvoice",
+      "PURCHASEINVOICETYPE": "PurchaseInvoiceType",
+      "PURCHASEINVOICETYPE_ID": "Id",
+      "PURCHASEINVOICETYPE_NAME": "Name",
+      "PURCHASEINVOICETYPE_DIRECTION": "Direction",
+      "PAYMENTMETHOD": "PaymentMethod",
+      "PAYMENTMETHOD_ID": "Id",
+      "PAYMENTMETHOD_NAME": "Name",
+      "SENTMETHOD": "SentMethod",
+      "SENTMETHOD_ID": "Id",
+      "SENTMETHOD_NAME": "Name",
+      "CUSTOMERPAYMENT": "CustomerPayment",
+      "CUSTOMERPAYMENT_ID": "Id",
+      "CUSTOMERPAYMENT_CUSTOMER": "Customer",
+      "CUSTOMERPAYMENT_DATE": "Date",
+      "CUSTOMERPAYMENT_VALOR": "Valor",
+      "CUSTOMERPAYMENT_COMPANYIBAN": "CompanyIBAN",
+      "CUSTOMERPAYMENT_COUNTERPARTYIBAN": "CounterpartyIBAN",
+      "CUSTOMERPAYMENT_COUNTERPARTYNAME": "CounterpartyName",
+      "CUSTOMERPAYMENT_AMOUNT": "Amount",
+      "CUSTOMERPAYMENT_CURRENCY": "Currency",
+      "CUSTOMERPAYMENT_REASON": "Reason",
+      "CUSTOMERPAYMENT_DESCRIPTION": "Description",
+      "CUSTOMERPAYMENT_COMPANY": "Company",
+      "CUSTOMERPAYMENT_NAME": "Name",
+      "CUSTOMERPAYMENT_UUID": "UUID",
+      "CUSTOMERPAYMENT_REFERENCE": "Reference",
+      "CUSTOMERPAYMENT_PAYMENTMETHOD": "PaymentMethod",
+      "SUPPLIERPAYMENT": "SupplierPayment",
+      "SUPPLIERPAYMENT_ID": "Id",
+      "SUPPLIERPAYMENT_SUPPLIER": "Supplier",
+      "SUPPLIERPAYMENT_DATE": "Date",
+      "SUPPLIERPAYMENT_VALOR": "Valor",
+      "SUPPLIERPAYMENT_COMPANYIBAN": "CompanyIBAN",
+      "SUPPLIERPAYMENT_COUNTERPARTYIBAN": "CounterpartyIBAN",
+      "SUPPLIERPAYMENT_COUNTERPARTYNAME": "CounterpartyName",
+      "SUPPLIERPAYMENT_AMOUNT": "Amount",
+      "SUPPLIERPAYMENT_CURRENCY": "Currency",
+      "SUPPLIERPAYMENT_REASON": "Reason",
+      "SUPPLIERPAYMENT_DESCRIPTION": "Description",
+      "SUPPLIERPAYMENT_COMPANY": "Company",
+      "SUPPLIERPAYMENT_NAME": "Name",
+      "SUPPLIERPAYMENT_UUID": "UUID",
+      "SUPPLIERPAYMENT_REFERENCE": "Reference",
+      "SalesInvoice": "SalesInvoice",
+      "PurchaseInvoice": "PurchaseInvoice",
+      "CreditNote": "CreditNote",
+      "DebitNote": "DebitNote"
+    }
+  }
+}
\ No newline at end of file