Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
112,767 Commits 35 Branches 179 Tags 1.7 GiB
e3a0220658
Commit Graph

99909 Commits

Author SHA1 Message Date
Laurent Destailleur
24bc8d022f Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-18 00:14:24 +01:00
Laurent Destailleur
708e284381 Enhance backward compatibility 2023-01-18 00:13:21 +01:00
Regis Houssin
e5d4ea1b7c FIX error with dol_banner_tab, ref is needed 2023-01-17 18:30:06 +01:00
Florian HENRY
dbc9ca9816 FIX: missing token on Supplier proposal links 2023-01-16 22:17:22 +01:00
Florian HENRY
90137268a1 FIX: missing tokan on Supplier proposal links 2023-01-16 22:15:02 +01:00
Maxime Kohlhaas
b54a15f504 Fix missing keywords in dol_dir_list_in_database 2023-01-15 09:11:29 +01:00
Laurent Destailleur
ebaae53335
Merge pull request #23526 from FHenry/16_fix_volume_pdf 
Fix: make PDF custom volume work as it work on expedition/card.php
 2023-01-13 21:04:18 +01:00
Laurent Destailleur
a67fe03aed
Merge pull request #23551 from Hystepik/develop_v16#1 
Fix #23531 : fix update bom line
 2023-01-13 20:45:09 +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
Laurent Destailleur
40e956646d
Merge pull request #23523 from altairis-noe/status_for_inventory_update 
FIX: do not let closed inventories reset stock with URL
 2023-01-13 13:22:47 +01:00
hystepik
04ce79191f Fix #23531 : fix update bom line 2023-01-13 12:18:58 +01:00
Laurent Destailleur
efa9b4da33
Merge pull request #21528 from atm-GregM/FIX_dolibarr_15.0_disabled_contacts_not_returned_create_invoice 
FIX contacts disabled are not returned on create invoice
 2023-01-13 12:17:40 +01:00
Florian HENRY
534cb8f0a0 fix: token for scan inventory 2023-01-13 09:55:57 +01:00
Florian HENRY
4fdf930269 make PDF custom volume work as it work on expedition/card.php 2023-01-12 12:49:45 +01:00
Laurent Destailleur
24651aaa6c FIX #22731 #23524 2023-01-12 12:41:02 +01:00
Laurent Destailleur
ce934a813b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-12 11:48:58 +01:00
Laurent Destailleur
684716e15b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-12 11:43:43 +01:00
Noé Cendrier
272f131b07 do not let closed inventories reset stock with URL 2023-01-12 10:18:47 +01:00
Regis Houssin
968c50d6f9 FIX wrong stock list with multicompany and without stock sharing 2023-01-12 09:49:12 +01:00
Laurent Destailleur
2ec9d9d409 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-11 21:21:15 +01:00
Laurent Destailleur
e1ea849701 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-11 21:20:10 +01:00
Laurent Destailleur
367987e2f3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-11 21:19:39 +01:00
Laurent Destailleur
e27875142c
Merge pull request #23465 from Easya-Solutions/14.0_fix-muscadet-hide-details 
FIX hide details option in supplier order PDF model
 2023-01-11 21:15:40 +01:00
Sébastien NASSIET
2bce74d2e2
Merge branch 'Dolibarr:16.0' into 16.0 2023-01-11 21:07:31 +01:00
Sébastien NASSIET
4a40039f56 correction bug selection contact dans emailing 2023-01-11 21:06:55 +01:00
Laurent Destailleur
a0e723a05b Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-11 21:05:19 +01:00
Laurent Destailleur
356accd6ee Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-11 21:05:09 +01:00
Laurent Destailleur
ed6a46eb20
Merge pull request #23504 from atm-maxime/fix_invoicesupprec_pdfmodel 
Fix supplier reccurent invoice if no pdf model
 2023-01-11 19:25:22 +01:00
Florian HENRY
45725a1e97 fix: display True volume in PDF 2023-01-11 17:58:26 +01:00
Noé Courtier
cfb16cc9cd FIX: ref not available after ecmFile create() 2023-01-11 16:49:59 +01:00
Maxime Kohlhaas
c0a7bca04e Fix supplier reccurent invoice if no pdf model 2023-01-11 10:50:58 +01:00
Laurent Destailleur
2da8c1d9bc Fix rounding 2023-01-10 11:33:17 +01:00
Florian HENRY
403f5a33ee Merge branch '16.0' of github.com:Dolibarr/dolibarr into 16_fix_reminder_type_label 2023-01-09 16:15:39 +01:00
Laurent Destailleur
ccf231bc44 Fix sql error 2023-01-09 16:01:20 +01:00
Florian HENRY
6c373c9381 fix: reminder type label 2023-01-09 15:50:55 +01:00
hystepik
4e0ea65c43 Fix #23466 : fix public payement pages ko and ok 2023-01-09 15:37:10 +01:00
VESSILLER
4c9d6b5e51 FIX hide details option in supplier order PDF model 2023-01-09 13:57:20 +01:00
Laurent Destailleur
98e61dc40d Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-07 17:29:24 +01:00
Laurent Destailleur
b2e51a5ef4
Merge pull request #23419 from atm-jpb/fix_border_left_photo 
FIX : add border left on image product when conf activated
 2023-01-07 10:28:47 +01:00
Laurent Destailleur
7218d8419f
Merge pull request #23434 from altairis-noe/too_much_br 
FIX: do not add <br> when dol_concatdesc already does it
 2023-01-07 03:38:57 +01:00
Laurent Destailleur
0eb0ee5bb1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-06 16:52:06 +01:00
Laurent Destailleur
2755e3dad7 Fix typo 2023-01-06 15:53:25 +01:00
Laurent Destailleur
099a9e5253
Merge pull request #23425 from marcusdeangabriel/16.0 
Added &$arrayfields to $parameters so that hooks can manipulate list columns.
 2023-01-06 15:52:19 +01:00
Laurent Destailleur
b8c8a5d487 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-06 12:09:33 +01:00
Laurent Destailleur
68e4e71005 FIX: Amount of localtax1 and 2 not correctly save on purchase order (the 
rate was saved instead)
 2023-01-06 12:08:40 +01:00
Noé Cendrier
10018d48a9 do not add <br> when dol_concatdesc already does it 2023-01-06 11:46:59 +01:00
Gauthier PC portable 024
e7d31a821c FIX : hierarchyme and not hierachyme 2023-01-05 15:41:57 +01:00
Laurent Destailleur
a892ef56ab
Merge pull request #23422 from Dolibarr/fix_fatal_error_on_task_list_time_to_bill 
FIX #23420 : wrong check on $search_categ value causing FATAL ERROR
 2023-01-05 14:47:43 +01:00
mgabriel
a7de5e4c72 Added &$arrayfields to $parameters so that hooks can manipulate list columns. 2023-01-05 11:59:43 +01:00
Théo David
665fd9cc0e FIX : wrong check on $search_categ value causing fatal error 2023-01-05 10:46:08 +01:00
jpb
9a755d8d50 add border left on image product when conf activated 2023-01-05 10:24:17 +01:00
Laurent Destailleur
25eac607eb
Merge pull request #23407 from daraelmin/daraelmin-patch-2 
Fix v14 fatal error undefined fct lenght_accounta
 2023-01-04 17:48:08 +01:00
Laurent Destailleur
cbfbb88a84 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-04 15:18:28 +01:00
Laurent Destailleur
2378f8067b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-04 15:18:13 +01:00
Laurent Destailleur
539d4936aa Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-04 15:17:00 +01:00
Laurent Destailleur
7197085126 FIX saving of numbering module for jobs 2023-01-04 15:16:40 +01:00
stickler-ci
1d29400cdf Fixing style errors. 2023-01-04 08:15:39 +00:00
daraelmin
23d535197d
Fix v14 fatal error undefined fct lenght_accounta 
Following #23403
See https://www.dolibarr.fr/forum/t/erreur-fatal-paiements-divers-v15-0-3/41914
 2023-01-04 09:13:40 +01:00
ptibogxiv
70f9e7881b
Fix error when no category selected 
empty pages when searching with no category of producted selected
 2023-01-03 19:46:05 +01:00
