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 |
|
Laurent Destailleur
|
054116900a
|
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2022-01-13 11:59:05 +01:00 |
|
Laurent Destailleur
|
13510b9929
|
Clean sortfield, sortorder
|
2022-01-13 11:17:25 +01:00 |
|
ptibogxiv
|
61e6e33387
|
FIX bom.class.php
|
2022-01-11 20:37:20 +01:00 |
|
Laurent Destailleur
|
564bae453e
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
|
2022-01-10 21:00:38 +01:00 |
|
Laurent Destailleur
|
c334c3cd58
|
Update bom.class.php
|
2022-01-10 20:58:08 +01:00 |
|
Florian HENRY
|
f5c04c81a9
|
Merge branch 'new_refproduct_bom_tooltip' of github.com:FHenry/dolibarr into new_refproduct_bom_tooltip
|
2022-01-07 08:28:40 +01:00 |
|
Florian HENRY
|
59b1feaf2e
|
fix include
|
2022-01-07 08:27:49 +01:00 |
|