Commit Graph

93701 Commits

Author SHA1 Message Date
Laurent Destailleur
053b402202 Fix for notes standardization #19835 2022-01-23 19:20:13 +01:00
Laurent Destailleur
2985c03f9f Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-01-23 18:53:50 +01:00
Laurent Destailleur
daca510fa6 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	build/docker/docker-compose.yml
2022-01-23 18:52:47 +01:00
Laurent Destailleur
307338e3f4
Merge pull request #19836 from atm-john/15.0_fix_validate_lang_and_test
FIX :  lang load in validate class and fix test for numeric values
2022-01-23 18:24:11 +01:00
Laurent Destailleur
67fa80cf18
Merge pull request #19841 from fappels/15_fix_dolibarr_export
Fix view after generate database export
2022-01-23 18:20:36 +01:00
Laurent Destailleur
909c974bad
Merge pull request #19897 from smil2k/bug/19896
fix docker build setup
2022-01-23 17:53:44 +01:00
Laurent Destailleur
acafc69baa Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-01-23 16:13:20 +01:00
Laurent Destailleur
07ef603c2c Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-01-23 16:12:37 +01:00
Laurent Destailleur
251609eb26 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-01-23 16:12:27 +01:00
Laurent Destailleur
e392d98beb Fix hook 2022-01-23 13:43:48 +01:00
Laurent Destailleur
8b826949f5 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-01-23 13:04:48 +01:00
Laurent Destailleur
0ee0bfed85 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/fourn/commande/card.php
	test/phpunit/testvirus.txt