Florian HENRY
797b9c9054 dfelete cem data on product deletion 2023-01-03 11:42:39 +01:00
Laurent Destailleur
deb110d556 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-03 02:35:13 +01:00
Laurent Destailleur
ba5cc3870e Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-03 02:35:01 +01:00
Laurent Destailleur
10674a59bb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-03 02:33:59 +01:00
Laurent Destailleur
94fb344bd6 FIX #22271 2023-01-03 02:03:23 +01:00
Laurent Destailleur
af45ef8799
Merge pull request #23294 from atm-gauthier/fix_multicurrency_when_create_order_from_propal 
FIX : get multicurrency infos of propal when create order from propal…
 2023-01-03 01:36:57 +01:00
atm-lena
6dbffb5398 Add price() to pricetonum() on bomline view 2023-01-02 09:48:34 +01:00
Francis Appels
cef9a8e8d4 Fix Price by qty for multiprices 2022-12-31 13:42:18 +01:00
Laurent Destailleur
534db40d87 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-30 04:15:10 +01:00
Laurent Destailleur
dfa13ea255 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-30 03:11:10 +01:00
Laurent Destailleur
9319f56599 Fix css 2022-12-30 03:10:37 +01:00
Eric Seigne
2aa271d96e avoid editretainedwarranty if invoice is not draft 2022-12-28 17:50:16 +01:00
Laurent Destailleur
6cb364faf8
Merge pull request #23312 from ksar-ksar/patch-19 
FIX #23281
 2022-12-28 02:39:01 +01:00
Laurent Destailleur
d0ea4760d9
Update perms.php 2022-12-28 02:38:40 +01:00
Laurent Destailleur
8d4faf3530 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-27 11:19:11 +01:00
Laurent Destailleur
912428f5a1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-27 11:14:40 +01:00
Laurent Destailleur
a17c417205
Merge pull request #23018 from Easya-Solutions/14.0_fix-22837 
FIX #22837
 2022-12-27 00:26:52 +01:00
Laurent Destailleur
1d7c550adb Fix add BARCODE_INIT_MAX to solve timeout in barcode generation 2022-12-26 16:09:05 +01:00
Laurent Destailleur
6551b8afcc Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-26 15:28:11 +01:00
Laurent Destailleur
bbb775bd11 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-26 15:27:46 +01:00
Laurent Destailleur
04b38997c6 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-26 15:21:22 +01:00
Laurent Destailleur
76b7f80443 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-26 15:20:28 +01:00
Laurent Destailleur
11c86416a9 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-12-26 15:15:13 +01:00
Laurent Destailleur
f6149903dc FIX bad selection of barcode numbering module 2022-12-26 15:08:51 +01:00
ksar
1b03c423b9
FIX #23281 2022-12-22 17:13:11 +01:00
stickler-ci
56d05c09b2 Fixing style errors. 2022-12-22 13:52:39 +00:00
IC-Florian
2a68836375
New require for product in generateOutputField 2022-12-22 14:52:03 +01:00
Laurent Destailleur
e12ef6735f
Merge pull request #23250 from daraelmin/patch-7 
Fix #23077 - Cannot update subscription note
 2022-12-22 14:40:57 +01:00
Laurent Destailleur
2b106519e2
Merge pull request #23269 from inovea-conseil/FIX#23072 
FIX#23072
 2022-12-22 14:28:16 +01:00
Laurent Destailleur
5e7a8012f5
Merge pull request #23262 from inovea-conseil/FIX23238 
When no language selected, value is 0 so it enters in the condition f…
 2022-12-22 13:53:35 +01:00
Laurent Destailleur
17efd55af4
Merge branch '16.0' into FIX#23087 2022-12-22 13:46:36 +01:00
Laurent Destailleur
dc1c31c948 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-21 21:00:57 +01:00
Laurent Destailleur
8d2dde99ae Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-21 20:57:13 +01:00
Laurent Destailleur
8e914b2423 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-21 20:47:09 +01:00
Laurent Destailleur
c3ada976e1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-21 20:46:56 +01:00
Laurent Destailleur
f87b6d7ede
Merge pull request #23260 from braito4/patch-2 
php 8 warning
 2022-12-21 20:45:38 +01:00
Laurent Destailleur
1681674cdf
Update card.php 2022-12-21 20:45:11 +01:00
Gauthier PC portable 024
2c7e0afabd FIX : travis 2022-12-21 17:17:33 +01:00
Gauthier PC portable 024
69b0cf9bcf FIX : include class multicurrency 2022-12-21 14:05:54 +01:00
Gauthier PC portable 024
b38f163b02 Merge branch 'fix_multicurrency_when_create_order_from_propal' of github.com:atm-gauthier/dolibarr into fix_multicurrency_when_create_order_from_propal 2022-12-21 12:31:48 +01:00
Gauthier PC portable 024
a48d1ae8e3 FIX : multicurrency_tx and not currency_tx 2022-12-21 12:31:24 +01:00
IC-Florian
471260738a
FIX : Product list in setup.php in new Module 2022-12-21 12:03:32 +01:00
stickler-ci
3b9d39c1d2 Fixing style errors. 2022-12-21 10:00:26 +00:00
Gauthier PC portable 024
0582653a67 FIX : get multicurrency infos of propal when create order from propal with "WORKFLOW_PROPAL_AUTOCREATE_ORDER" conf 2022-12-21 10:55:03 +01:00
Mathieu
a4d5a7ed1f FIX#23072 2022-12-20 12:36:50 +01:00
Florian
2f64eaff05 FIX : CI 2022-12-20 12:25:20 +01:00
Florian
ec32d284eb FIX : Product list in setup.php in new Module 2022-12-20 11:31:44 +01:00
Iliès BENYAHIA
a08c468a5e When no language selected, value is 0 so it enters in the condition filter_lang != '' anyway 2022-12-20 11:00:41 +01:00
Braito
55b51b94f1
php 8 warning 2022-12-20 10:13:47 +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
daraelmin
6a658499e7
Fix #23077 - Cannot update subscription note 2022-12-17 21:16:03 +01:00
Laurent Destailleur
f1d83b695a
Merge pull request #23166 from atm-lena/16.0_FIX_DeleteMOAndLinks 
Delete MO :  object's links must be deleted
 2022-12-17 01:46:42 +01:00
hystepik
c0a0b977bf Fix #19485 : add of missing tickets trad key for menu 2022-12-16 16:20:43 +01:00
atm-lena
eff01374b1 Change place of deleteobjectlinked in deletecommon function 2022-12-15 15:09:50 +01:00
atm-lena
1ebd2135e0 Fix stickler error 2022-12-15 15:00:27 +01:00
Laurent Destailleur
dac8d5c952
Merge pull request #23219 from sebastien-prudhomme/fix-23019 
FIX #23019 Impossible to add task times to an existing draft invoice
 2022-12-14 18:38:53 +01:00
