Commit Graph

649 Commits

Author SHA1 Message Date
Laurent Destailleur
19bfb021e1 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-13 13:51:35 +01:00
Laurent Destailleur
df6d33603d
Merge pull request #23871 from atm-adrien/FIX_MRP_fixes_2
FIX : Multiples fix for MRP
2023-02-10 19:33:55 +01:00
stickler-ci
218d7cf148 Fixing style errors. 2023-02-10 13:47:46 +00: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
Adrien Raze
38eee02272 FIX : Make bom_net_needs list standard 2023-02-08 17:34:50 +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
Adrien Raze
a254462bc9 FIX : Sub-BOM's services prices were not good 2023-02-02 17:58:54 +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
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
Laurent Destailleur
5c6d0bc26f Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-30 03:01:13 +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
d0e9290daf NEW An external module can modify the quick search fields 2023-01-25 15:27:10 +01:00
FLIO
02f4f47083 fix (qodana) Return value type is not compatible with declared 2023-01-24 23:11:28 +01:00
Christian Humpel
fb2d9b315a Fix bracket. 2023-01-22 22:31:46 +01:00
Laurent Destailleur
1a2b48c575 Fix kanban 2023-01-18 23:07:34 +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
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
ptibogxiv
a2c564d5b5
Fix php 8 error 2023-01-08 13:12:56 +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
Laurent Destailleur
9aa6e59f9b Look and feel v18 2023-01-05 04:04:16 +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