Commit Graph

706 Commits

Author SHA1 Message Date
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
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
atm-lena
462352b957 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-07-29 12:06:43 +02:00
Laurent Destailleur
3da20beeb5 Fix warning 2022-07-28 18:06:37 +02:00
atm-lena
c66489e2e0 Merge branch 'develop_NEW_Service_DefaultWorkstation' of github.com:atm-lena/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-07-21 14:34:14 +02:00
atm-lena
e4ec999b45 Retour stickler 2022-07-21 14:33:50 +02:00
stickler-ci
9ef883e7b0 Fixing style errors. 2022-07-20 13:42:33 +00:00
atm-lena
7f1a17bcc9 Change fk_unit service lines management 2022-07-20 15:38:37 +02:00
atm-lena
cc5a5e40d9 FIX 2022-07-12 14:56:25 +02:00
atm-lena
b5d2e0f4bc Clean travis return 2022-07-12 12:23:23 +02:00
stickler-ci
a41dee9e06 Fixing style errors. 2022-07-12 08:09:45 +00:00
atm-lena
c068eebc43 Add function "convertDurationtoHour" 2022-07-12 10:03:31 +02:00
atm-lena
db5c5b9020 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-07-12 09:21:22 +02:00
atm-lena
6564333e55 Change sjquery on select2 2022-07-12 09:16:52 +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
atm-lena
d42d910c08 FIX Retours 2022-07-08 16:02:31 +02:00
atm-lena
7c82fc5da6 WIP 2022-07-08 10:04:16 +02:00
atm-lena
16415a1c92 Clean Code 2022-07-06 17:28:29 +02:00
atm-lena
503e2310ea WIP 2022-07-06 16:51:50 +02:00
atm-lena
dadff083a4 Change unit dynamic 2022-07-06 16:17:22 +02:00
atm-lena
6925dc2ae1 Edit unit bom line service 2022-07-06 15:00:07 +02:00
atm-lena
55f0dada34 WIP 2022-07-06 13:55:43 +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
atm-lena
eba84382dc Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_OF_Child 2022-05-24 09:37:39 +02:00
Laurent Destailleur
168d1d4334 Merge pull request #20890 from Hystepik/develop#1
Fix : php 8.0 warnings
2022-05-20 19:41:20 +02:00
Laurent Destailleur
e1c2968ae7 Look and feel v16 2022-05-18 23:11:59 +02:00
lmarcouiller
cf2c46b583 Fix : php 8.0 warnings 2022-05-18 12:31:09 +02:00
Laurent Destailleur
26c3e235cf Merge pull request #19459 from frederic34/productmerge
can merge products
2022-04-07 15:02:03 +02:00