Commit Graph

603 Commits

Author SHA1 Message Date
Laurent Destailleur
1873371616 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-02-09 18:08:23 +01:00
Laurent Destailleur
6cb6098d3c
Merge pull request #23818 from altairis-benjamin/discountOnBom
FIX discount wasn't taken into account when adding a line in BOM
2023-02-09 15:27:46 +01:00
Benjamin Falière
016d1117a6 added my name to the file 2023-02-06 18:02:28 +01:00
Benjamin Falière
fc767cbfbe FIX discount wasn't taken into account when adding a line in BOM 2023-02-06 17:56:21 +01:00
Laurent Destailleur
5e8e4551fb Debug v17 2023-01-31 20:07:08 +01:00
Laurent Destailleur
99f26b49b7 Trans 2023-01-31 19:46:02 +01:00
Laurent Destailleur
52267efb99 Fix filter must use the Dolibarr filter syntax 2023-01-31 18:18:33 +01:00
Adrien Raze
1200174b83 FIX : The folder on BOM card who display or not the sub BOM was not working 2023-01-26 18:03:18 +01:00
Adrien Raze
331dd7d479 FIX : Sub-Bom indentations were not good 2023-01-26 15:56:04 +01:00
Adrien Raze
777cfd5753 FIX : Sub-Bom costs were not good 2023-01-26 15:26:24 +01:00
Laurent Destailleur
c60a40f245
Merge pull request #23580 from hregis/fix_multicompany_compatibility
FIX Multicompany use "element" name and not "table_element"
2023-01-18 20:30:46 +01:00
Laurent Destailleur
74085bb1de
Merge pull request #23608 from atm-adrien/17.0_FIX_Sub_bom_costs
FIX : Sub bom costs were not good
2023-01-18 20:10:14 +01:00
Laurent Destailleur
50db6de309 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-01-18 00:20:53 +01:00
stickler-ci
82cccc82f5 Fixing style errors. 2023-01-17 19:23:01 +00:00
Adrien Raze
0d134f62ac FIX : Sub bom costs were not good 2023-01-17 17:22:32 +01:00
Regis Houssin
481215eef4 FIX Multicompany use "element" name and not "table_element" 2023-01-16 14:40:35 +01:00
Laurent Destailleur
dd0f885765
Merge pull request #23217 from atm-lena/16.0_FIXBOM_CalculatePrice
16.0 FIX Bom Calculate Price
2023-01-13 20:43:55 +01:00
atm-lena
6dbffb5398 Add price() to pricetonum() on bomline view 2023-01-02 09:48:34 +01:00
Laurent Destailleur
54936c916c Fix MO hang when no thirdparties are set 2022-12-30 13:27:12 +01:00
Laurent Destailleur
9319f56599 Fix css 2022-12-30 03:10:37 +01:00
stickler-ci
48b4caaa70 Fixing style errors. 2022-12-19 09:41:39 +00:00
atm-lena
654b75de9f Merge branch '16.0_FIXBOM_CalculatePrice' of github.com:atm-lena/dolibarr into 16.0_FIXBOM_CalculatePrice 2022-12-19 10:40:17 +01:00
Laurent Destailleur
3b87aadc48 Debug v17 2022-12-16 12:59:47 +01:00
atm-lena
1ebd2135e0 Fix stickler error 2022-12-15 15:00:27 +01:00
stickler-ci
b597a43b21 Fixing style errors. 2022-12-14 08:37:30 +00:00
atm-lena
92bff0fcfb Missing Unit TD for sub-bom lines 2022-12-12 11:41:54 +01:00
atm-lena
7c352c9cef BOM : calculate total cost of lines 2022-12-09 17:00:11 +01:00
stickler-ci
d522e96744 Fixing style errors. 2022-12-05 11:33:44 +00:00
atm-lena
816fea753e Extrafields BomLine 2022-12-05 12:30:26 +01:00
Maxime Kohlhaas
eb7222227d Fix : use count() in lists - part 3 2022-11-26 01:53:18 +01:00
Faustin
fadc54b9dc checkbox colum on left for bom list 2022-11-19 16:43:02 +01:00
lmarcouiller
bbebdbb840 Fix php 8.1 warnings 2022-10-28 15:48:46 +02:00
Laurent Destailleur
221b2dc288 Standardize code 2022-10-10 10:46:46 +02:00
Laurent Destailleur
bdeac7b7ab
Merge pull request #22185 from dolibit-ut/patch-555
Update bom_note.php
2022-09-25 17:14:28 +02:00
Laurent Destailleur
259ef24cef
Merge pull request #22189 from dolibit-ut/patch-559
Update bom_card.php
2022-09-25 17:14:18 +02:00
Laurent Destailleur
3e8d1181fe
Merge pull request #22401 from aspangaro/17p6
Use isModEnabled
2022-09-25 17:03:42 +02:00
Alexandre SPANGARO
d06fef47f8 Use isModEnabled 2022-09-25 15:28:36 +02:00
Alexandre SPANGARO
c674f00cb2 Use isModEnabled 2022-09-25 15:27:42 +02:00
Laurent Destailleur
2fddba4a3b
Merge pull request #22186 from dolibit-ut/patch-556
Update bom_net_needs.php
2022-09-25 14:48:52 +02:00
Laurent Destailleur
5e4e3265a3
Merge pull request #22187 from dolibit-ut/patch-557
Update bom_list.php
2022-09-25 14:48:32 +02:00
Laurent Destailleur
3adb60660c
Merge branch 'develop' into patch-559 2022-09-25 14:33:36 +02:00
Laurent Destailleur
58e96a1db8
Merge pull request #22188 from dolibit-ut/patch-558
Update bom_document.php
2022-09-25 14:27:37 +02:00
Laurent Destailleur
b3e0fddb1b
Merge pull request #22190 from dolibit-ut/patch-560
Update bom_agenda.php
2022-09-25 14:27:16 +02:00
Alexandre SPANGARO
aec9a7a60d Use isModEnabled 2022-09-25 06:30:09 +02:00
Laurent Destailleur
388dd6395b Clean code 2022-09-22 14:06:50 +02:00
Laurent Destailleur
6fb9a4713c Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-21 01:30:40 +02:00
atm-lena
5843cc8cb6 Bom services : fix calcul of cost for line without workstation 2022-09-16 11:11:20 +02:00
atm-lena
2c017d4f78 Clean 2022-09-15 16:04:32 +02:00
atm-lena
6a15962477 CalculateCosts function : add hook 2022-09-15 16:02:49 +02:00
Laurent Destailleur
6cf5c51f0b Fix phpunit 2022-09-13 02:33:49 +02:00