Anthony Berton
0a99e7c82a
Update functions.lib.php
2022-01-19 10:51:31 +01:00
Laurent Destailleur
63d6ef1ba0
Merge pull request #19647 from OPEN-DSI/new-exports-entity-filters
...
NEW add entity filter in exports
2022-01-19 02:26:18 +01:00
Laurent Destailleur
c2c74f4849
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-19 02:02:52 +01:00
Laurent Destailleur
c469634101
Fix hook for emailcollector
2022-01-19 02:01:52 +01:00
Laurent Destailleur
3757d7e952
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
2022-01-18 16:11:48 +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
09eb051bcc
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-18 12:25:20 +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
Regis Houssin
08009bcec5
FIX avoid warning
2022-01-18 10:06:11 +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
9d067d74ab
Fix responsive
2022-01-17 17:51:03 +01:00
Laurent Destailleur
2462700975
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-17 13:57:59 +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
Laurent Destailleur
5fd2d00936
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-17 08:57:48 +01:00
Laurent Destailleur
24de82859e
Debug v15
2022-01-16 20:22:09 +01:00
Laurent Destailleur
372b583e50
Debug template of warehouse
2022-01-16 19:21:59 +01:00
Laurent Destailleur
3aedf6434b
css
2022-01-16 13:11:12 +01:00
Laurent Destailleur
5070a40fa4
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/project.lib.php
htdocs/projet/list.php
2022-01-15 20:28:04 +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
Laurent Destailleur
fe79218571
Change on column Assigned to on projet and task.
2022-01-15 12:26:08 +01:00
Laurent Destailleur
ecde594a15
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/card.php
2022-01-14 20:28:44 +01:00
Laurent Destailleur
3d97888bc5
Comment
2022-01-14 17:46:06 +01:00
Laurent Destailleur
744296a43a
FIX Permission on holiday and expensereport.
2022-01-14 13:52:08 +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
1ae01ba2fc
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-14 10:38:38 +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
stickler-ci
2b64f69def
Fixing style errors.
2022-01-14 09:12:30 +00:00
dolibarr95
5b3fcc5e43
Update extrafields.class.php
2022-01-14 10:10:10 +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
dolibarr95
e53d9d4320
Update extrafields.class.php
...
fix #19739
2022-01-14 08:52:04 +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
13510b9929
Clean sortfield, sortorder
2022-01-13 11:17:25 +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
Frédéric FRANCE
297d2ecfbd
fix warning
2022-01-12 16:09:31 +01:00
Laurent Destailleur
8e2f76ca66
Merge pull request #17577 from OGPayet/feature/addThirdpartyCustomerCodeToEmailingSubstitutionArray
...
add thirdparty customer code to substitutionarray
2022-01-11 13:31:32 +01:00
Laurent Destailleur
b824912473
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-01-11 13:28:07 +01:00
Gauthier PC portable 024
6799d48944
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop
2022-01-11 09:59:25 +01:00
Gauthier PC portable 024
1910423684
FIX : conf name is MAIN_ADD_LINE_AT_POSITION
2022-01-11 09:54:27 +01:00