walid seghier
|
95aaaf9662
|
Update PurchaseOrderSupplierLine.xml
|
2022-07-03 15:38:21 +01:00 |
|
bachir souldi
|
73430a00d8
|
Merge branch 'dev' of http://serveursi:8080/git/root/ERP into dev
|
2022-07-03 14:31:03 +01:00 |
|
bachir souldi
|
73d426bfae
|
add rest of attributes importation folder && and calculation of cost price
|
2022-07-03 14:29:21 +01:00 |
|
root
|
49dab6eb4f
|
Merge pull request #18 from root/dev
Planning Purchase Request
|
2022-06-27 16:25:27 +02:00 |
|
walid seghier
|
2c45dedeb0
|
Planning Purchase Request
|
2022-06-27 15:15:11 +01:00 |
|
root
|
76a2511f4a
|
Merge pull request #17 from root/dev
Dev
|
2022-06-26 09:26:23 +02:00 |
|
bachir souldi
|
904e2ed225
|
allow multiple sub-creation of PO from children
|
2022-06-24 15:49:35 +01:00 |
|
bachir souldi
|
ed4bddc1c6
|
prevent generation of PO children twice from the same parent
|
2022-06-23 16:04:15 +01:00 |
|
bachir souldi
|
16f5821584
|
copy texline from parent to generated PO children
|
2022-06-23 15:59:58 +01:00 |
|
bachir souldi
|
136097ff36
|
copy description from parent po to children POs
|
2022-06-23 11:15:17 +01:00 |
|
bachir souldi
|
879e4d4716
|
add link between po children and purchase request
|
2022-06-23 10:59:31 +01:00 |
|
root
|
994d832b56
|
Merge pull request #16 from root/dev
Update PurchaseRequest.xml
|
2022-06-21 09:31:37 +02:00 |
|
walid seghier
|
d3f7079152
|
Update PurchaseRequest.xml
|
2022-06-21 08:30:55 +01:00 |
|
walid
|
289e1fd697
|
Merge pull request #15 from root/dev
Dev
|
2022-06-09 10:09:32 +02:00 |
|
bachir souldi
|
8e85923242
|
set taxline to purchaseOrderLine from TCO
|
2022-06-09 08:49:09 +01:00 |
|
bachir souldi
|
a9521f56b4
|
fix css errors and hide about page
|
2022-06-08 11:19:36 +01:00 |
|
bachir souldi
|
d5522f1a34
|
add importation folder (Dossier d'importation)
|
2022-06-08 11:08:36 +01:00 |
|
walid
|
ab14eed8e9
|
Merge pull request #14 from root/dev
Update PurchaseOrderSupplierLine.xml
|
2022-06-06 10:42:15 +02:00 |
|
walid seghier
|
a99e21c5a1
|
Update PurchaseOrderSupplierLine.xml
|
2022-06-06 09:46:47 +01:00 |
|
walid
|
d3f35062c5
|
Merge pull request #13 from root/dev
ajout des conditions pour générer PO (demande achats)
|
2022-06-06 09:55:10 +02:00 |
|
walid seghier
|
7a690b5934
|
ajout des conditions pour générer PO (demande achats)
l'acheteur ne peut pas générer po si :
-statut différent de approuvé
-Possède un BC
|
2022-06-06 08:54:31 +01:00 |
|
walid
|
89edf6dce2
|
Merge pull request #12 from root/dev
suivi des flux de validation (demande achats))
|
2022-06-06 09:35:41 +02:00 |
|
walid seghier
|
d551584ece
|
suivi des flux de validation (demande achats))
|
2022-06-06 08:35:18 +01:00 |
|
root
|
9b78878642
|
Merge pull request #11 from root/dev
Dev
|
2022-05-29 09:27:53 +02:00 |
|
walid seghier
|
5c54545d99
|
Update theme.css
|
2022-05-29 08:27:12 +01:00 |
|
walid seghier
|
d0607e7093
|
archiver la demande d'achat après la génération commandes fournisseurs
|
2022-05-26 11:19:12 +01:00 |
|
bachir souldi
|
78c3216609
|
add image background to home page
|
2022-05-26 08:50:06 +01:00 |
|
bachir souldi
|
07666066a5
|
add link supplier line with purchase order
|
2022-05-26 08:46:11 +01:00 |
|
root
|
00a9d06c3e
|
Merge pull request #10 from root/dev
Dev
|
2022-05-24 10:32:57 +02:00 |
|
walid seghier
|
0f12e7825e
|
copier les champs ( projet, Description) quand on click sur générer achats
|
2022-05-24 09:24:51 +01:00 |
|
walid seghier
|
1fb51a427a
|
Créer une colonne projet
pour le module PurchaseRequest
|
2022-05-24 08:55:16 +01:00 |
|
walid seghier
|
6b2c87c964
|
régler le problème de génération commandes fournisseur
copie les lignes de commande d'achat est leurs TCO quand on click sur le bouton (Générer commandes fournisseurs)
|
2022-05-22 09:43:03 +01:00 |
|
bachir souldi
|
a01a3c78e5
|
add import PurchaseOrderService
|
2022-05-18 20:51:20 +02:00 |
|
root
|
00927d3a8c
|
Merge pull request #9 from root/dev
fix auto refresh purchase order cost
|
2022-05-18 12:43:22 +02:00 |
|
Administrator
|
c99eb2a853
|
fix auto refresh purchase order cost
|
2022-05-18 10:20:28 +01:00 |
|
root
|
cac279ab0c
|
Merge pull request #8 from root/dev
Update PurchaseOrderLineController.java
|
2022-05-12 12:47:04 +02:00 |
|
walid seghier
|
0ca0e95dca
|
Update PurchaseOrderLineController.java
|
2022-05-12 11:45:48 +01:00 |
|
root
|
d082ccaf39
|
Merge pull request #7 from root/dev
Dev
|
2022-05-12 09:54:09 +02:00 |
|
walid seghier
|
0b62072406
|
définir les valeurs par défaut (Demandes des fournisseurs TCO)
|
2022-05-12 08:53:15 +01:00 |
|
walid seghier
|
0bc33ba86c
|
Update PurchaseOrderSupplierLine.xml
ajout des champs pour calculer le montant (VUE TCO)
|
2022-05-12 08:42:35 +01:00 |
|
root
|
f8061a2231
|
Merge pull request #6 from root/dev
Dev
|
2022-05-12 09:27:18 +02:00 |
|
root
|
3beca4a9db
|
Update application.properties
|
2022-05-11 17:32:38 +02:00 |
|
Administrator
|
69966f7305
|
fix generate purchase order set && update price calculation
|
2022-05-11 15:36:05 +01:00 |
|
walid
|
904d7de80d
|
Merge pull request #5 from root/dev
Générer Achats
|
2022-05-09 10:35:17 +02:00 |
|
walid seghier
|
6c2cae8bd9
|
Générer Achats
afficher le prix unitaire sur le BC(PDF) après la génération
|
2022-05-09 09:34:42 +01:00 |
|
walid
|
3298b869de
|
Merge pull request #4 from root/dev
demandes achat
|
2022-05-04 16:46:48 +02:00 |
|
walid seghier
|
45e9b25726
|
demandes achat
quand le DG clic sur le bouton accepter (TCO) ,le programme prendre la valeur du Prix unitaire accepté et mettre dans le champs Prix unitaire remisé
|
2022-05-04 15:45:17 +01:00 |
|
walid
|
eadcb91c68
|
Merge pull request #3 from root/dev
modifier les Proprietes
|
2022-05-04 16:12:28 +02:00 |
|
walid seghier
|
4b0bac742d
|
modifier les Proprietes
|
2022-05-04 15:11:43 +01:00 |
|
walid
|
fd76ad3721
|
Merge pull request #2 from root/dev
reglage pour construire WAR
|
2022-05-04 16:03:29 +02:00 |
|