Skip to content

Commit

Permalink
Merge pull request #5 from ERP-System-Contributors/wip-report
Browse files Browse the repository at this point in the history
Wip report
  • Loading branch information
ghacupha authored May 13, 2024
2 parents 4bcaa95 + 84f40a8 commit 1a046a0
Show file tree
Hide file tree
Showing 5,301 changed files with 12,411 additions and 5,346 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Erp System - Mark X No 7 (Jehoiada Series) Server ver 1.7.9
# Erp System - Mark X No 8 (Jehoiada Series) Server ver 1.8.0
# Copyright © 2021 - 2024 Edwin Njeru and the ERP System Contributors (mailnjeru@gmail.com)
#
# This program is free software: you can redistribute it and/or modify
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/github-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,12 @@ jobs:
run: ./mvnw -ntp package jib:dockerBuild -Pprod -DskipTests

- name: Publish image
run: docker push ghacupha/erp-system:1.7.9
run: docker push ghacupha/erp-system:1.8.0

- name: Build and Publish Elasticsearch image
uses: docker/build-push-action@v2
with:
context: .
file: src/main/docker/ESDockerfile
push: true
tags: ghacupha/erp-system-elastic-search:1.7.9
tags: ghacupha/erp-system-elastic-search:1.8.0
63 changes: 63 additions & 0 deletions .jhipster/WorkInProgressOutstandingReportRequisition.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
{
"fields": [
{
"fieldName": "requestId",
"fieldType": "UUID",
"fieldValidateRules": ["required", "unique"]
},
{
"fieldName": "reportDate",
"fieldType": "LocalDate",
"fieldValidateRules": ["required"]
},
{
"fieldName": "timeOfRequisition",
"fieldType": "ZonedDateTime",
"fieldValidateRules": ["required"]
},
{
"fieldName": "fileChecksum",
"fieldType": "String"
},
{
"fieldName": "tampered",
"fieldType": "Boolean"
},
{
"fieldName": "filename",
"fieldType": "UUID"
},
{
"fieldName": "reportParameters",
"fieldType": "String"
},
{
"fieldName": "reportFile",
"fieldType": "byte[]",
"fieldTypeBlobContent": "any"
}
],
"relationships": [
{
"relationshipName": "requestedBy",
"otherEntityName": "applicationUser",
"relationshipType": "many-to-one",
"otherEntityField": "applicationIdentity"
},
{
"relationshipName": "lastAccessedBy",
"otherEntityName": "applicationUser",
"relationshipType": "many-to-one",
"otherEntityField": "applicationIdentity"
}
],
"service": "serviceImpl",
"dto": "mapstruct",
"jpaMetamodelFiltering": true,
"readOnly": false,
"pagination": "pagination",
"name": "WorkInProgressOutstandingReportRequisition",
"changelogDate": "20240509064742",
"incrementalChangelog": false,
"entityTableName": "wip_outstanding_rpt_rx"
}
2 changes: 1 addition & 1 deletion .lintstagedrc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Erp System - Mark X No 7 (Jehoiada Series) Server ver 1.7.9
* Erp System - Mark X No 8 (Jehoiada Series) Server ver 1.8.0
* Copyright © 2021 - 2024 Edwin Njeru and the ERP System Contributors (mailnjeru@gmail.com)
*
* This program is free software: you can redistribute it and/or modify
Expand Down
5 changes: 3 additions & 2 deletions .yo-rc.json
Original file line number Diff line number Diff line change
Expand Up @@ -282,15 +282,16 @@
"PrepaymentReportRequisition",
"MonthlyPrepaymentReportRequisition",
"AmortizationPostingReportRequisition",
"PrepaymentByAccountReportRequisition"
"PrepaymentByAccountReportRequisition",
"WorkInProgressOutstandingReportRequisition"
],
"entitySuffix": "",
"incrementalChangelog": false,
"jhiPrefix": "jhi",
"jhipsterVersion": "7.3.1",
"jwtSecretKey": "ZWMyYzI1MmU3Mzg1ZTU4ZjFmOTIzYjEzOWZkZWU1MWZhNGY4ZTA3ZTEwYmYxMzczOGE3NDZiZjNkMDE3NjNiYTBmMTE0ODBiYTcyZDI0ZTcyNmU5OTA2NGY4NDUwZGEyMWQwYThmMTgxNWJiMjQ2OGQ0NmIxMTQwNTE0MGFkNzA=",
"languages": ["en", "fr", "it", "de"],
"lastLiquibaseTimestamp": 1714993210000,
"lastLiquibaseTimestamp": 1715237262000,
"messageBroker": "kafka",
"nativeLanguage": "en",
"otherModules": [],
Expand Down
2 changes: 1 addition & 1 deletion checkstyle.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--
Erp System - Mark X No 7 (Jehoiada Series) Server ver 1.7.9
Erp System - Mark X No 8 (Jehoiada Series) Server ver 1.8.0
Copyright © 2021 - 2024 Edwin Njeru and the ERP System Contributors (mailnjeru@gmail.com)
This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion npmw.cmd
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@REM
@REM Erp System - Mark X No 7 (Jehoiada Series) Server ver 1.7.9
@REM Erp System - Mark X No 8 (Jehoiada Series) Server ver 1.8.0
@REM Copyright © 2021 - 2024 Edwin Njeru and the ERP System Contributors (mailnjeru@gmail.com)
@REM
@REM This program is free software: you can redistribute it and/or modify
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "erp-system",
"version": "1.7.9",
"version": "1.8.0",
"private": true,
"description": "Back-end for the ERP System: Mark X No 7 (Jehoiada Series) Server v1.7.8",
"description": "Back-end for the ERP System: Mark X No 8 (Jehoiada Series) Server v1.8.0",
"license": "APACHEv2",
"scripts": {
"app:start": "./mvnw",
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<groupId>io.github.erp</groupId>
<artifactId>erp-system</artifactId>
<version>1.7.9</version>
<version>1.8.0</version>
<packaging>jar</packaging>
<name>Erp System</name>
<description>${ERP_SYSTEM_DEPLOYMENT_TITLE}</description>
Expand All @@ -25,7 +25,7 @@
<properties>
<!-- Build properties -->
<ERP_SYSTEM_DEPLOYMENT_SERIES>Jehoiada Series</ERP_SYSTEM_DEPLOYMENT_SERIES>
<ERP_SYSTEM_DEPLOYMENT_SERIES_NUMBER>Mark X No 7 </ERP_SYSTEM_DEPLOYMENT_SERIES_NUMBER>
<ERP_SYSTEM_DEPLOYMENT_SERIES_NUMBER>Mark X No 8 </ERP_SYSTEM_DEPLOYMENT_SERIES_NUMBER>
<ERP_SYSTEM_DEPLOYMENT_VERSION>${project.version}</ERP_SYSTEM_DEPLOYMENT_VERSION>
<ERP_SYSTEM_DEPLOYMENT_TITLE>${ERP_SYSTEM_DEPLOYMENT_SERIES_NUMBER} (${ERP_SYSTEM_DEPLOYMENT_SERIES}) Server ver ${ERP_SYSTEM_DEPLOYMENT_VERSION}</ERP_SYSTEM_DEPLOYMENT_TITLE>
<maven.version>3.3.9</maven.version>
Expand Down
2 changes: 1 addition & 1 deletion scripts/maintain-entities.cmd
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@REM
@REM Erp System - Mark X No 7 (Jehoiada Series) Server ver 1.7.9
@REM Erp System - Mark X No 8 (Jehoiada Series) Server ver 1.8.0
@REM Copyright © 2021 - 2024 Edwin Njeru and the ERP System Contributors (mailnjeru@gmail.com)
@REM
@REM This program is free software: you can redistribute it and/or modify
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--
-- Erp System - Mark X No 7 (Jehoiada Series) Server ver 1.7.9
-- Erp System - Mark X No 8 (Jehoiada Series) Server ver 1.8.0
-- Copyright © 2021 - 2024 Edwin Njeru and the ERP System Contributors (mailnjeru@gmail.com)
--
-- This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion scripts/revert-various.cmd
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@REM
@REM Erp System - Mark X No 7 (Jehoiada Series) Server ver 1.7.9
@REM Erp System - Mark X No 8 (Jehoiada Series) Server ver 1.8.0
@REM Copyright © 2021 - 2024 Edwin Njeru and the ERP System Contributors (mailnjeru@gmail.com)
@REM
@REM This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion scripts/rollback-liquibase-changelog.cmd
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@REM
@REM Erp System - Mark X No 7 (Jehoiada Series) Server ver 1.7.9
@REM Erp System - Mark X No 8 (Jehoiada Series) Server ver 1.8.0
@REM Copyright © 2021 - 2024 Edwin Njeru and the ERP System Contributors (mailnjeru@gmail.com)
@REM
@REM This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion scripts/stash-self-referencing-resources.cmd
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@REM
@REM Erp System - Mark X No 7 (Jehoiada Series) Server ver 1.7.9
@REM Erp System - Mark X No 8 (Jehoiada Series) Server ver 1.8.0
@REM Copyright © 2021 - 2024 Edwin Njeru and the ERP System Contributors (mailnjeru@gmail.com)
@REM
@REM This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion sonar-project.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Erp System - Mark X No 7 (Jehoiada Series) Server ver 1.7.9
# Erp System - Mark X No 8 (Jehoiada Series) Server ver 1.8.0
# Copyright © 2021 - 2024 Edwin Njeru and the ERP System Contributors (mailnjeru@gmail.com)
#
# This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion src/main/docker/app.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Erp System - Mark X No 7 (Jehoiada Series) Server ver 1.7.9
# Erp System - Mark X No 8 (Jehoiada Series) Server ver 1.8.0
# Copyright © 2021 - 2024 Edwin Njeru and the ERP System Contributors (mailnjeru@gmail.com)
#
# This program is free software: you can redistribute it and/or modify
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Erp System - Mark X No 7 (Jehoiada Series) Server ver 1.7.9
# Erp System - Mark X No 8 (Jehoiada Series) Server ver 1.8.0
# Copyright © 2021 - 2024 Edwin Njeru and the ERP System Contributors (mailnjeru@gmail.com)
#
# This program is free software: you can redistribute it and/or modify
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Erp System - Mark X No 7 (Jehoiada Series) Server ver 1.7.9
# Erp System - Mark X No 8 (Jehoiada Series) Server ver 1.8.0
# Copyright © 2021 - 2024 Edwin Njeru and the ERP System Contributors (mailnjeru@gmail.com)
#
# This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion src/main/docker/create_user.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#
# Erp System - Mark X No 7 (Jehoiada Series) Server ver 1.7.9
# Erp System - Mark X No 8 (Jehoiada Series) Server ver 1.8.0
# Copyright © 2021 - 2024 Edwin Njeru and the ERP System Contributors (mailnjeru@gmail.com)
#
# This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion src/main/docker/elasticsearch.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Erp System - Mark X No 7 (Jehoiada Series) Server ver 1.7.9
# Erp System - Mark X No 8 (Jehoiada Series) Server ver 1.8.0
# Copyright © 2021 - 2024 Edwin Njeru and the ERP System Contributors (mailnjeru@gmail.com)
#
# This program is free software: you can redistribute it and/or modify
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Erp System - Mark X No 7 (Jehoiada Series) Server ver 1.7.9
# Erp System - Mark X No 8 (Jehoiada Series) Server ver 1.8.0
# Copyright © 2021 - 2024 Edwin Njeru and the ERP System Contributors (mailnjeru@gmail.com)
#
# This program is free software: you can redistribute it and/or modify
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Erp System - Mark X No 7 (Jehoiada Series) Server ver 1.7.9
# Erp System - Mark X No 8 (Jehoiada Series) Server ver 1.8.0
# Copyright © 2021 - 2024 Edwin Njeru and the ERP System Contributors (mailnjeru@gmail.com)
#
# This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion src/main/docker/hazelcast-management-center.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Erp System - Mark X No 7 (Jehoiada Series) Server ver 1.7.9
# Erp System - Mark X No 8 (Jehoiada Series) Server ver 1.8.0
# Copyright © 2021 - 2024 Edwin Njeru and the ERP System Contributors (mailnjeru@gmail.com)
#
# This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion src/main/docker/jhipster-control-center.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Erp System - Mark X No 7 (Jehoiada Series) Server ver 1.7.9
# Erp System - Mark X No 8 (Jehoiada Series) Server ver 1.8.0
# Copyright © 2021 - 2024 Edwin Njeru and the ERP System Contributors (mailnjeru@gmail.com)
#
# This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion src/main/docker/jhipster-registry.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Erp System - Mark X No 7 (Jehoiada Series) Server ver 1.7.9
# Erp System - Mark X No 8 (Jehoiada Series) Server ver 1.8.0
# Copyright © 2021 - 2024 Edwin Njeru and the ERP System Contributors (mailnjeru@gmail.com)
#
# This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion src/main/docker/jib/entrypoint.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh
#
# Erp System - Mark X No 7 (Jehoiada Series) Server ver 1.7.9
# Erp System - Mark X No 8 (Jehoiada Series) Server ver 1.8.0
# Copyright © 2021 - 2024 Edwin Njeru and the ERP System Contributors (mailnjeru@gmail.com)
#
# This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion src/main/docker/kafka.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Erp System - Mark X No 7 (Jehoiada Series) Server ver 1.7.9
# Erp System - Mark X No 8 (Jehoiada Series) Server ver 1.8.0
# Copyright © 2021 - 2024 Edwin Njeru and the ERP System Contributors (mailnjeru@gmail.com)
#
# This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion src/main/docker/monitoring.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Erp System - Mark X No 7 (Jehoiada Series) Server ver 1.7.9
# Erp System - Mark X No 8 (Jehoiada Series) Server ver 1.8.0
# Copyright © 2021 - 2024 Edwin Njeru and the ERP System Contributors (mailnjeru@gmail.com)
#
# This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion src/main/docker/postgresql.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Erp System - Mark X No 7 (Jehoiada Series) Server ver 1.7.9
# Erp System - Mark X No 8 (Jehoiada Series) Server ver 1.8.0
# Copyright © 2021 - 2024 Edwin Njeru and the ERP System Contributors (mailnjeru@gmail.com)
#
# This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion src/main/docker/prometheus/prometheus.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Erp System - Mark X No 7 (Jehoiada Series) Server ver 1.7.9
# Erp System - Mark X No 8 (Jehoiada Series) Server ver 1.8.0
# Copyright © 2021 - 2024 Edwin Njeru and the ERP System Contributors (mailnjeru@gmail.com)
#
# This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion src/main/docker/sonar.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Erp System - Mark X No 7 (Jehoiada Series) Server ver 1.7.9
# Erp System - Mark X No 8 (Jehoiada Series) Server ver 1.8.0
# Copyright © 2021 - 2024 Edwin Njeru and the ERP System Contributors (mailnjeru@gmail.com)
#
# This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/github/erp/ApplicationWebXml.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.github.erp;

/*-
* Erp System - Mark X No 7 (Jehoiada Series) Server ver 1.7.9
* Erp System - Mark X No 8 (Jehoiada Series) Server ver 1.8.0
* Copyright © 2021 - 2024 Edwin Njeru and the ERP System Contributors (mailnjeru@gmail.com)
*
* This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/github/erp/ErpSystemApp.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.github.erp;

/*-
* Erp System - Mark X No 7 (Jehoiada Series) Server ver 1.7.9
* Erp System - Mark X No 8 (Jehoiada Series) Server ver 1.8.0
* Copyright © 2021 - 2024 Edwin Njeru and the ERP System Contributors (mailnjeru@gmail.com)
*
* This program is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/github/erp/GeneratedByJHipster.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.github.erp;

/*-
* Erp System - Mark X No 7 (Jehoiada Series) Server ver 1.7.9
* Erp System - Mark X No 8 (Jehoiada Series) Server ver 1.8.0
* Copyright © 2021 - 2024 Edwin Njeru and the ERP System Contributors (mailnjeru@gmail.com)
*
* This program is free software: you can redistribute it and/or modify
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,22 @@

/*-
* Erp System - Mark X No 8 (Jehoiada Series) Server ver 1.8.0
* Copyright © 2021 - 2024 Edwin Njeru and the ERP System Contributors (mailnjeru@gmail.com)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

/*-
* Erp System - Mark X No 7 (Jehoiada Series) Server ver 1.7.9
* Copyright © 2021 - 2024 Edwin Njeru and the ERP System Contributors (mailnjeru@gmail.com)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

/*-
* Erp System - Mark X No 7 (Jehoiada Series) Server ver 1.7.9
* Erp System - Mark X No 8 (Jehoiada Series) Server ver 1.8.0
* Copyright © 2021 - 2024 Edwin Njeru and the ERP System Contributors (mailnjeru@gmail.com)
*
* This program is free software: you can redistribute it and/or modify
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

/*-
* Erp System - Mark X No 7 (Jehoiada Series) Server ver 1.7.9
* Erp System - Mark X No 8 (Jehoiada Series) Server ver 1.8.0
* Copyright © 2021 - 2024 Edwin Njeru and the ERP System Contributors (mailnjeru@gmail.com)
*
* This program is free software: you can redistribute it and/or modify
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

/*-
* Erp System - Mark X No 7 (Jehoiada Series) Server ver 1.7.9
* Erp System - Mark X No 8 (Jehoiada Series) Server ver 1.8.0
* Copyright © 2021 - 2024 Edwin Njeru and the ERP System Contributors (mailnjeru@gmail.com)
*
* This program is free software: you can redistribute it and/or modify
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.github.erp.aop.depreciation;

/*-
* Erp System - Mark X No 7 (Jehoiada Series) Server ver 1.7.9
* Erp System - Mark X No 8 (Jehoiada Series) Server ver 1.8.0
* Copyright © 2021 - 2024 Edwin Njeru and the ERP System Contributors (mailnjeru@gmail.com)
*
* This program is free software: you can redistribute it and/or modify
Expand Down
Loading

0 comments on commit 1a046a0

Please sign in to comment.