2022-01-23 13:04:37 +01:00
Laurent Destailleur
8dc9489c31
Merge pull request #19880 from atm-lena/14.0_FIX_CreateEventFromContract
14.0 fix create event from contract
2022-01-23 12:55:59 +01:00
Laurent Destailleur
6c78ba5c71
Merge pull request #19884 from smil2k/bug/17058
Check if the lines in create is type object (like supplier invoice)
2022-01-23 12:54:17 +01:00
Laurent Destailleur
698e7f4b54
Merge pull request #19889 from Hystepik/develop_v15#1
Fix : remove false positive on carriage return on inventory scan
2022-01-23 12:35:54 +01:00
Philippe GRAND
fefbaa739a fix : bad path 2022-01-23 12:21:15 +01:00
Laurent Destailleur
a16d47c78e Close #19890 2022-01-23 12:06:40 +01:00
Cserveny, Tamás
ca588852df fix code review errors 2022-01-23 12:00:33 +01:00
stickler-ci
bd6fdbd3be Fixing style errors. 2022-01-23 12:00:24 +01:00
Cserveny, Tamás
93edbf1cda missing supplierorder api 2022-01-23 12:00:16 +01:00
Laurent Destailleur
4981f418e8
Merge pull request #19899 from atm-jpb/fix_15.0_modelMailWidth
FIX : 15.0 add minwidth to selectArray mail model
2022-01-23 11:58:09 +01:00
Laurent Destailleur
e06ca2ea08 css 2022-01-23 02:38:34 +01:00
Laurent Destailleur
0c8cdad1e9 css 2022-01-23 02:22:12 +01:00
Laurent Destailleur
e3cf5fecbe css 2022-01-23 02:06:47 +01:00
Laurent Destailleur
e0956c1765 Fix missing token, missing reposition, missing modulepart 2022-01-22 15:33:47 +01:00
Laurent Destailleur
14af64d143 NEW Can removed doc templates from setup page of thirdparty 2022-01-22 15:09:14 +01:00
Laurent Destailleur
caf7e7d7d5 FIX action must be protected with a permission check 2022-01-22 15:07:53 +01:00
Laurent Destailleur
284fcf3ad5 FIX Company logo not found in some cases on some templates 2022-01-22 13:19:29 +01:00
Laurent Destailleur
65e58943b3 FIX exclude the pdf png preview files from backup 2022-01-21 20:57:45 +01:00
Laurent Destailleur
38fcfd38f8 Fix trans 2022-01-21 19:16:29 +01:00
Laurent Destailleur
82305d7dd4 Fix bad position sorting of permission list 2022-01-21 16:34:09 +01:00
Laurent Destailleur
4ac62773ae Fix permissions on deletion on time spend line 2022-01-21 16:22:59 +01:00
Laurent Destailleur
bbb0864fd8 Look and feel v15 2022-01-21 15:45:09 +01:00
Laurent Destailleur
482efec536 Fix missing column 2022-01-21 15:40:37 +01:00
Laurent Destailleur
accc413596 Fix error management 2022-01-21 15:26:54 +01:00
Laurent Destailleur
20cc2c924e css 2022-01-21 14:02:26 +01:00
Laurent Destailleur
1dcfb88ad4 Debug v15 2022-01-21 13:44:40 +01:00
stickler-ci
3e84a99965 Fixing style errors. 2022-01-21 08:58:06 +00:00
jpb
15c39db35c add minwidth to selectArray 2022-01-21 09:55:14 +01:00
jpb
015cd543d6 add minwidth to selectArray 2022-01-21 09:52:52 +01:00
Laurent Destailleur
beee7fc5d3 Fix #yogosha8484 2022-01-20 20:03:58 +01:00
Laurent Destailleur
050b531403 Fix troubles in select_language when selected is array 2022-01-20 19:01:04 +01:00
Laurent Destailleur
d9b0af616e Fix the localtax were not saved on price when no code was set 2022-01-20 18:51:14 +01:00
Laurent Destailleur
8c3b28b0d0 Introduce method for future 2022-01-20 18:50:18 +01:00
Cserveny, Tamás
259c94e320 fix docker build setup 2022-01-20 17:57:21 +01:00
lmarcouiller
03af9ea3f3 remove false positive on carriage return 2022-01-20 14:54:54 +01:00
stickler-ci
400d28238c Fixing style errors. 2022-01-20 00:09:52 +00:00
Cserveny, Tamás
115f022ae9 Check if the lines in create is type object (like supplier invoice) 2022-01-20 00:55:52 +01:00
Laurent Destailleur
db903ad64d Fix #yogosha8457 2022-01-19 16:40:48 +01:00
atm-lena
db9a26f8d4 FIX error urlencode 2022-01-19 15:35:09 +01:00
atm-lena
c8589970af FIX : event created from contract not linked to object origin 2022-01-19 15:33:30 +01:00
Laurent Destailleur
60b90056c4 Fix #yogosha8450 2022-01-19 15:20:10 +01:00
Laurent Destailleur
ed2ca6af79 CSS 2022-01-19 14:32:15 +01:00
Laurent Destailleur
fc7e8ed720 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-01-19 02:02:03 +01:00
Laurent Destailleur
c469634101 Fix hook for emailcollector 2022-01-19 02:01:52 +01:00
Laurent Destailleur
499dd859ee
Merge pull request #19853 from atm-maxime/new_hook_main_area
New hook printMainArea
2022-01-19 01:57:39 +01:00
Laurent Destailleur
b88da24ba4
Merge pull request #19850 from ptibogxiv/patch-459
Fix stripe SetupIntent
2022-01-19 01:49:53 +01:00
Laurent Destailleur
7bc0f44e7c
Merge pull request #19870 from fappels/15_fix_dispatchProduct
FIX: origin missing for supplier order dispatchProduct
2022-01-19 01:07:05 +01:00
Anthony Berton
f093e01cec
Update 14.0.0-15.0.0.sql 2022-01-18 19:34:18 +01:00
Anthony Berton
16ca2d68b6
Update llx_c_action_trigger.sql 2022-01-18 19:31:51 +01:00
Laurent Destailleur
3eff894da1 Fix css 2022-01-18 19:27:06 +01:00
Laurent Destailleur
b3a8b56625 Fix typo 2022-01-18 19:01:51 +01:00
Laurent Destailleur
178f7b0ace CSS 2022-01-18 18:59:03 +01:00
Laurent Destailleur
22a3b5ea78 FIX deletion of supplier order when draft 2022-01-18 16:24:28 +01:00
Francis Appels
d4adeba1fc FIX: origin missing for supplier order dispatchProduct 2022-01-18 16:22:41 +01:00
Laurent Destailleur
200f796232 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-01-18 16:08:54 +01:00
Laurent Destailleur
75eb256589 Fix perm to delete a draft supplier order 2022-01-18 16:06:27 +01:00
Laurent Destailleur
01aa2deae6 Fix bad include 2022-01-18 15:27:43 +01:00
Laurent Destailleur
874bbca881 Doc 2022-01-18 12:24:19 +01:00
Laurent Destailleur
f91504b9c1 Add property 2022-01-18 12:16:13 +01:00
Gauthier PC portable 024
255d8ba753 FIX : rankorder + vacant positions 2022-01-18 10:59:10 +01:00
Laurent Destailleur
b5de132343 Fix responsive 2022-01-18 00:22:25 +01:00
Laurent Destailleur
e19994c756 Fix drag event on week view 2022-01-18 00:07:45 +01:00
Laurent Destailleur
254ed31fb1 Fix combo 2022-01-17 23:47:23 +01:00
Laurent Destailleur
70e4705149 Clean code 2022-01-17 22:52:56 +01:00
Laurent Destailleur
642f77e8f5 FIX Widget of stock alert does not report on purchase products. 2022-01-17 22:07:18 +01:00
Laurent Destailleur
2f7832ee44 css 2022-01-17 19:18:48 +01:00
Laurent Destailleur
812f12ccc4 Fix tz message 2022-01-17 19:09:18 +01:00
Laurent Destailleur
a072c8911a Fix tz of message on popup 2022-01-17 19:07:02 +01:00
Laurent Destailleur
0e44bfd4e4 Fix remove $_GET 2022-01-17 18:53:57 +01:00
Laurent Destailleur
9d067d74ab Fix responsive 2022-01-17 17:51:03 +01:00
Laurent Destailleur
7034ddf063 Freemono instead of freeserif 2022-01-17 13:56:32 +01:00
Laurent Destailleur
22ab3c03a1 Fix another way to write the preg_replace_callback 2022-01-17 09:12:09 +01:00
Laurent Destailleur
cfc39ebf0a Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-01-17 08:59:34 +01:00
Maxime Kohlhaas
8eeb0caa78 New hook printMainArea 2022-01-16 21:10:02 +01:00
Laurent Destailleur
6826b373fd css 2022-01-16 13:22:21 +01:00
Laurent Destailleur
3aedf6434b css 2022-01-16 13:11:12 +01:00
Laurent Destailleur
cdbcad9c4f Sync transifex 2022-01-16 12:51:08 +01:00
ptibogxiv
1ce7d3ad8b
Fix stripe SetupIntent
Klarna not possible for SetupIntent
2022-01-15 23:26:46 +01:00
Maxime Kohlhaas
ea55712d1b Fix missing require class project 2022-01-15 23:04:56 +01:00
Laurent Destailleur
63df7ba0d4 Clean code 2022-01-15 21:10:33 +01:00
Laurent Destailleur
8e4c7efed5 Fix do not include file if url not correctly detected 2022-01-15 20:53:16 +01:00
Laurent Destailleur
2b19bcef54 Fix responsive 2022-01-15 13:08:15 +01:00
Laurent Destailleur
8cb5264928 Fix css 2022-01-15 12:56:19 +01:00
Laurent Destailleur
b3b1e82100 Change on column Assigned to on projet and task. 2022-01-15 12:30:41 +01:00
Francis Appels
89869a2485 Fix view after generate export 2022-01-15 12:09:36 +01:00
Laurent Destailleur
6acf59fe20 Fix responsive 2022-01-14 20:26:56 +01:00
Laurent Destailleur
22ef83ab67 Fix responsive 2022-01-14 20:05:43 +01:00
Laurent Destailleur
8c165aced2 Fix responsive 2022-01-14 20:05:39 +01:00
Laurent Destailleur
3d97888bc5 Comment 2022-01-14 17:46:06 +01:00
lvessiller
a9c76f2e44 FIX replace print error with event message when error on update line in supplier order 2022-01-14 16:09:30 +01:00
Laurent Destailleur
4200f2f195 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-01-14 14:02:30 +01:00
Laurent Destailleur
77c286b769 Fix permission 2022-01-14 14:01:50 +01:00
Laurent Destailleur
744296a43a FIX Permission on holiday and expensereport. 2022-01-14 13:52:08 +01:00
Laurent Destailleur
f04a07b6a7 FIX Pb with permission on holiday and expense report 2022-01-14 13:42:38 +01:00
ATM john
a394713f1b Fix doc comment 2022-01-14 11:51:07 +01:00
ATM john
8ace96f495 Fix validate class lang load and test for numeric values 2022-01-14 11:46:31 +01:00
Laurent Destailleur
02fc420c2a FIX #19817 2022-01-14 11:37:13 +01:00
Laurent Destailleur
91b2d59458 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-01-14 10:37:41 +01:00
Laurent Destailleur
e223fb1e7c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-01-14 10:36:56 +01:00
Laurent Destailleur
53e65095a7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/commande/card.php
	htdocs/expedition/card.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/card.php
