Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
115,119 Commits 36 Branches 189 Tags
cb15e1ea8a5414d03ce18f3145d9db358eb2d909
Commit Graph

571 Commits

Author SHA1 Message Date
Laurent Destailleur
221b2dc288 Standardize code 2022-10-10 10:46:46 +02:00
Laurent Destailleur
bdeac7b7ab Merge pull request #22185 from dolibit-ut/patch-555 
Update bom_note.php
 2022-09-25 17:14:28 +02:00
Laurent Destailleur
259ef24cef Merge pull request #22189 from dolibit-ut/patch-559 
Update bom_card.php
 2022-09-25 17:14:18 +02:00
Laurent Destailleur
3e8d1181fe Merge pull request #22401 from aspangaro/17p6 
Use isModEnabled
 2022-09-25 17:03:42 +02:00
Alexandre SPANGARO
d06fef47f8 Use isModEnabled 2022-09-25 15:28:36 +02:00
Alexandre SPANGARO
c674f00cb2 Use isModEnabled 2022-09-25 15:27:42 +02:00
Laurent Destailleur
2fddba4a3b Merge pull request #22186 from dolibit-ut/patch-556 
Update bom_net_needs.php
 2022-09-25 14:48:52 +02:00
Laurent Destailleur
5e4e3265a3 Merge pull request #22187 from dolibit-ut/patch-557 
Update bom_list.php
 2022-09-25 14:48:32 +02:00
Laurent Destailleur
3adb60660c Merge branch 'develop' into patch-559 2022-09-25 14:33:36 +02:00
Laurent Destailleur
58e96a1db8 Merge pull request #22188 from dolibit-ut/patch-558 
Update bom_document.php
 2022-09-25 14:27:37 +02:00
Laurent Destailleur
b3e0fddb1b Merge pull request #22190 from dolibit-ut/patch-560 
Update bom_agenda.php
 2022-09-25 14:27:16 +02:00
Alexandre SPANGARO
aec9a7a60d Use isModEnabled 2022-09-25 06:30:09 +02:00
Laurent Destailleur
388dd6395b Clean code 2022-09-22 14:06:50 +02:00
Laurent Destailleur
6fb9a4713c Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-21 01:30:40 +02:00
atm-lena
5843cc8cb6 Bom services : fix calcul of cost for line without workstation 2022-09-16 11:11:20 +02:00
atm-lena
2c017d4f78 Clean 2022-09-15 16:04:32 +02:00
atm-lena
6a15962477 CalculateCosts function : add hook 2022-09-15 16:02:49 +02:00
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
UT from dolibit
181ad927a4 Update bom_agenda.php 2022-09-10 20:59:06 +02:00
UT from dolibit
8c9159ae04 Update bom_card.php 2022-09-10 20:54:24 +02:00
UT from dolibit
a7fff0be48 Update bom_document.php 2022-09-10 20:50:00 +02:00
UT from dolibit
ee8ea00a5b Update bom_list.php 2022-09-10 20:44:08 +02:00
UT from dolibit
8c3c817b23 Update bom_net_needs.php 2022-09-10 20:30:48 +02:00
UT from dolibit
231270d781 Update bom_note.php 2022-09-10 20:27:25 +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