Merge pull request #176 from misdwss/MasterBillingService

added 2023-24 financial year and tax period
misdwss · Apr 3, 2023 · 1421885 · 1421885
2 parents e6d3ae6 + 8ff6f4d
commit 1421885
Show file tree

Hide file tree

Showing 2 changed files with 158 additions and 0 deletions.
diff --git a/data/pb/BillingService/TaxPeriod.json b/data/pb/BillingService/TaxPeriod.json
@@ -169,6 +169,94 @@
       "service": "EXPENSE.INCENTIVES",
       "code": "EXPENSEINCENTIVES",
       "financialYear": "2022-23"
+    },
+    {
+      "fromDate": 1680244199000,
+      "toDate": 1711866599000,
+      "periodCycle": "ANNUAL",
+      "service": "EXPENSE.ELECTRICITY_BILL",
+      "code": "EXPENSEELECTRICITY_BILL",
+      "financialYear": "2023-24"
+    },
+    {
+      "fromDate": 1680244199000,
+      "toDate": 1711866599000,
+      "periodCycle": "ANNUAL",
+      "service": "EXPENSE.SALARY",
+      "code": "EXPENSESALARY",
+      "financialYear": "2023-24"
+    },
+    {
+      "fromDate": 1680244199000,
+      "toDate": 1711866599000,
+      "periodCycle": "ANNUAL",
+      "service": "EXPENSE.MACHINERY_REPAIR",
+      "code": "EXPENSEMACHINERYREPAIR",
+      "financialYear": "2023-24"
+    },
+    {
+      "fromDate": 1680244199000,
+      "toDate": 1711866599000,
+      "periodCycle": "ANNUAL",
+      "service": "EXPENSE.OTHERS",
+      "code": "EXPENSEOTHERS",
+      "financialYear": "2023-24"
+    },
+    {
+      "fromDate": 1680244199000,
+      "toDate": 1711866599000,
+      "periodCycle": "TWOYEARS",
+      "service": "WS",
+      "code": "WC2023",
+      "financialYear": "2023-24"
+    },
+    {
+      "fromDate": 1680244199000,
+      "toDate": 1711866599000,
+      "periodCycle": "TWOYEARS",
+      "service": "EXPENSE.CHLORINATION",
+      "code": "EXPENSECHLORINATION",
+      "financialYear": "2023-24"
+    },
+    {
+      "fromDate": 1680244199000,
+      "toDate": 1711866599000,
+      "periodCycle": "TWOYEARS",
+      "service": "EXPENSE.WATER_TREATMENT",
+      "code": "EXPENSEWATERTREATMENT",
+      "financialYear": "2023-24"
+    },
+    {
+      "fromDate": 1680244199000,
+      "toDate": 1711866599000,
+      "periodCycle": "TWOYEARS",
+      "service": "EXPENSE.PIPELINE_REPAIR",
+      "code": "EXPENSEPIPELINEREPAIR",
+      "financialYear": "2023-24"
+    },
+    {
+      "fromDate": 1680244199000,
+      "toDate": 1711866599000,
+      "periodCycle": "TWOYEARS",
+      "service": "EXPENSE.NEW_MACHINERY",
+      "code": "EXPENSENEWMACHINERY",
+      "financialYear": "2023-24"
+    },
+    {
+      "fromDate": 1680244199000,
+      "toDate": 1711866599000,
+      "periodCycle": "TWOYEARS",
+      "service": "EXPENSE.NEW_PIPELINE",
+      "code": "EXPENSENEWPIPELINE",
+      "financialYear": "2023-24"
+    },
+    {
+      "fromDate": 1680244199000,
+      "toDate": 1711866599000,
+      "periodCycle": "TWOYEARS",
+      "service": "EXPENSE.INCENTIVES",
+      "code": "EXPENSEINCENTIVES",
+      "financialYear": "2023-24"
     }
   ]
 }
diff --git a/data/pb/egf-master/FinancialYear.json b/data/pb/egf-master/FinancialYear.json
@@ -2,6 +2,76 @@
   "tenantId": "pb",
   "moduleName": "egf-master",
   "FinancialYear": [
+    {
+      "id": "26",
+      "tenantId": "pb",
+      "finYearRange":  "2023-24",
+      "name":  "2023-24",
+      "code":  "2023-24",
+      "startingDate": 1680287400000,
+      "endingDate": 1711866599000,
+      "active": true,
+      "isActiveForPosting": true,
+      "isClosed": false,
+      "transferClosingBalance": false,
+      "module": "TL"
+    },
+    {
+      "id": "25",
+      "tenantId": "pb",
+      "finYearRange":  "2023-24",
+      "name":  "2023-24",
+      "code":  "2023-24",
+      "startingDate": 1680287400000,
+      "endingDate": 1711866599000,
+      "active": true,
+      "isActiveForPosting": true,
+      "isClosed": false,
+      "transferClosingBalance": false,
+      "module": "PT"
+    },
+    {
+      "id": "24",
+      "tenantId": "pb",
+      "finYearRange":  "2023-24",
+      "name":  "2023-24",
+      "code":  "2023-24",
+      "startingDate": 1680287400000,
+      "endingDate": 1711866599000,
+      "active": true,
+      "isActiveForPosting": true,
+      "isClosed": false,
+      "transferClosingBalance": false,
+      "module": "FIRENOC"
+    },
+    {
+      "id": "23",
+      "tenantId": "pb",
+      "finYearRange":  "2023-24",
+      "name":  "2023-24",
+      "code":  "2023-24",
+      "startingDate": 1680287400000,
+      "endingDate": 1711866599000,
+      "active": true,
+      "isActiveForPosting": true,
+      "isClosed": false,
+      "transferClosingBalance": false,
+      "module": "SW"
+    },
+    {
+      "id": "22",
+      "tenantId": "pb",
+      "finYearRange":  "2023-24",
+      "name":  "2023-24",
+      "code":  "2023-24",
+      "startingDate": 1680287400000,
+      "endingDate": 1711866599000,
+      "active": true,
+      "isActiveForPosting": true,
+      "isClosed": false,
+      "transferClosingBalance": false,
+      "module": "WS"
+    },
     {
       "id": "21",
       "tenantId": "pb",