2022-01-14 10:36:46 +01:00
Laurent Destailleur
9dde80dd52 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/expedition/card.php
	htdocs/fourn/commande/list.php
2022-01-14 10:30:39 +01:00
Laurent Destailleur
490f17d5a2 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-01-14 10:24:00 +01:00
Laurent Destailleur
5b6133ad62
Merge pull request #19821 from marc-dll/12.0_FIX_shipment_all_lines
FIX: order to shipment: debug hidden conf SHIPMENT_GETS_ALL_ORDER_PRODUCTS
2022-01-14 10:19:28 +01:00
Laurent Destailleur
5881e36ba6 Code comment 2022-01-14 10:15:46 +01:00
Laurent Destailleur
e365975b2f
Merge pull request #19820 from frederic34/patch-1
fix warning
2022-01-14 10:04:42 +01:00
Laurent Destailleur
7d5c36ad02
Merge pull request #19823 from harrywinner/15.0
FIX Solving non-blocking bug in user login
2022-01-14 10:03:10 +01:00
Laurent Destailleur
71e470eb6c
Merge pull request #19826 from atm-gauthier/FIX_hrm
FIX : several adaptations rank => rankorder and langs correction for HRM
2022-01-14 10:01:14 +01:00
Laurent Destailleur
b7aa152464 Fix trans 2022-01-14 09:55:13 +01:00
Laurent Destailleur
f51554fd4d Fix missing token 2022-01-13 20:40:42 +01:00
Laurent Destailleur
cb45f79ab0 Fix scrutinizer 2022-01-13 20:16:12 +01:00
Laurent Destailleur
fccddd7805 Fix property missing 2022-01-13 20:11:18 +01:00
Laurent Destailleur
965703e04a Fix missing var 2022-01-13 20:09:40 +01:00
Laurent Destailleur
3aea037889 FIX Debug level 3 of accounting account was using wront field 2022-01-13 19:49:38 +01:00
Laurent Destailleur
240958ace6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-01-13 19:21:28 +01:00
Laurent Destailleur
dbc2631d6a Fix scrutinizer warnings 2022-01-13 19:19:36 +01:00
Laurent Destailleur
b6dc7a3f19 Doc 2022-01-13 19:09:34 +01:00
Laurent Destailleur
7ccb1c94a1 Fix var not defined 2022-01-13 19:07:05 +01:00
Laurent Destailleur
f35fee0081 Prepare 16 dev 2022-01-13 18:55:49 +01:00
Laurent Destailleur
b82b89d519 Prepare 15.0 2022-01-13 18:54:46 +01:00
Laurent Destailleur
b9b45fb506 Fix #hunterf1d1ce3e-ca92-4c7b-b1b8-934e28eaa486
Conflicts:
	test/phpunit/CodingPhpTest.php