Laurent Destailleur
80ac95a158
Merge pull request #23218 from atm-gauthier/fix_missing_method_declarations 
FIX : methods declaration (backport fix 67b9a7dc07d708231d12b5e588003…
 2022-12-14 18:33:18 +01:00
stickler-ci
70b6b3d82d Fixing style errors. 2022-12-14 15:21:42 +00:00
Gauthier PC portable 024
1a16e41ce3 FIX : Can't see all time spent by all user 2022-12-14 16:04:35 +01:00
hystepik
4c43d81872 Fix #23064 : diplays total at end of inter list 2022-12-14 15:39:02 +01:00
Sébastien Prud'homme
ed89005941 Fix #23019 Impossible to add task times to an existing draft invoice 2022-12-14 11:45:40 +01:00
Laurent Destailleur
66d4edb222 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-14 11:02:37 +01:00
Laurent Destailleur
62b0447c7b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-14 11:02:23 +01:00
stickler-ci
d679a32155 Fixing style errors. 2022-12-14 09:36:25 +00:00
Gauthier PC portable 024
b906619ce1 FIX : methods declaration (backport fix 67b9a7dc07) 2022-12-14 10:31:11 +01:00
Laurent Destailleur
348c54680e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-14 10:21:43 +01:00
Laurent Destailleur
64de591770 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-14 10:20:47 +01:00
stickler-ci
b597a43b21 Fixing style errors. 2022-12-14 08:37:30 +00:00
stickler-ci
24585cf61b Fixing style errors. 2022-12-14 02:45:20 +00:00
Henry
c4dbc5e6d6
Create invoice from Shipment - fix error of multicurrency code 2022-12-14 10:39:15 +08:00
Laurent Destailleur
402ff37465
Merge pull request #23159 from milenmk/v16-Wrong-invoice-amount-when-billing-Project-task-spent-time 
FIX|Fix [#23075]
 2022-12-14 01:57:53 +01:00
Laurent Destailleur
16fee3f8d8
Merge pull request #23190 from frederic34/parametersoreder 
fix parameters order
 2022-12-14 00:24:12 +01:00
Laurent Destailleur
df19840663
Merge pull request #23208 from Quentin-Seekness/patch-4 
Adding filter parameters
 2022-12-14 00:01:24 +01:00
Laurent Destailleur
fe1fafa816 Fix edition of product notes 2022-12-13 11:47:06 +01:00
Quentin-Seekness
1d8cf1b44f
Add filter params 2022-12-13 11:29:28 +01:00
Quentin-Seekness
d98c998b8e
Adding filter parameters 
Adding filter parameters in addMoreActionsButtonsList Hook
 2022-12-13 11:26:53 +01:00
Aloïs Micard
8a1df1df92 Give order to inventory lines 2022-12-12 17:36:00 +01:00
Laurent Destailleur
76d5309c17 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-12 11:55:56 +01:00
Laurent Destailleur
38e58d9633 Fix link to set all perms has disappeared 2022-12-12 11:55:43 +01:00
atm-lena
92bff0fcfb Missing Unit TD for sub-bom lines 2022-12-12 11:41:54 +01:00
Frédéric FRANCE
c134090321 fix parameters order 2022-12-12 10:44:34 +01:00
Frédéric FRANCE
b8755bcf65 fix parameters order 2022-12-12 10:39:24 +01:00
atm-lena
95f437b45c deleteObjectLinked() in deleteCommon() function 2022-12-12 10:05:44 +01:00
Milen Karaganski
811e24fd7c Change to define unit price from timespent data instead from the user hourly rate 2022-12-10 21:15:00 +02:00
Juanjo Menent
9b3f6cfa5a Fix #23142 2022-12-09 20:38:44 +01:00
atm-lena
7c352c9cef BOM : calculate total cost of lines 2022-12-09 17:00:11 +01:00
Aloïs Micard
285731200a Add confirm_cancel action 2022-12-09 13:45:15 +01:00
atm-lena
93ee9a7496 Delete links when MO is deleted 2022-12-09 12:56:35 +01:00
Aloïs Micard
381b998413 Display blank td when action is confirm_valid 2022-12-09 11:45:09 +01:00
Milen Karaganski
ee7e394ebf FIX|Fix [#23075] 
Wrong invoice unit price when billing Project task spent time
 2022-12-08 20:22:41 +02:00
Laurent Destailleur
5573b88df8
Merge pull request #23133 from milenmk/16-holidays-list-error-message 
FIX|Fix[#23117]
 2022-12-07 17:14:06 +01:00
Milen Karaganski
2a16198981 Put back error counter $nbignored++; 2022-12-07 17:09:54 +02:00
Laurent Destailleur
28e56de8fd Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-07 12:38:10 +01:00
Laurent Destailleur
4d06e88f19 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-07 12:36:51 +01:00
Laurent Destailleur
f6289297da FIX #21280 FIX #23008 2022-12-07 12:35:54 +01:00
Milen Karaganski
9b8940ac15 FIX|Fix[#23117] 
Error message not displayed, when trying to mass-delete validated OR approved holiday requests
 2022-12-07 00:13:11 +02:00
Laurent Destailleur
7dd0c6646d
Merge pull request #23114 from aspangaro/14p42 
Fix CSS
 2022-12-06 21:06:53 +01:00
Laurent Destailleur
37e91fa6bf
Merge pull request #23066 from FHenry/14_fix_stats_propal_order 
FIX: propal and order stats broken on Tag+User(retricted customer list)
 2022-12-06 21:04:55 +01:00
Laurent Destailleur
ba582963d6 Fix typo 2022-12-06 19:56:49 +01:00
Laurent Destailleur
ac8914eb19 FIX #23115 FIX #23116 2022-12-06 19:25:56 +01:00
Alexandre SPANGARO
a107c81bf1 Merge branch '14.0' into 14p42 2022-12-06 04:53:10 +01:00
Alexandre SPANGARO
89b10b0dfb Fix css 2022-12-06 04:48:04 +01:00
Florian HENRY
f405f859ca ineer join is better than coma and where 2022-12-02 22:49:52 +01:00
Frédéric FRANCE
9f4182c924
fetch entity contact to take the right directory 2022-12-02 11:00:52 +01:00
Laurent Destailleur
8236ad34fa Fix revert a new feature that must be in develop 2022-12-01 18:34:20 +01:00
Laurent Destailleur
e8e9086c15
Merge pull request #22999 from inovea-conseil/FIX#20415 
FIX#20415
 2022-12-01 17:52:55 +01:00
Laurent Destailleur
9b5fc20308 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-01 17:46:13 +01:00
Laurent Destailleur
8a8f6e0c16 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-01 17:42:13 +01:00
Laurent Destailleur
cc982adc2f Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-01 17:42:02 +01:00
Noé Courtier
a4ac90a316 FIX: PGSQL Int type does not have a free lenght 2022-12-01 15:15:31 +01:00
Florian HENRY
8ddc4c8db6 FIX: propal and order stats broken on Tag+User(retricted customer list) 2022-12-01 14:28:00 +01:00
Laurent Destailleur
40a387898a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-01 11:49:32 +01:00
Laurent Destailleur
88aadae934 Fix barcode choice lost if error 2022-12-01 11:48:47 +01:00
Laurent Destailleur
804b806d02 Fix responsive 2022-12-01 11:37:56 +01:00
Laurent Destailleur
ad8546038f
Merge pull request #23043 from ibuiv/patch-4 
Fix #22494 Bad error message and trans missing (radio button)
 2022-12-01 11:09:30 +01:00
Eric Seigne
9a2ce53517 add stamp and signature in pictowithouttext list 2022-11-30 23:41:32 +01:00
Laurent Destailleur
f08870d91e Fix label of some fields in dictionaries 2022-11-30 16:57:26 +01:00
antonin_tdj
ef065967ed
Add $langs->load('errors') before radioError 
Add $langs->load('errors') before radioError
 2022-11-30 10:44:10 +01:00
antonin_tdj
f1132ef8ba
Revert add 'errors' on $langs->load 
Revert add 'errors' on $langs->load
 2022-11-30 10:42:44 +01:00
stickler-ci
87526194c5 Fixing style errors. 2022-11-29 19:44:44 +00:00
antonin_tdj
1394208de3
Update card.php add errors on langs 
errors added to langs object to improve error messages
 2022-11-29 20:39:40 +01:00
antonin_tdj
b713f645d4
Update extrafields.class.php error message 
adapt error message for radio buttons
 2022-11-29 20:35:43 +01:00
Laurent Destailleur
b15fda8d9a Debug edit actioncomm 2022-11-29 14:38:25 +01:00
VESSILLER
ad07fdfd79 FIX #22837 2022-11-27 01:06:40 +01:00
Laurent Destailleur
19c4258e2d
Merge pull request #23004 from nicolas-eoxia/fix_default_value_setSaveQuery 
FIX: #22509 default value on integer fields don't retrieve by setSaveQuery
 2022-11-26 16:37:17 +01:00
Laurent Destailleur
b522517c75
Merge pull request #22994 from ibuiv/patch-1 
Fix #20685 User Id not transmitted on Api addTimeSpent
 2022-11-26 11:30:47 +01:00
Laurent Destailleur
fa34ea3dc5
Merge pull request #22997 from SylvainLegrand/fix_#21357 
Fix #21357
 2022-11-26 10:57:18 +01:00
Laurent Destailleur
7884216197
Merge pull request #23003 from rycks/14_fix_api_status_on_delete 
fix #22766: better API response HTTP code
 2022-11-26 10:26:21 +01:00
Laurent Destailleur
37f4c846cb
Merge pull request #22996 from ATM-Nicolas/fix_api_documents_inconsistency 
FIX : Documents API inconsistency
 2022-11-26 10:22:58 +01:00
Laurent Destailleur
c8e5ca9691 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-11-26 01:54:53 +01:00
Laurent Destailleur
096bd39ae7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-11-26 01:54:17 +01:00
Laurent Destailleur
860f2414c4 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-11-26 01:46:37 +01:00
Laurent Destailleur
63541d1515 Fix phpcs 2022-11-26 01:45:58 +01:00
Laurent Destailleur
b231bcb64a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/bookkeeping/listbyaccount.php
	htdocs/accountancy/bookkeeping/listbysubaccount.php
 2022-11-26 01:21:51 +01:00
Laurent Destailleur
1921d427e9 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-11-26 01:14:09 +01:00
Laurent Destailleur
85e9ac1e40 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-11-26 01:13:58 +01:00
Nicolas Domenech
b98eaa4d45 #FIX: #22509 default value on integer fields don't retrieve by setSaveQuery 2022-11-26 01:01:22 +01:00
stickler-ci
3fd81293a3 Fixing style errors. 2022-11-25 23:57:35 +00:00
Eric Seigne
616e2b79ef fix #22766: better API response HTTP code 2022-11-26 00:50:45 +01:00
ATM-Nicolas
e767c9b4a9 FIX : Stickler 2022-11-26 00:42:50 +01:00
ATM-Nicolas
a0553c6e52 FIX : Stickler 2022-11-26 00:35:08 +01:00
Mathieu
99a34e23c8 FIX#20415 2022-11-26 00:33:23 +01:00
Mathieu
c49e7e882f FIX#20415 2022-11-26 00:20:27 +01:00
Sylvain Legrand
6768697497 Fix #21357 2022-11-26 00:13:15 +01:00
ATM-Nicolas
f3e689f841 FIX : Documents API inconsistency 2022-11-26 00:02:17 +01:00
antonin_tdj
59ec20f549
Fix #20685 User Id not transmitted on Api addTimeSpent 
Fix #20685 User Id not transmitted on Api addTimeSpent

The User ID will be transmitted to the API call (if 0 then, the user will be selected from API key)
 2022-11-25 23:44:32 +01:00
Laurent Destailleur
1ec862b491
Merge pull request #22982 from inovea-conseil/fix_19877 
FIX#19877
 2022-11-25 23:41:18 +01:00
Laurent Destailleur
42d09f597c
Merge pull request #22980 from inovea-conseil/FIX#19828 
FIX#19828
 2022-11-25 23:36:28 +01:00
stickler-ci
1d0f329ac5 Fixing style errors. 2022-11-25 22:15:01 +00:00
Bahfir Abbes
cbf103ef74
FIX for #22882 2022-11-25 22:58:51 +01:00
Mathieu
023bc7d20e FIX#19877 2022-11-25 22:29:44 +01:00
IC-Ilies
b5ab1f612c FIX#19828 2022-11-25 22:29:35 +01:00
Laurent Destailleur
f42f083d10 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-11-25 22:20:58 +01:00
ATM-Nicolas
3475e55b80 FIX : Bankaccounts API fetch with 'id' and 'socid' 2022-11-25 22:11:17 +01:00
Laurent Destailleur
03485a2f73
Merge pull request #22680 from OPEN-DSI/14.0_fix_start_cron_in_multientities_with_verif_test_condition 
FIX: Fix the position of the verification condition of the test field in case of multi entities
 2022-11-25 16:34:27 +01:00
Laurent Destailleur
317530fc8b Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-11-25 12:49:30 +01:00
Laurent Destailleur
45be6dd25b Prepare 16.0.3 2022-11-25 12:48:26 +01:00
stickler-ci
ec156ddf84 Fixing style errors. 2022-11-25 11:26:31 +00:00
Noé Courtier
043b2e9ea3 FIX: copy same behaviour in other accountancy files 2022-11-25 12:18:32 +01:00
Nicolas Domenech
f2f58e434e fix: can't use parameter morcss in select task because parameter is overwrite 2022-11-25 12:16:34 +01:00
Noé Courtier
2ada053855 FIX: Use the Hook addMoreActionsButtons resPrint 2022-11-25 11:44:34 +01:00
Maxime Kohlhaas
834d30b9d0 Fix expedition stats abstract method 2022-11-24 23:21:23 +01:00
Laurent Destailleur
dd50854b05 Fix log 2022-11-23 18:58:17 +01:00
Laurent Destailleur
4d11b5db31 Fix error management 2022-11-23 18:52:43 +01:00
Laurent Destailleur
459961711e Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-11-23 17:01:29 +01:00
Laurent Destailleur
1a8dbd75ea Fix update socialnetworks 2022-11-23 16:59:40 +01:00
Laurent Destailleur
39d8e44b3d
Merge pull request #22885 from alsoft10/16.0 
BUG FIXED #22883
 2022-11-23 12:38:59 +01:00
Laurent Destailleur
795895e18f
Merge pull request #22936 from Easya-Solutions/14.0_fix-get-next-value-year-on-one-digit 
FIX compute next value when year is on one digit for reset counter
 2022-11-23 12:33:27 +01:00
Laurent Destailleur
97863440cb
Merge pull request #22937 from atm-gauthier/FIX_total_invoice_on_show_objects_linked_bloc 
FIX : $sign is useless
 2022-11-23 12:27:50 +01:00
Laurent Destailleur
fb3bbee0a3
Merge pull request #22938 from Daviid-P/15.0 
FIX Broken Permissions check, $object is null.
 2022-11-23 12:22:21 +01:00
Laurent Destailleur
9a0b10bf9f Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-11-23 12:06:34 +01:00
Laurent Destailleur
207f56ff64 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-11-23 12:06:21 +01:00
Laurent Destailleur
2f0880020c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-11-23 12:02:25 +01:00
Laurent Destailleur
9ee4c73036 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-11-23 11:58:59 +01:00
Laurent Destailleur
c9930ee6ce Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-11-23 11:58:46 +01:00
David Pareja Rodriguez
05e850dbfc FIX Broken Permissions check, $object is null. 
This code was probably copy&paste'd from `htdocs/compta/prelevement/card.php` where the `$object` variable exists.

On `htdocs/compta/prelevement/line.php` `$object` is not defined, and `$type` come from the `$type = GETPOST('type', 'aZ09');` which ends up being overwritten with null.
 2022-11-23 11:58:21 +01:00
Gauthier PC portable 024
b77f63bc5c FIX : $sign is useless 2022-11-23 11:24:29 +01:00
VESSILLER
ed2a9a22e8 FIX compute next value when year is on one digit for reset counter 2022-11-23 08:36:20 +01:00
Laurent Destailleur
a59bdfba0c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-11-23 00:00:47 +01:00
Laurent Destailleur
5ad7894849 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2022-11-22 22:05:43 +01:00
Laurent Destailleur
2c1571c514 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2022-11-22 22:05:33 +01:00
Laurent Destailleur
f782ac6654 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2022-11-22 22:03:47 +01:00
Laurent Destailleur
1e54e695b2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2022-11-22 22:00:59 +01:00
stickler-ci
76fdf0006d Fixing style errors. 2022-11-22 20:17:37 +00:00
josett225
e38ef6bc8c Update create.php 2022-11-22 21:03:28 +01:00
Hasanuzzaman Sattar
b3f455e6db
Merge branch 'Dolibarr:16.0' into 16.0 2022-11-22 20:08:14 +05:30
ATM-Nicolas
3d9b2a1676 FIX : SQL request parenthesis 2022-11-22 15:32:37 +01:00
Maxime Kohlhaas
7be0e0da1c Fix API right check 2022-11-22 13:46:42 +01:00
Laurent Destailleur
d6b77b2404
Merge pull request #22904 from daraelmin/patch-4 
Fix #22675 - avoid warning when weight is empty
 2022-11-21 21:15:50 +01:00
Laurent Destailleur
e36afdbde9
Merge pull request #22909 from Humml87/16.0_Fix_#22768_MO_List_Filter 
Fix #22768 remove "natural_search" on status and fk_parent_line.
 2022-11-21 21:05:01 +01:00
Laurent Destailleur
af413cb09f Fix #yogosha13195 2022-11-21 15:12:46 +01:00
Laurent Destailleur
322124690c Fix sql syntax error 2022-11-21 14:47:31 +01:00
Laurent Destailleur
7c1eac9774 Fix sqli ->escape after ->escapeforlike 2022-11-21 03:58:22 +01:00
stickler-ci
b5cafeefcf Fixing style errors. 2022-11-20 23:16:19 +00:00
Christian Humpel
92647d30e7 Fix #22768 remove "natural_search" on status and fk_parent_line. 2022-11-21 00:07:50 +01:00
josett225
19273c8da1 Fix PaymentBankTransfer Line page management with Select and Input 2022-11-20 05:33:31 +01:00
daraelmin
4912f6a720
Fix #22675 - avoid warning when weight is empty 2022-11-19 22:15:58 +01:00
root
435b82bbc8 #22883 2022-11-18 19:03:39 +05:30
Hasanuzzaman Sattar
e364c399fd
Merge branch 'Dolibarr:16.0' into 16.0 2022-11-18 18:59:39 +05:30
kkhelifa
dff5f46749 Add for htdocs/public/cron/cron_run_jobs_by_url.php 2022-11-18 10:37:35 +01:00
Laurent Destailleur
e480b7cabb Fix phpunit error 2022-11-18 01:01:59 +01:00
Laurent Destailleur
a2e74e37f5 Fix missing GETPOST 2022-11-17 18:52:19 +01:00
root
bcb4919aa8 BUG FIXED #22883 2022-11-17 17:40:14 +05:30
Laurent Destailleur
328641dfa8 Fix empty list 2022-11-17 12:54:51 +01:00
Laurent Destailleur
53eb370c4e
Merge pull request #22863 from FHenry/fix_sec_dol_eval 
FIX: base64_decode shloud be forbiden in dol_eval
 2022-11-17 10:26:19 +01:00
Laurent Destailleur
b8e5b10cac Default field 2022-11-17 02:29:30 +01:00
Laurent Destailleur
c11d69dd21 Fix typo in tooltip 2022-11-17 02:26:02 +01:00
Laurent Destailleur
6684b3c96b Fix balance of columns 2022-11-17 02:13:01 +01:00
Laurent Destailleur
f145db3222 Fix useless left join 2022-11-17 01:15:18 +01:00
Laurent Destailleur
5b49021bb4 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-11-16 20:20:34 +01:00
Laurent Destailleur
23feae3ee2 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-11-16 20:07:51 +01:00
Laurent Destailleur
aaa2ad710c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-11-16 20:06:06 +01:00
Laurent Destailleur
45e3f19bd7 Fix remove files not expected 2022-11-16 20:05:52 +01:00
Laurent Destailleur
1e3e26e7f9 Fix use of the lowmemorydump for batch of backup 2022-11-16 14:00:52 +01:00
VESSILLER
10154cc357 FIX remove not initialized variable 2022-11-16 11:05:39 +01:00
VESSILLER
6e33d1e2b1 FIX merge errors on mailing card 2022-11-16 10:48:25 +01:00
Florian HENRY
85aa9f7481 FIX: base64_decode shloud be forbiden in dol_eval 2022-11-16 09:32:14 +01:00
Laurent Destailleur
25c074668d Fix perf index 2022-11-15 22:24:30 +01:00
Laurent Destailleur
2a13165218 Clean useless join 2022-11-15 22:12:53 +01:00
Laurent Destailleur
4d771ef726 Fix position of tables in sql request for better performance 2022-11-15 21:54:19 +01:00
Laurent Destailleur
de8f115f95 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-11-15 19:49:15 +01:00
Laurent Destailleur
3b1058ed72 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-11-15 19:44:55 +01:00
Laurent Destailleur
8ea9f11664 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-11-15 19:40:44 +01:00
Laurent Destailleur
81187106c1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-11-15 19:40:36 +01:00
Laurent Destailleur
f4b1d31013 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-11-15 19:36:37 +01:00
Laurent Destailleur
2f3cc7ce59 FIX Backup using the low memory mode 2022-11-15 19:02:56 +01:00
Laurent Destailleur
a5aab68958 Fix duplicate data c_action_trigger and c_tva 2022-11-15 13:53:45 +01:00
stickler-ci
c81c91755d Fixing style errors. 2022-11-15 10:55:09 +00:00
daraelmin
cd2b9538c1
FIx #18304 No adh create if error on public form 
FIX #18304 - Member subscription confirmation email sent even if mandatory fields are missing
 2022-11-15 11:51:20 +01:00
Laurent Destailleur
b8fb0e931e
Merge pull request #22845 from aspangaro/16p13 
FIX #22824 Accountancy - Journal - Search on subledger when list of subledger is disabled
 2022-11-14 22:25:45 +01:00
Laurent Destailleur
90b44fc184
Merge pull request #22743 from noec764/14_FixAssetsExtraFieldsList 
FIX: Wrong extrafields element in assets list
 2022-11-14 22:16:31 +01:00
Laurent Destailleur
989dfe0b9f
Merge pull request #22749 from atm-lena/16.0_FIX_LinkefObjectMO 
Fix Object Linked MO Line
 2022-11-14 22:16:09 +01:00
Alexandre SPANGARO
e604d18d01 FIX #22824 Accountancy - Journal - Search on subledger when list of subledger is disabled 2022-11-14 22:10:15 +01:00
Laurent Destailleur
0d7c9b0a84 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-11-14 22:02:49 +01:00
Laurent Destailleur
b766e6de66 FIX #22786 2022-11-14 21:08:54 +01:00
Laurent Destailleur
d54e63b60d FIX #22813 2022-11-14 20:51:52 +01:00
lmarcouiller
eb63c8c5c6 Fix #11555 : Message display on adherent public 2022-11-14 15:32:16 +01:00
Laurent Destailleur
7205901437
Merge pull request #22808 from frederic34/patch-7 
fix extrafields create in holiday card
 2022-11-12 12:37:58 +01:00
Laurent Destailleur
0e34d6d135
Merge pull request #22826 from ptibogxiv/patch-61 
Fix token error in price.php
 2022-11-12 11:45:28 +01:00
Laurent Destailleur
d05abce43f FIX edition notes 2022-11-11 16:24:07 +01:00
Laurent Destailleur
cba92c8bdd Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-11-11 15:28:04 +01:00
Laurent Destailleur
2155d56095 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-11-11 14:58:28 +01:00
Laurent Destailleur
886fa7a812 Fix phpcs 2022-11-11 14:57:02 +01:00
Laurent Destailleur
64b8f96ebb Prepare 16.0.2 2022-11-11 14:41:19 +01:00
ptibogxiv
5218b2f804
Fix token error in pice.php 2022-11-11 12:44:20 +01:00
Laurent Destailleur
b9228933b0 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-11-11 12:27:09 +01:00
Laurent Destailleur
a8bd198a21 FIX Subscription must be stopped when max of attendees reached. 2022-11-11 12:26:48 +01:00
Thomas Negre
dba6c68181 Fix supplier proposal clone : when a line subprice is empty, it should be saved as 0 in the Database, not null. 2022-11-10 16:55:23 +01:00
Frédéric FRANCE
5a1f1bf058
Update list.php 2022-11-10 10:12:46 +01:00
Frédéric FRANCE
8cb7b7e8ef
fix extrafields create in holiday card 2022-11-10 10:03:51 +01:00
Gauthier PC portable 024
af6a708523 FIX : Missing $object for online signature link build 2022-11-08 14:20:09 +01:00
stickler-ci
15a2f71534 Fixing style errors. 2022-11-08 08:55:25 +00:00
atm-lena
f4cf7363bd Clean code 2022-11-08 09:50:54 +01:00
atm-lena
0a9c0d704e Clean 2022-11-08 09:49:20 +01:00
atm-lena
d166ae9167 MOChild => Linked Object 2022-11-08 09:46:55 +01:00
Laurent Destailleur
e512c9aeee Fix trans 2022-11-07 14:04:01 +01:00
Laurent Destailleur
f038cca39e FIX Autosearch on takepos was broken 2022-11-06 22:47:56 +01:00
Laurent Destailleur
3abbda269b Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-11-05 15:39:50 +01:00
Laurent Destailleur
54c657e50c Fix negative reception was no more possible. Use hidden const to restore 2022-11-05 15:39:31 +01:00
Laurent Destailleur
060f7bf67c Fix bad td balance 2022-11-05 15:37:59 +01:00
Alexandre SPANGARO
221ce01cdc FIX Accountancy - Better warning for situation invoice in index 2022-11-05 08:02:56 +01:00
atm-lena
6dbc57998a Fix Object Linked MO Line 2022-11-04 11:51:47 +01:00
Florian HENRY
d375aca2c8 fix bad SQL parenthesis in notification 2022-11-04 11:29:52 +01:00
Noé Courtier
f85b6315fb FIX: Wrong Extrafields Element For Assets" 2022-11-03 16:46:15 +01:00
Laurent Destailleur
ecdc92e219
Merge pull request #22688 from altairis-noe/public_ticket_check 
FIX: check if contact is active before creating associated ticket
 2022-11-02 16:54:20 +01:00
Noé Cendrier
bcfcbf19ec strictly inferior, please 2022-11-02 14:11:37 +01:00
Laurent Destailleur
870ffb6dda
Update create_ticket.php 2022-11-02 01:10:17 +01:00
Laurent Destailleur
414b183ead
Update create_ticket.php 2022-11-02 01:07:31 +01:00
Laurent Destailleur
634348d048
Update create_ticket.php 2022-11-02 01:02:52 +01:00
Laurent Destailleur
53b0e49886
Merge pull request #22687 from FHenry/15_fix_propal_right 
15 fix propal right
 2022-11-02 00:39:02 +01:00
Laurent Destailleur
bc2e226ef8 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/societe/class/societe.class.php
 2022-11-02 00:19:23 +01:00
Laurent Destailleur
c28e6a46e2 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/install/step5.php
 2022-11-02 00:15:21 +01:00
Laurent Destailleur
ff16d74bd2 FIX install wizard error management 2022-11-02 00:00:02 +01:00
Laurent Destailleur
ab2d306abd
Merge pull request #22692 from thomas-Ngr/14.0_fix_propal_page_reload 
Fix propal page reload : use thirdparty values
 2022-11-01 23:33:23 +01:00
Laurent Destailleur
8e9be8f40f
Update card.php 2022-11-01 23:33:08 +01:00
Laurent Destailleur
8b3c73a96a
Merge pull request #22702 from OPEN-DSI/14.0_fix_request_sql_entity_filter_for_usergroup 
FIX: Fix the request SQL for transversal user
 2022-11-01 21:48:19 +01:00
Laurent Destailleur
39ef32326f Better responsive behaviour 2022-11-01 12:05:52 +01:00
Alexandre SPANGARO
d3d55240f9 FIX Accountancy - Review of Winfic - eWinfic - Winsis compta export format 2022-11-01 08:00:37 +01:00
Alexandre SPANGARO
4bd9bdaccd FIX Accountancy - Review of Winfic - eWinfic - Winsis compta export format 2022-11-01 07:56:24 +01:00
IC-faycal
5888f37677 FIX change in the communication status of the prospect 2022-10-31 13:53:26 +01:00
Laurent Destailleur
8158d6c73e Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-10-29 12:47:48 +02:00
Laurent Destailleur
8a599ec610 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-10-29 12:47:36 +02:00
Laurent Destailleur
c67f94ca4b Merge 2022-10-29 12:46:22 +02:00
kkhelifa
c4543eff73 FIX: Fix the request SQL for transversal user, the join on usergroup table must be with getEntity('usergroup') and not other element 2022-10-28 16:31:01 +02:00
Alexandre SPANGARO
f45f3740e2 FIX Accountancy - Review of Winfic - eWinfic - Winsis compta export format 2022-10-28 08:10:39 +02:00
Noé Cendrier
589df5e63d check if contact is active before creating associated ticket 2022-10-27 16:13:11 +02:00
Thomas Negre
02942e844e Fix propal page reload : use thirdparty values 2022-10-27 15:26:40 +02:00
Florian HENRY
15b19840fb fix: cannot edit propal note 2022-10-27 14:40:47 +02:00
Florian HENRY
346d6cec5a fix: cannot edit propal note 2022-10-27 14:40:16 +02:00
Florian HENRY
0f1b63ec9b fix: cannot edit propal note 2022-10-27 14:38:37 +02:00
Laurent Destailleur
873d66a1d3
Merge pull request #22670 from hregis/fix_can_not_set_prospect_status 
FIX can not set prospect status "Do not contact"
 2022-10-26 14:06:39 +02:00
Laurent Destailleur
f0c257f62e
Merge pull request #22617 from atm-jpb/FIX_task_never_deleted_in_bdd_on_deleted_project 
FIX : add loadRoleMode on getlinearray
 2022-10-26 13:59:49 +02:00
Regis Houssin
2281b187b7 FIX just add integer 2022-10-26 12:15:30 +02:00
lmarcouiller
791927723a Fix #22671 : fix permissions notes.tpl.php 2022-10-26 11:38:07 +02:00
Laurent Destailleur
bf794cacc0
Merge pull request #22615 from marc-dll/14.0_FIX_hidden_extrafields_update 
FIX: only modify hidden checkbox/multislected extrafields on update if they are provided in request
 2022-10-25 19:43:41 +02:00
Laurent Destailleur
f9f209b249
Merge pull request #22543 from atm-jpb/fix_short_civility_dict 
add short civility
 2022-10-25 17:27:03 +02:00
Laurent Destailleur
257e7f2191 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-10-24 19:41:04 +02:00
Laurent Destailleur
e9b80fa656 Fix phpcs 2022-10-24 19:40:51 +02:00
Laurent Destailleur
67ebdb12d2
Merge pull request #22642 from atm-gauthier/FIX/filter_on_product 
FIX : we must be able to select only bom of a specific product + seve…
 2022-10-24 19:35:36 +02:00
Laurent Destailleur
010177942e
Merge pull request #22641 from hregis/fix_avoid_unnecessary_multiple_calculation 
FIX avoid unnecessary multiple calculation (#22637)
 2022-10-24 19:29:49 +02:00
Laurent Destailleur
064f3dd209 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-10-24 19:11:59 +02:00
Laurent Destailleur
e76eb2680f Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-10-24 19:09:12 +02:00
Laurent Destailleur
a7a4e76194 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-10-24 19:07:10 +02:00
Laurent Destailleur
937840dbfe
Merge pull request #22655 from hregis/fix_avoid_access_forbidden_with_numeric_ref 
FIX avoid access forbidden with numeric ref
 2022-10-24 17:21:57 +02:00
Laurent Destailleur
6a145bd655
Merge pull request #22656 from atm-maxime/fix_api_product_attribute 
Fix api product : rang is now position
 2022-10-24 17:19:44 +02:00
Laurent Destailleur
f4d9301199
Merge pull request #22658 from ptibogxiv/patch-55 
Fix newpayment.php with stripeconnect
 2022-10-24 17:18:11 +02:00
Laurent Destailleur
8b52d108f2
Merge pull request #22662 from atm-maxime/fix_scrut2 
Fix scrutinizer api_thirdparties.class.php 5 issues
 2022-10-24 16:55:04 +02:00
Laurent Destailleur
9c776437c8
Merge pull request #22663 from atm-maxime/fix_product_import_finished 
Fix : remove duplicate code and fix #22176
 2022-10-24 16:53:48 +02:00
Regis Houssin
baccf336f2 FIX remove > 0 and -1 2022-10-24 16:41:31 +02:00
Gauthier PC portable 024
d9f067eabb FIX : travis & stickler feedbacks 2022-10-24 09:46:41 +02:00
Regis Houssin
83afee6047 FIX can not set prospect status "Do not contact" 2022-10-24 07:47:43 +02:00
Maxime Kohlhaas
92ad656bf0 Fix : dict data too long error 2022-10-23 12:06:13 +02:00
Maxime Kohlhaas
7bf0287c65 Fix : remove nonsense code 2022-10-23 11:46:15 +02:00
Maxime Kohlhaas
7e1a37c138 Fix : remove duplicate code and fix #22176 2022-10-23 11:35:58 +02:00
Maxime Kohlhaas
39934a9a81 Fix scrutinizer api_thirdparties.class.php 5 issues 2022-10-23 11:19:23 +02:00
Yoan Mollard
7ff84f4e42 Add help picto to remind users to respect SPF/DKIM in FROM e-mails 2022-10-23 03:25:55 +02:00
Yoan Mollard
57927cac06 Send expensereports-related e-mails from MAIN_MAIL_EMAIL_FROM address 2022-10-23 03:00:09 +02:00
stickler-ci
3cd11fefe9 Fixing style errors. 2022-10-22 17:43:17 +00:00
ptibogxiv
6c87982838
Fix newpayment.php with stripeconnect 2022-10-22 19:42:44 +02:00
Maxime Kohlhaas
2fa0e34b09 Fix api product : rang is now position 2022-10-22 15:32:54 +02:00
Regis Houssin
2bf2faef72 FIX avoid access forbidden with numeric ref 2022-10-22 09:22:12 +02:00
Laurent Destailleur
89261d51e3 css 2022-10-20 19:30:19 +02:00
Laurent Destailleur
84d47e9b0c Fix max nb of attendees reached 2022-10-20 19:26:24 +02:00
Laurent Destailleur
2d378ecede CSS 2022-10-20 19:16:25 +02:00
Laurent Destailleur
3e38d30956 Fix price must be including tax 2022-10-20 18:41:23 +02:00
Laurent Destailleur
2db3f6f709 Fix price style 2022-10-20 18:23:41 +02:00
Laurent Destailleur
d2ec128595 Fix field fk_user_create of event registration must be null 2022-10-20 18:14:00 +02:00
Gauthier PC portable 024
02d9c9897a FIX : bug on selected value for select_bom() function 2022-10-20 16:27:20 +02:00
Gauthier PC portable 024
06646d4540 FIX : php doc 2022-10-20 15:56:32 +02:00
Gauthier PC portable 024
c3fb0fde85 FIX : we must be able to select only bom of a specific product + several fixes on select_bom() function 2022-10-20 15:53:03 +02:00
Regis Houssin
765e619cee FIX avoid unnecessary multiple calculation (#22637) 2022-10-20 14:47:55 +02:00
Laurent Destailleur
69ca6c02d7 Add debug for ldap 2022-10-20 12:16:12 +02:00
Laurent Destailleur
b32ee6320d FIX Search on social networks 2022-10-19 17:03:13 +02:00
Laurent Destailleur
0d17026276 FIX Import contact when duplicate thirdparties 
FIX Import of socialnetwork field
 2022-10-19 16:19:22 +02:00
jpb
87339de68d add human readeable trad 2022-10-19 09:29:11 +02:00
Laurent Destailleur
2101611bd5 Fix title of emails sents on payment 2022-10-18 23:33:30 +02:00
Laurent Destailleur
8d82307956 Fix title of emails sents on payment 2022-10-18 23:33:22 +02:00
Laurent Destailleur
b562ab9948 Fix debug module eventorganization 2022-10-18 23:33:11 +02:00
Laurent Destailleur
2b2d01cdc9 Fix css 2022-10-18 23:32:58 +02:00
Laurent Destailleur
31ef942c96 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-10-18 23:09:52 +02:00
Laurent Destailleur
c5c9262a3c Fix template of emails 2022-10-18 23:09:19 +02:00
Laurent Destailleur
dcc7962757 Fix default email templates 2022-10-18 23:00:50 +02:00
Laurent Destailleur
c727ebd9dd Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-10-18 21:12:04 +02:00
Laurent Destailleur
9b09c07df6 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-10-18 19:31:29 +02:00
Laurent Destailleur
9c62169da7 Fix typo 2022-10-18 19:28:43 +02:00
Laurent Destailleur
da3ae71a47 Try to fix rounding error 2022-10-18 13:32:18 +02:00
stickler-ci
71bae4f94b Fixing style errors. 2022-10-18 09:43:55 +00:00
jpb
6050f60704 add loadRoleMode on getlinearray 2022-10-18 11:36:17 +02:00
Marc de Lima Lucio
82ca472245 FIX: only modify hidden checkbox/multislected extrafields on update if they are provided in request 2022-10-18 10:50:21 +02:00
Laurent Destailleur
d7d6d0486b
Merge pull request #22544 from inovea-conseil/FIX_available_warehouse 
FIX closed warehouse for shipping
 2022-10-18 00:59:06 +02:00
Laurent Destailleur
7df36e4a1f Try fix phpunit 2022-10-18 00:53:13 +02:00
Laurent Destailleur
36777ee8c7 Fix phpunit 2022-10-18 00:48:05 +02:00
Laurent Destailleur
abb1317ef9
Merge pull request #22596 from ptibogxiv/patch-52 
Fix php 8 error
 2022-10-17 23:14:49 +02:00
Laurent Destailleur
7c615fafb9
Update datapolicycron.class.php 2022-10-17 23:14:33 +02:00
Laurent Destailleur
3eae33dcc7
Merge pull request #22597 from ptibogxiv/patch-53 
fix php 8 error
 2022-10-17 23:12:40 +02:00
Laurent Destailleur
13e22647f5
Merge pull request #22598 from ptibogxiv/patch-54 
Fix php 8 error
 2022-10-17 23:12:28 +02:00
Laurent Destailleur
eb00aa680c
Merge pull request #22602 from hregis/fix_wrong_perm_check 
FIX wrong perm check
 2022-10-17 23:05:43 +02:00
Laurent Destailleur
ebd7605545 Fix bad recalculation of cost price of production of a product 2022-10-17 17:45:57 +02:00
Laurent Destailleur
159628be56 Fix the quick filter on MO 2022-10-17 15:54:48 +02:00
Laurent Destailleur
99962b9ade FIX Search ambigous field on MO list 2022-10-17 15:41:59 +02:00
Laurent Destailleur
68f16b13d7 Fix typo 2022-10-17 02:52:03 +02:00
Laurent Destailleur
babf1e0e27 Fix doc 2022-10-17 01:55:57 +02:00
Regis Houssin
7a50d03256 FIX wrong perm check 2022-10-16 14:45:35 +02:00
stickler-ci
2067e90f14 Fixing style errors. 2022-10-15 17:12:34 +00:00
ptibogxiv
4b404909f6
Fix php 8 error 2022-10-15 19:11:38 +02:00
Laurent Destailleur
ccaa23121e Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-10-15 13:57:23 +02:00
Laurent Destailleur
042db61523 Merge 2022-10-15 13:52:57 +02:00
Laurent Destailleur
305960bad8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-10-15 13:52:34 +02:00
Laurent Destailleur
7387e535ef Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-10-15 13:51:50 +02:00
Laurent Destailleur
63a62edcf6 Fix filter on member without subscription 2022-10-15 13:41:15 +02:00
ptibogxiv
1044e79aa1
fix php 8 error 2022-10-15 13:19:55 +02:00
ptibogxiv
df51c0ea51
Fix php 8 error 2022-10-15 13:07:07 +02:00
Laurent Destailleur
1ceb7dfb84
Merge pull request #22522 from ATM-Consulting/FIX_16.0_computed_extrafields_not_shown_if_no_other_extrafields 
FIX 16.0 - computed extrafields are not displayed if the object has no classic extrafields
 2022-10-15 10:40:17 +02:00
Laurent Destailleur
2e9e060aed
Merge pull request #22565 from hregis/fix_fetch_of_product_is_mandatory 
FIX avoid error, check of product fetch is already check before
 2022-10-14 19:37:02 +02:00
Noé Cendrier
a6ea8be9a1 $movement is better known as $object here 2022-10-14 10:20:41 +02:00
atm-lena
5dde5e1a20 Input "Private Mssage" 2022-10-14 09:54:47 +02:00
Laurent Destailleur
d30d6dfe34 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-10-13 14:34:36 +02:00
Laurent Destailleur
409b137ba7 Try a better fix for #22535 #22536 2022-10-13 14:31:08 +02:00
Laurent Destailleur
8f5c05f577 Add price in local format in json response 2022-10-13 12:22:16 +02:00
atm-lena
1cec84c21a FIX : private message ticket become public if edit action 2022-10-13 12:18:25 +02:00
Gauthier PC portable 024
8850412da8 FIX : input selector is wrong with PRODUCT_LOAD_EXTRAFIELD_INTO_OBJECTLINES usage 2022-10-13 11:25:42 +02:00
Laurent Destailleur
ada0f2b82a
Merge pull request #22499 from FHenry/15_fix_bad_error_message_CronJobSendEmailsRemindersOnInvoiceDueDate 
fix: display correct id of thirdparty in Error of sendEmailsRemindersOnInvoiceDueDate
 2022-10-13 10:25:53 +02:00
Laurent Destailleur
2ba4993666
Merge pull request #22518 from hregis/fix_avoid_error_with_postgresql 
FIX remove db object for avoid error with postgresql
 2022-10-13 10:24:50 +02:00
Laurent Destailleur
c5d710ff47
Merge pull request #22564 from hregis/fix_remove_quote 
FIX wrong typo, remove quote
 2022-10-13 10:23:05 +02:00
Laurent Destailleur
fccebe7fba
Merge pull request #22533 from fmarcet/14.0 
Fix: Not load project title when sending email from project
 2022-10-13 09:56:08 +02:00
Regis Houssin
9b37754b85 FIX check $id is already check before 2022-10-13 09:10:22 +02:00
Regis Houssin
9ec41c1a44 FIX avoid error, fetch of product is mandatory (by id or by ref) 2022-10-13 08:34:23 +02:00
Regis Houssin
a5a260b317 FIX wrong typo, remove quote 2022-10-13 08:13:58 +02:00
Regis Houssin
a14a546906 FIX wrong var typo 2022-10-13 07:48:52 +02:00
Laurent Destailleur
92c807d0df Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-10-13 01:07:35 +02:00
Laurent Destailleur
32ec40647a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-10-13 01:07:27 +02:00
Laurent Destailleur
54c5ca7c75 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-10-13 01:06:15 +02:00
Laurent Destailleur
b6a85271e6 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-10-13 00:52:33 +02:00
Laurent Destailleur
14edd053fb Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-10-13 00:52:23 +02:00
Laurent Destailleur
374e56d938 FIX #22538 2022-10-13 00:50:55 +02:00
Laurent Destailleur
851fd96665
Merge pull request #22541 from hregis/fix_missing_quote 
Fix missing quote for string field
 2022-10-13 00:39:42 +02:00
Frédéric FRANCE
541b4e0b64
Update modFacture.class.php 2022-10-12 13:49:04 +02:00
Frédéric FRANCE
4cf294f14a
typo 2022-10-12 13:42:47 +02:00
Laurent Destailleur
020d3dcbe5 Fix f... option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS (do not use this!) 2022-10-12 12:14:04 +02:00
Laurent Destailleur
77898ab456 Fix f... option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS (do not use this!) 2022-10-12 11:52:33 +02:00
Laurent Destailleur
7ebda11ad0 Fix search in TakePOS 2022-10-11 22:08:26 +02:00
Laurent Destailleur
6eecb93f05 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-10-11 17:01:59 +02:00
Laurent Destailleur
66c6d1927b Fix duplicate invoice created 2022-10-11 16:46:08 +02:00
Laurent Destailleur
bfd33c9157 Fix migration when table llx_asset is missing 2022-10-11 13:49:11 +02:00
Nicolas
5528dc3843 FIX closed warehouse for shipping 2022-10-11 10:26:03 +02:00
jpb
c5c0628ee8 add short cicility 2022-10-11 10:05:56 +02:00
Marc de Lima Lucio
ba94bc146f FIX: supplier price update: missing error reporting 2022-10-11 10:00:23 +02:00
Regis Houssin
fca08dbf23 FIX missing quote 2022-10-11 08:04:27 +02:00
Florian HENRY
a8dd29de85 review 2022-10-10 14:10:02 +02:00
Florian HENRY
9f8a09b4c8 Merge branch '15.0' of github.com:Dolibarr/dolibarr into 15_fix_bad_error_message_CronJobSendEmailsRemindersOnInvoiceDueDate 2022-10-10 14:08:55 +02:00
Ferran Marcet
1aa2427fd2 Fix: Not load project title when sending email from project 2022-10-10 11:26:20 +02:00
Laurent Destailleur
7e80737358 css 2022-10-10 00:57:50 +02:00
stickler-ci
837573c6ea Fixing style errors. 2022-10-08 05:53:48 +00:00
Regis Houssin
53502ccd70 FIX better fix for compatibility 2022-10-08 07:49:02 +02:00
Laurent Destailleur
d3182c684e Prepare 16.0.1 2022-10-08 03:28:07 +02:00
Laurent Destailleur
99a1eaf67c Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-10-08 02:54:32 +02:00
Laurent Destailleur
1a71ce23dd Fix lang load 2022-10-08 02:54:10 +02:00
Laurent Destailleur
7a122c718a
Merge pull request #22454 from hregis/fixme_this_update_override_initial_message 
FIX avoid override initial message ($this instead $object)
 2022-10-08 00:06:58 +02:00
Laurent Destailleur
875b9e6f2d
Merge pull request #22505 from ksar-ksar/patch-16 
FIX #22482
 2022-10-07 23:47:27 +02:00
Laurent Destailleur
933c9fc590
Merge pull request #22508 from ksar-ksar/patch-17 
FIX  #22507
 2022-10-07 23:33:07 +02:00
Laurent Destailleur
73c1efecaf Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-10-07 22:47:36 +02:00
Laurent Destailleur
4e4b0e0039 FIX Duplicate creation of invoice when closing shipment linked to order 2022-10-07 22:44:20 +02:00
Laurent Destailleur
035448c66e Fix log cleaner 2022-10-07 21:36:30 +02:00
Laurent Destailleur
2df791ccf7 Fix badge not visible on delivery tab 2022-10-07 21:22:17 +02:00
atm-florian
40923c6af5 FIX 16.0 - computed extrafields are not displayed if the object has no "classic" extrafields 2022-10-07 13:13:59 +02:00
Regis Houssin
4bb4d2dc64 FIX remove db object for avoid error with postgresql 2022-10-07 08:54:13 +02:00
Laurent Destailleur
915f20baa2 FIX Missing token in ajax call 2022-10-06 22:53:16 +02:00
Laurent Destailleur
ff33a1852f FIX Remove use of code we should not have 2022-10-06 20:22:43 +02:00
ksar
ce7f553f7d
FIX #22507 2022-10-06 16:06:33 +02:00
Laurent Destailleur
ca6bed109e Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-10-06 15:39:22 +02:00
Laurent Destailleur
8fdf4876d9 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-10-06 15:39:10 +02:00
Laurent Destailleur
9125ac61a8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-10-06 15:33:59 +02:00
ksar
95ce5c19dd
FIX #22482 
Preserve \r\n strings in task notes
 2022-10-06 14:36:53 +02:00
Laurent Destailleur
0c6c70169b
Merge pull request #22488 from hregis/todo_missing_alreadypaid 
FIX missing check if invoice as a payment (wrong status)
 2022-10-06 11:52:48 +02:00
Laurent Destailleur
81e5c428a1
Update invoice.lib.php 2022-10-06 11:52:40 +02:00
Laurent Destailleur
dc898fbc19
Merge pull request #22490 from FHenry/14_fix_warning 
fix: remove php warning Non Numeric Value
 2022-10-06 11:46:36 +02:00
Florian HENRY
27236fe853 fix: display correct id of thirdparty 2022-10-06 10:36:11 +02:00
stickler-ci
82cb267fb8 Fixing style errors. 2022-10-05 14:57:47 +00:00
ksar
a72fff4a5d
FIX #22241 2022-10-05 16:39:26 +02:00
Florian HENRY
b2cd5fc3ca fix: remove php warning non_numeric_value 2022-10-05 16:14:59 +02:00