Merge branch 'develop' into 'master' (1bc5555f) · Commits · ERP (SIL) / BACK

Commit 1bc5555f authored 3 years ago by

BEAUVAIS ANTOINE

Merge branch 'develop' into 'master'

Merge 'develop' changes into 'master'.

See merge request !1

parents 47acf3ea daf3dfed

Branches

Hide whitespace changes

Inline Side-by-side

Showing

scripts/create-dev.sql 54 additions, 22 deletions

scripts/create-dev.sql
scripts/generate-dev.sh 0 additions, 0 deletions

scripts/generate-dev.sh
src/main/java/fr/unistra/sil/erp/back/Config.java 2 additions, 0 deletions

src/main/java/fr/unistra/sil/erp/back/Config.java
src/main/java/fr/unistra/sil/erp/back/controller/IRetrieveCategoriesController.java 22 additions, 0 deletions

...il/erp/back/controller/IRetrieveCategoriesController.java
src/main/java/fr/unistra/sil/erp/back/controller/IRetrieveInfoController.java 26 additions, 0 deletions

...stra/sil/erp/back/controller/IRetrieveInfoController.java
src/main/java/fr/unistra/sil/erp/back/controller/IRetrieveStocks.java 20 additions, 0 deletions

...a/fr/unistra/sil/erp/back/controller/IRetrieveStocks.java
src/main/java/fr/unistra/sil/erp/back/controller/ISubmitTransactionController.java 27 additions, 0 deletions

...sil/erp/back/controller/ISubmitTransactionController.java
src/main/java/fr/unistra/sil/erp/back/controller/api/ApiBadRequestException.java 1 addition, 1 deletion

...a/sil/erp/back/controller/api/ApiBadRequestException.java
src/main/java/fr/unistra/sil/erp/back/controller/api/ApiErrorHandler.java 2 additions, 2 deletions

.../unistra/sil/erp/back/controller/api/ApiErrorHandler.java
src/main/java/fr/unistra/sil/erp/back/controller/api/ApiRetrieveCategoriesController.java 7 additions, 3 deletions

.../back/controller/api/ApiRetrieveCategoriesController.java
src/main/java/fr/unistra/sil/erp/back/controller/api/ApiRetrieveInfoController.java 10 additions, 6 deletions

...il/erp/back/controller/api/ApiRetrieveInfoController.java
src/main/java/fr/unistra/sil/erp/back/controller/api/ApiRetrieveStocks.java 57 additions, 0 deletions

...nistra/sil/erp/back/controller/api/ApiRetrieveStocks.java
src/main/java/fr/unistra/sil/erp/back/controller/api/ApiServerErrorException.java 1 addition, 1 deletion

.../sil/erp/back/controller/api/ApiServerErrorException.java
src/main/java/fr/unistra/sil/erp/back/controller/api/ApiSubmitTransactionController.java 72 additions, 0 deletions

...p/back/controller/api/ApiSubmitTransactionController.java
src/main/java/fr/unistra/sil/erp/back/db/DatabaseInterface.java 10 additions, 2 deletions

...in/java/fr/unistra/sil/erp/back/db/DatabaseInterface.java
src/main/java/fr/unistra/sil/erp/back/db/DatabaseSQLiteImpl.java 33 additions, 3 deletions

...n/java/fr/unistra/sil/erp/back/db/DatabaseSQLiteImpl.java
src/main/java/fr/unistra/sil/erp/back/model/Category.java 1 addition, 1 deletion

src/main/java/fr/unistra/sil/erp/back/model/Category.java
src/main/java/fr/unistra/sil/erp/back/model/ErrorMessage.java 1 addition, 1 deletion

...main/java/fr/unistra/sil/erp/back/model/ErrorMessage.java
src/main/java/fr/unistra/sil/erp/back/model/Item.java 1 addition, 1 deletion

src/main/java/fr/unistra/sil/erp/back/model/Item.java
src/main/java/fr/unistra/sil/erp/back/model/RegistryEntry.java 6 additions, 6 deletions

...ain/java/fr/unistra/sil/erp/back/model/RegistryEntry.java

with 353 additions and 49 deletions

Please register or to comment

Admin message

Merge branch 'develop' into 'master'