Commit Graph

548 Commits

Author SHA1 Message Date
Laurent Destailleur
6cf5c51f0b Fix phpunit 2022-09-13 02:33:49 +02:00
Laurent Destailleur
d911f13ca0
Update ajax.php 2022-09-13 01:40:37 +02:00
Laurent Destailleur
7dbde6f934
Merge branch 'develop' into develop_NEW_Service_DefaultWorkstation 2022-09-13 01:38:49 +02:00
Laurent Destailleur
69fbd6be40
Merge branch 'develop' into patch-511 2022-09-13 01:32:48 +02:00
UT from dolibit
2acfa41b16
Update bom_card.php 2022-09-11 10:20:51 +02:00
Laurent Destailleur
6b3095ae9a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-08 14:10:28 +02:00
atm-lena
6c0f5d3e64 Merge branch 'develop_NEW_Service_DefaultWorkstation' of github.com:atm-lena/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-09-08 11:59:45 +02:00
atm-lena
1b5636ff66 Fix stickler 2022-09-08 11:58:18 +02:00
stickler-ci
d0429ad8a1 Fixing style errors. 2022-09-08 09:48:48 +00:00
atm-lena
8152e3f82a Clean code 2022-09-08 11:43:48 +02:00
atm-lena
444ba4bf46 FIX Returns 2022-09-08 11:40:40 +02:00
atm-lena
81ed97e9fc Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-09-08 11:21:05 +02:00
Laurent Destailleur
83bb78f981
Merge pull request #22045 from frederic34/pr/grandoc/22009
Pr/grandoc/22009
2022-09-03 11:39:39 +02:00
Gauthier PC portable 024
4c15dafa14 Merge branch 'FIX/check_if_allowed_to_add_bom_as_bomline' of github.com:atm-gauthier/dolibarr into FIX/check_if_allowed_to_add_bom_as_bomline 2022-09-02 11:57:44 +02:00
Gauthier PC portable 024
360bfed601 FIX : return void 2022-09-02 11:57:29 +02:00
Frédéric FRANCE
9150f5102e Merge remote-tracking branch 'upstream/develop' into pr/grandoc/22009 2022-09-02 11:44:45 +02:00
Laurent Destailleur
0cbd1d7d9f
Merge pull request #22041 from dolibit-ut/patch-510
Update bom_agenda.php
2022-09-02 11:39:54 +02:00
stickler-ci
21517cf578 Fixing style errors. 2022-09-02 08:33:27 +00:00
UT from dolibit
db7bb77d03
Update bom_card.php 2022-09-02 10:31:56 +02:00
Gauthier PC portable 024
c28407a1c9 FIX : default value for bom_id with $this->id and protection against infinite loop 2022-09-02 10:28:19 +02:00
UT from dolibit
e450d464aa
Update bom_agenda.php 2022-09-02 10:26:30 +02:00
Gauthier PC portable 024
f1e98f2d35 Merge branch 'FIX/check_if_allowed_to_add_bom_as_bomline' of github.com:atm-gauthier/dolibarr into FIX/check_if_allowed_to_add_bom_as_bomline 2022-09-02 08:44:29 +02:00
Gauthier PC portable 024
1269e1b86e FIX : cast 2022-09-02 08:44:16 +02:00
stickler-ci
d4122278bd Fixing style errors. 2022-09-01 15:23:40 +00:00
Gauthier PC portable 024
e1bf5a5e6b FIX : Recursively retrieves all parent bom in the tree that leads to the $bom_id bom to check if we're allowed to add bom as bomline 2022-09-01 17:16:59 +02:00
Frédéric France
8e66b7207e replace ! empty by !empty 2022-08-31 22:14:20 +02:00
Philippe GRAND
04679ac000 update code 2022-08-31 21:47:33 +02:00
Philippe GRAND
4dbb6cfa6e update code 2022-08-31 21:47:03 +02:00
Philippe GRAND
1ec7f640a7 FIX php8 compatibility 2022-08-28 13:40:32 +02:00
stickler-ci
8f336b1e50 Fixing style errors. 2022-08-24 10:20:16 +00:00
atm-lena
ab2b445b53 FIX accolade et gestion fk_unit 2022-08-24 12:15:28 +02:00
atm-lena
44caf380cf Merge branch 'develop_NEW_Service_DefaultWorkstation' of github.com:atm-lena/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-08-24 11:56:04 +02:00
atm-lena
f5d7f66ca0 Ajout gestion fk_unit 2022-08-24 11:53:25 +02:00
stickler-ci
1a15582c49 Fixing style errors. 2022-08-24 09:43:48 +00:00
atm-lena
6e5d395ac8 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-08-24 11:38:19 +02:00
Frédéric France
582f6b196e use isModEnabled 2022-08-23 20:02:37 +02:00
Frédéric France
4bef0f5745 use isModEnabled 2022-08-23 20:01:34 +02:00
Laurent Destailleur
5ada158e03 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-22 13:20:10 +02:00
Christian Humpel
326c8762bb Fix #21761 Correct numbering by adding/updating the BomLine and clean code. 2022-08-19 17:29:05 +02:00
Christian Humpel
e1de08467b
Merge branch 'Dolibarr:develop' into develop_#21761 2022-08-19 14:17:01 +02:00
stickler-ci
f0dd152f11 Fixing style errors. 2022-08-18 16:12:40 +00:00
Christian Humpel
17c5f30689 New #21774 extend REST with PUT and DELETE for BOM-Lines. Otherwise some changes for correct ranking of BOM-Lines. 2022-08-18 18:07:56 +02:00
stickler-ci
115a2cdc9e Fixing style errors. 2022-08-17 22:02:20 +00:00
Christian Humpel
9db7c210df
Merge branch 'develop_HUSCH' into develop_#21761 2022-08-18 00:01:37 +02:00
stickler-ci
01d7f558ba Fixing style errors. 2022-08-17 09:11:09 +00:00
Christian Humpel
474d82b19c Clean Code: Remove duplicate code form bom_card.php 2022-08-17 11:02:26 +02:00
atm-lena
9ec0c9963a FIX : total cost line => bad convert 2022-08-17 10:26:25 +02:00
Christian Humpel
29df21d768 Fix #21761 Remove dopple +1 on $ranktouse. 2022-08-16 22:25:52 +02:00
Laurent Destailleur
8c7c4d6408
Merge pull request #21750 from Humml87/15.0
NEW: Added "Get lines and Post lines from BOM" at the REST Service
2022-08-16 20:29:00 +02:00
Christian Humpel
10bd0b4cc5 Merge remote-tracking branch 'origin/15.0' into 15.0 2022-08-15 16:26:30 +02:00