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 |
|
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 |
|