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 |
|
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 |
|
Laurent Destailleur
|
3056635aaf
|
css
|
2022-03-24 14:04:03 +01:00 |
|
Laurent Destailleur
|
8f25477db6
|
Debug v16
|
2022-03-24 13:41:11 +01:00 |
|
Laurent Destailleur
|
a22d66b021
|
css
|
2022-03-24 13:31:03 +01:00 |
|
John Livingston
|
1ece554c92
|
Fix: typo in template name
There was a typo in generated HTML comment.
|
2022-03-01 17:39:38 +01:00 |
|
Laurent Destailleur
|
358f21f06e
|
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formother.class.php
htdocs/core/customreports.php
|
2022-03-01 16:48:29 +01:00 |
|
Laurent Destailleur
|
2a48dd349e
|
Fix #hunterb03d4415-d4f9-48c8-9ae2-d3aa248027b5
|
2022-03-01 16:38:06 +01:00 |
|
Frédéric FRANCE
|
b277ab9ee3
|
Merge remote-tracking branch 'upstream/develop' into productmerge
|
2022-02-22 21:49:17 +01:00 |
|
atm-lena
|
e5039a67b0
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_OF_Child
|
2022-02-21 10:22:22 +01:00 |
|
Laurent Destailleur
|
6e5c7358de
|
Merge branch 'develop' into NEW_Needs_net_tab_on_bom
|
2022-02-17 20:06:38 +01:00 |
|
stickler-ci
|
13cfe858f2
|
Fixing style errors.
|
2022-02-17 09:53:02 +00:00 |
|
Adrien Raze
|
f16567a44a
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into FIX_total_cost_for_sub_bom
|
2022-02-17 10:45:19 +01:00 |
|
Frédéric FRANCE
|
eb77f10d7b
|
Merge remote-tracking branch 'upstream/develop' into productmerge
|
2022-02-15 19:11:24 +01:00 |
|
Frédéric FRANCE
|
a613553f37
|
Merge branch 'hookgetnomurl' into patch-1
|
2022-02-15 18:44:06 +01:00 |
|
stickler-ci
|
7c68c5ad66
|
Fixing style errors.
|
2022-02-15 15:11:28 +00:00 |
|
atm-lena
|
498d56319d
|
Clean Code
|
2022-02-15 16:08:18 +01:00 |
|
Adrien Raze
|
34d2e0b8b4
|
FIX : Fixed sub bom costs problems
|
2022-02-15 10:29:42 +01:00 |
|
Quentin VIAL-GOUTEYRON
|
cd955930b6
|
change bt link
|
2022-02-10 15:00:55 +01:00 |
|
Quentin VIAL-GOUTEYRON
|
dd0202de47
|
fix comment doc
|
2022-02-10 10:46:04 +01:00 |
|
stickler-ci
|
7cf9448609
|
Fixing style errors.
|
2022-02-10 09:22:53 +00:00 |
|
Quentin VIAL-GOUTEYRON
|
2260276bed
|
add tooltip
|
2022-02-10 10:09:36 +01:00 |
|
Quentin VIAL-GOUTEYRON
|
9e667e0155
|
NEW Needed nets bom
|
2022-02-09 15:55:21 +01:00 |
|
atm-lena
|
8db75f0d04
|
WIP
|
2022-02-08 15:54:31 +01:00 |
|
Laurent Destailleur
|
902246e50b
|
Fix phpcs
|
2022-01-31 14:05:30 +01:00 |
|
Laurent Destailleur
|
ffbeda50bd
|
Better picto for collpase of sub-bom
|
2022-01-29 00:07:04 +01:00 |
|
Laurent Destailleur
|
d72538506f
|
Merge pull request #19935 from atm-adrien/NEW_SUB_BOM_develop
NEW : Sub-bom
|
2022-01-28 19:01:30 +01:00 |
|
stickler-ci
|
9342fa8781
|
Fixing style errors.
|
2022-01-26 14:15:53 +00:00 |
|
Adrien Raze
|
6d3066a312
|
FIX : Fixing trads
|
2022-01-26 14:46:45 +01:00 |
|
Adrien Raze
|
36068d4279
|
FIX : Fixing total errors
|
2022-01-26 14:41:36 +01:00 |
|
Laurent Destailleur
|
3e1cfc2997
|
NEW Add status "Obsolete" to KM articles
|
2022-01-26 11:29:27 +01:00 |
|
Adrien Raze
|
08d830f450
|
FIX : Fixing total_cost, qty_frozen and display problems
|
2022-01-25 16:40:28 +01:00 |
|
Adrien Raze
|
f37c04bc2f
|
NEW : Add the possibility to add sub-BOMs to BOM
|
2022-01-25 12:06:40 +01:00 |
|
Adrien Raze
|
4edbd5c4e3
|
NEW : Creation of the function select_bom() used to display bom select list
|
2022-01-25 10:31:45 +01:00 |
|
Laurent Destailleur
|
cb45f79ab0
|
Fix scrutinizer
|
2022-01-13 20:16:12 +01:00 |
|