Commit Graph

273 Commits

Author SHA1 Message Date
Laurent Destailleur
12bd795afc Work on Kanban view 2023-03-01 20:13:21 +01:00
Laurent Destailleur
ed5c890769 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-25 20:12:48 +01:00
Laurent Destailleur
cbb6ca071a Fix #yogosha15157 2023-02-25 19:51:05 +01:00
Laurent Destailleur
1554a54e17 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-09 19:41:55 +01:00
Laurent Destailleur
2a83487c46 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-09 19:37:33 +01:00
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
Frédéric FRANCE
1fa1d11500 Merge remote-tracking branch 'upstream/develop' into ajaxtooltip 2023-02-09 15:26:40 +01:00
Frédéric FRANCE
dc15349e83 clean code 2023-02-06 21:43:50 +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
Frédéric FRANCE
b238830c82 keep original label 2023-02-05 23:19:56 +01:00
Frédéric FRANCE
8b6bb4161c fix tooltip 2023-02-05 16:02:03 +01:00
Frédéric FRANCE
04610763aa Merge remote-tracking branch 'upstream/develop' into ajaxtooltip 2023-02-04 18:31:40 +01:00
Frédéric FRANCE
41dd574b16 clean js 2023-02-02 22:59:54 +01:00
Frédéric FRANCE
ba2f87d307 add ajax tooltip on contract 2023-02-02 21:57:34 +01:00
Frédéric FRANCE
a5b1f8c20e add ajax tooltip on bom 2023-02-02 21:29:23 +01:00
FLIO
0080b0a80f fix (qodana) fix condlicts 2023-02-01 23:38:49 +01:00
Laurent Destailleur
9fb08b5a0a Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-31 21:28:59 +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
FLIO
02f4f47083 fix (qodana) Return value type is not compatible with declared 2023-01-24 23:11:28 +01:00
Laurent Destailleur
0f475783de Enhance method getKanbanView 2023-01-18 22:27:52 +01:00
Laurent Destailleur
80d46a22f1 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-18 21:36:57 +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
50db6de309 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-01-18 00:20:53 +01:00
Regis Houssin
481215eef4 FIX Multicompany use "element" name and not "table_element" 2023-01-16 14:40:35 +01:00
Laurent Destailleur
93f5c69b1c Merge pull request #23416 from Humml87/develop_REST_BOM_Ref_NextNum
Fix: #23415 REST BOM API - It's able to have a wrong value on the 'ref' Field
2023-01-07 10:31:20 +01:00
Christian Humpel
5b2c2335b0 strtolower for keyword 'auto' 2023-01-05 11:55:37 +01:00
stickler-ci
18550211c8 Fixing style errors. 2023-01-04 17:32:30 +00:00
Christian Humpel
de4986a570 integrate auto increment on 'auto' keyword. 2023-01-04 18:14:58 +01:00
Christian Humpel
b72a1c9964 Rename Methode "checkRefNumbering". 2023-01-04 17:41:26 +01:00
Christian Humpel
7d5dec6bb7 Remove comment. 2023-01-04 16:39:50 +01:00
Christian Humpel
78b12c8298 Fix: #23415 correct numbering on 'ref'. 2023-01-04 16:33:39 +01:00
Laurent Destailleur
43a0ccce2b Clean code 2023-01-04 11:37:24 +01:00
Lamrani Abdel
cfced376ef New mode view for BOM list 2022-12-21 18:18:38 +01:00
stickler-ci
b597a43b21 Fixing style errors. 2022-12-14 08:37:30 +00:00
atm-lena
7c352c9cef BOM : calculate total cost of lines 2022-12-09 17:00:11 +01:00
atm-lena
816fea753e Extrafields BomLine 2022-12-05 12:30:26 +01:00
Alexandre SPANGARO
c674f00cb2 Use isModEnabled 2022-09-25 15:27:42 +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
Laurent Destailleur
7dbde6f934 Merge branch 'develop' into develop_NEW_Service_DefaultWorkstation 2022-09-13 01:38:49 +02:00
Laurent Destailleur
6b3095ae9a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-08 14:10:28 +02:00
atm-lena
1b5636ff66 Fix stickler 2022-09-08 11:58:18 +02:00
atm-lena
8152e3f82a Clean code 2022-09-08 11:43:48 +02:00
atm-lena
81ed97e9fc Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-09-08 11:21:05 +02:00