Commit Graph

511 Commits

Author SHA1 Message Date
Laurent Destailleur
6b3095ae9a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-08 14:10:28 +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
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
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
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
Christian Humpel
91094d48e6 #21750 NEW: Added "Get lines and Post lines from BOM" at the REST Service 2022-08-15 16:25:42 +02:00
stickler-ci
015f179acb Fixing style errors. 2022-08-15 13:19:16 +00:00
Christian Humpel
0576f31592 #21750 NEW: Added "Get lines and Post lines from BOM" at the REST Service 2022-08-15 15:18:08 +02:00
Christian Humpel
a204165018 #21750 NEW: Added "Get lines from BOM" at the REST Service 2022-08-14 15:58:49 +02:00
Christian Humpel
32fe761f01 NEW: Added "Get lines from BOM" at the REST Service 2022-08-14 12:55:48 +02:00
Laurent Destailleur
3da20beeb5 Fix warning 2022-07-28 18:06:37 +02:00
Laurent Destailleur
24dc936000 Revert "default to create on card.php if $action is empty"
This reverts commit e0b664066b.
2022-07-11 00:05:50 +02:00
Christian Foellmann
e0b664066b default to create on card.php if $action is empty 2022-07-11 00:01:42 +02:00
Laurent Destailleur
4c4e081997 Debug v16 2022-06-28 13:09:53 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
Laurent Destailleur
c2fe5de852 Merge pull request #21195 from frederic34/useismodenabled
use isModEnabled function
2022-06-12 11:56:31 +02:00
Laurent Destailleur
aba122a52b Debug v16 2022-06-11 21:47:00 +02:00
Frédéric France
5dcfc28913 use isModEnabled function 2022-06-09 22:41:59 +02:00
Frédéric France
400afc937f use isModEnabled function 2022-06-09 22:16:48 +02:00
Laurent Destailleur
cbead0fa5a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/product/class/productbatch.class.php
2022-06-02 19:39:42 +02:00
jyhere
f582814c0f Update bom.class.php 2022-06-02 09:46:26 +02:00
Laurent Destailleur
3751fc92ca Clean code 2022-06-01 20:47:14 +02:00
Laurent Destailleur
a035449cc5 Debug v16 2022-06-01 19:53:13 +02:00
Laurent Destailleur
0b9d4de20d Fix warning 2022-05-31 14:20:59 +02:00