Commit Graph

700 Commits

Author SHA1 Message Date
Laurent Destailleur
eaa0e5eb3e CSS 2023-02-19 02:39:39 +01:00
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
Laurent Destailleur
43a0ccce2b Clean code 2023-01-04 11:37:24 +01:00
Laurent Destailleur
268f0b7c36
Merge pull request #23375 from grandoc/new_branch_30_12_2022
update code toward php8 compliance
2023-01-04 08:33:25 +01:00
atm-lena
6dbffb5398 Add price() to pricetonum() on bomline view 2023-01-02 09:48:34 +01:00
Laurent Destailleur
cdb9aa5ba0 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-12-30 13:29:06 +01:00
Laurent Destailleur
54936c916c Fix MO hang when no thirdparties are set 2022-12-30 13:27:12 +01:00
Philippe GRAND
4c51b2bb6b update code toward php8 compliance 2022-12-30 12:43:57 +01:00
Philippe GRAND
f6765fcd98 update code toward php8 compliance 2022-12-30 12:43:12 +01:00
Philippe GRAND
e5f08f6984 update code toward php8 compliance 2022-12-30 12:07:05 +01:00
Philippe GRAND
5b94ee35da update code toward php8 compliance 2022-12-30 12:04:55 +01:00
Laurent Destailleur
9319f56599 Fix css 2022-12-30 03:10:37 +01:00
Laurent Destailleur
a37c74374d
Merge pull request #23340 from Easya-Solutions/new-agenda-event-new-url-percentage-default
NEW remove default percentage for event creation url
2022-12-27 14:47:06 +01:00
VESSILLER
144a7e01b4 NEW remove default percentage for event creation url 2022-12-26 14:33:30 +01:00
Frédéric FRANCE
a08d84b995 fix code 2022-12-23 14:11:13 +01:00
Frédéric France
637fc95265 clean code 2022-12-22 22:29:24 +01:00
Laurent Destailleur
91f725447a
Merge pull request #23305 from lamrani002/kanbanBomList
New mode view "Kanban" for BOM list
2022-12-21 20:46:05 +01:00
Lamrani Abdel
cfced376ef New mode view for BOM list 2022-12-21 18:18:38 +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
Laurent Destailleur
d911f13ca0
Update ajax.php 2022-09-13 01:40:37 +02:00
Laurent Destailleur
7dbde6f934
Merge branch 'develop' into develop_NEW_Service_DefaultWorkstation 2022-09-13 01:38:49 +02:00
Laurent Destailleur
69fbd6be40
Merge branch 'develop' into patch-511 2022-09-13 01:32:48 +02:00