2022-01-13 18:46:29 +01:00
Laurent Destailleur
4fe3650736 Fix #hunterf1d1ce3e-ca92-4c7b-b1b8-934e28eaa486 2022-01-13 18:34:15 +01:00
lvessiller
cacff0c2d4 FIX cast int for search user 2022-01-13 16:18:57 +01:00
lvessiller
22f6d204a2 FIX search by user in supplier order list 2022-01-13 16:01:23 +01:00
Laurent Destailleur
dbce3cbfbe Clean code 2022-01-13 16:00:39 +01:00
Laurent Destailleur
52493b60fb Fix #yogosha8316 2022-01-13 15:52:41 +01:00
Gauthier PC portable 024
55389036d9 FIX : perms 2022-01-13 12:02:05 +01:00
Laurent Destailleur
054116900a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-13 11:59:05 +01:00
Laurent Destailleur
cb03f88fbc Fix link 2022-01-13 11:58:10 +01:00
Gauthier PC portable 024
a77a2e9bcc FIX : several adaptations rank => rankorder and langs correction for HRM 2022-01-13 11:39:54 +01:00
Laurent Destailleur
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +01:00
Laurent Destailleur
f51720879b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-01-13 11:05:57 +01:00
Laurent Destailleur
620a88b8d6 Fix param sortfield/order 2022-01-13 11:05:21 +01:00
Laurent Destailleur
dc3670bc91 Clean search_status 2022-01-13 11:00:52 +01:00
Harry Winner KF
67ab70f37d FIX Solving non-blocking bug in user login
When using the function check_user_password_dolibarr to authenticate a user, a call is made to the function dol_verifyHash which requires a pre-calculated hash. This hash is not available with programmatically-created never-used accounts. Hence, in suce cases we have the following warning:
Notice: Trying to access array offset on value of type null in .../htdocs/core/lib/security.lib.php on line 156

This fix solves that bug by avoiding that unnecessary call
2022-01-12 15:05:11 -05:00
Marc de Lima Lucio
b110ca6ead FIX: order to shipment: FIX hidden conf SHIPMENT_GETS_ALL_ORDER_PRODUCTS (still not working when not preselecting a warehouse) 2022-01-12 16:40:43 +01:00
Frédéric FRANCE
297d2ecfbd
fix warning 2022-01-12 16:09:31 +01:00
Laurent Destailleur
08e313942d
Merge pull request #19791 from ptibogxiv/patch-457
NEW add setup/establishments API (need for recruitment API)
2022-01-12 11:18:52 +01:00
Laurent Destailleur
3daf7d493c
Merge pull request #19792 from ptibogxiv/patch-458
FIX bom.class.php
2022-01-12 11:18:29 +01:00
Laurent Destailleur
d7529e55b5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-01-12 11:18:06 +01:00