Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
119,231 Commits 36 Branches 189 Tags
8b7eaf360e58693a9365544cb1520f28ced7e626
Commit Graph

9275 Commits

Author SHA1 Message Date
Laurent Destailleur
a0e53a402d Fix reponsive 2022-12-02 19:23:12 +01:00
Laurent Destailleur
48f7d20e83 Fix warning 2022-12-02 16:34:56 +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
21f1dcc3de Complete substitution with __NOW_TMS__ 2022-12-01 18:58:45 +01:00
Laurent Destailleur
20b707b245 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-12-01 18:45:30 +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
5026de62f7 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-12-01 17:48:29 +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
0aadbc6433 Fix too late to test critical change during beta 2022-12-01 17:40:44 +01:00
Laurent Destailleur
5713bf025c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-12-01 17:38:17 +01:00
Laurent Destailleur
7627bba443 Debug v17 2022-12-01 17:28:26 +01:00
Laurent Destailleur
85e1bd722d Merge pull request #22819 from noec764/14_FIX_getNextValue 
FIX: GetNextValue() adding regexsql() function
 2022-12-01 17:27:36 +01:00
Laurent Destailleur
fdb2f5956e Merge pull request #23053 from Easya-Solutions/new-dol-get-element-url-mailing 
NEW dolGetElementUrl for mailing object
 2022-12-01 10:53:54 +01:00
Eric Seigne
9a2ce53517 add stamp and signature in pictowithouttext list 2022-11-30 23:41:32 +01:00
Frédéric FRANCE
3f82f3f7f4 add admin extrafields count 2022-11-30 22:12:35 +01:00
Frédéric FRANCE
7e97c611f8 add admin extrafields count 2022-11-30 22:07:25 +01:00
Frédéric FRANCE
82fc43fa75 Update fourn.lib.php 2022-11-30 18:52:11 +01:00
Frédéric FRANCE
100c799811 Update supplier_proposal.lib.php 2022-11-30 18:32:31 +01:00
Frédéric FRANCE
65b85adcaf Update expensereport.lib.php 2022-11-30 18:26:26 +01:00
Frédéric FRANCE
168969a06d add extrafields count in admin 2022-11-30 18:20:29 +01:00
VESSILLER
d667d5d43f NEW dolGetElementUrl for mailing object 2022-11-30 15:17:27 +01:00
Laurent Destailleur
80bcb2fd6d Fix samesite for the cookie session timeout 2022-11-30 12:39:57 +01:00
Laurent Destailleur
cf753d2cbc Merge pull request #23035 from frederic34/patch-8 
add parameter for hook
 2022-11-30 00:07:43 +01:00
Laurent Destailleur
c97c185368 Protect dynamic php content with installmodules.lock 2022-11-29 18:01:27 +01:00
Frédéric FRANCE
c9114bd687 add parameter for hook 2022-11-29 12:08:09 +01:00
Laurent Destailleur
0f40159e39 Merge pull request #22981 from ibuiv/develop 
Fix #19789 Visibility of private contacts
 2022-11-29 00:18:14 +01:00
Laurent Destailleur
dc0d9e1b94 Fix regression 2022-11-28 19:05:51 +01:00
Laurent Destailleur
5cfe40a4bc FIX Can use the WAF of HTML content (dol_htmlwithnojs) for output too 2022-11-28 18:42:59 +01:00
Laurent Destailleur
ba4e5ef245 Enhance phpunit 2022-11-28 16:54:34 +01:00
Laurent Destailleur
75de251402 FIX #yogosha13687 2022-11-28 15:37:38 +01:00
hystepik
c1b355fcac Fix : php 8.1 warnings 2022-11-27 00:44:05 +01:00
Laurent Destailleur
fb11f24fae Merge pull request #23000 from ibuiv/patch-2 
Fix #20533 Dispatch Tab Quantity
 2022-11-26 16:54:11 +01:00
hystepik
4a0822ef2c Fix : fatal error in adherent/agenda.php 2022-11-26 12:21:50 +01:00
antonin_tdj
cd94e42291 add parenthesis 2022-11-26 09:32:10 +01:00
antonin_tdj
5b53d1c5cf add cast to avoid sql injection (eldy asked) 
add cast to avoid sql injection (eldy asked)
 2022-11-26 09:30:40 +01:00
Laurent Destailleur
c62c7e3805 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
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:43:09 +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
85e9ac1e40 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-11-26 01:13:58 +01:00
Mathieu
99a34e23c8 FIX#20415 2022-11-26 00:33:23 +01:00
stickler-ci
ebae1c024f Fixing style errors. 2022-11-25 23:24:17 +00:00
antonin_tdj
9852d470ec Fix #20533 Dispatch Tab Quantity 
Fix #20533
Dispatch Tab Total Quantity now considers services (and the configuration option to manage stocks on services)
 2022-11-26 00:23:29 +01:00
Mathieu
c49e7e882f FIX#20415 2022-11-26 00:20:27 +01:00
Laurent Destailleur
eb2fada50f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-11-26 00:00:49 +01:00
Laurent Destailleur
c2cacdb8a5 Fix fatal error 2022-11-25 23:59:06 +01:00
Laurent Destailleur
f79778db40 Fix js null error 2022-11-25 23:47:17 +01:00
Laurent Destailleur
1ec862b491 Merge pull request #22982 from inovea-conseil/fix_19877 
FIX#19877
 2022-11-25 23:41:18 +01:00
antonin_tdj
e7034f3c52 Merge branch 'Dolibarr:develop' into develop 2022-11-25 23:20:11 +01:00
Mathieu
023bc7d20e FIX#19877 2022-11-25 22:29:44 +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