lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
94,391 Commits 43 Branches 150 Tags 886 MiB
fd3354142b
Commit Graph

94391 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
fd3354142b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/categories/viewcat.php
 2021-02-06 01:17:05 +01:00
Laurent Destailleur
c6badeed57 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/categories/viewcat.php
	htdocs/compta/prelevement/card.php
 2021-02-06 01:14:48 +01:00
Laurent Destailleur
d8a33b46de Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-06 01:08:46 +01:00
Laurent Destailleur
4428e2b18e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/compta/prelevement/card.php
	htdocs/product/price.php
 2021-02-06 01:08:37 +01:00
Laurent Destailleur
87c8d917e9 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/compta/prelevement/card.php
 2021-02-06 01:03:31 +01:00
Laurent Destailleur
c888ce08c1
Merge pull request #16174 from atm-florianm/fix/10.0_check_withdrawal_already_credited_before_crediting_it 
FIX 10.0 - before crediting a withdrawal receipt, check whether it has been credited already
 2021-02-06 01:00:56 +01:00
Laurent Destailleur
7d14cde45e
Merge pull request #16173 from fappels/11_backport_price_patch 
FIX: Add critical price patch from 12 to 11.
 2021-02-06 00:59:52 +01:00
Laurent Destailleur
d8c262691b
Merge pull request #16175 from nicolas-eoxia/12_fix_missing_hook 
fix: add missing hook addMoreActionsButtons in viewcat.php
 2021-02-06 00:43:52 +01:00
Laurent Destailleur
bee0849290 Fix when nothing found, we should show message nothing found 2021-02-06 00:42:53 +01:00
Laurent Destailleur
c15deff817 FIX #16185 2021-02-06 00:30:44 +01:00
werewolf7160
83f24e6fd2 call to createCommon() return int and not bool 
with generated Object, the post request call to createCommon() in it and taht function return a int (id or -1 if error).
but the test on the returned value is a '!', that don't return false on "-1".
a post request with an sql error for example(foreign key error for my test), will always return 200 instead of 500 with the error
 2021-02-06 00:21:53 +01:00
Laurent Destailleur
f823ee019a
Merge pull request #16181 from ptibogxiv/patch-411 
FIX takepos : load date function
 2021-02-06 00:19:38 +01:00
Laurent Destailleur
7b35192476 Fix bad label 2021-02-06 00:15:07 +01:00
Laurent Destailleur
f0e1c02caa Look and feel v14 - Use placeholder on combolists 2021-02-06 00:05:24 +01:00
ptibogxiv
4477578766
FIX takepos : load date function 
fix loading dol_get_first_hour()
 2021-02-05 17:30:41 +01:00
Laurent Destailleur
67df1e1b94 Use same visual picto everywhere for nature of thirdparty 2021-02-05 17:29:11 +01:00
Laurent Destailleur
482ad20a4d Log debug before archive logs 2021-02-05 16:14:42 +01:00
Laurent Destailleur
9843e79bac Trans 2021-02-05 15:43:03 +01:00
Laurent Destailleur
653fa38b06 Fix autoselect of category with 'auto' 2021-02-05 15:12:12 +01:00
Laurent Destailleur
7278a8c17f Fix autoselect of category with 'auto' 2021-02-05 15:07:07 +01:00
Laurent Destailleur
dbfeba661d Fix value show 0 if empty 2021-02-05 14:53:57 +01:00
Laurent Destailleur
2851bac0af Fix param urlencode 2021-02-05 14:46:20 +01:00
Laurent Destailleur
29c7ff1752 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-05 14:41:11 +01:00
Laurent Destailleur
e9fa5a647d Fix import 2021-02-05 14:35:10 +01:00
Laurent Destailleur
ac83cea83a Fix avoid to run import twice by clicking on tab step6 
Fix timeout for real import step
 2021-02-05 14:34:04 +01:00
Laurent Destailleur
245fd6168d Move text into tab 2021-02-05 14:11:34 +01:00
Laurent Destailleur
c441b54521 NEW If not logo defined, can use squarred logo on login page 2021-02-05 12:07:39 +01:00
Nicolas
cdd2c165ef add missing hook addMoreActionsButtons in viewcat.php 2021-02-05 11:36:12 +01:00
Florian Mortgat
3f862bf43e FIX 10.0 - before crediting a withdrawal receipt, check whether it has been credited already 2021-02-05 11:34:39 +01:00
Laurent Destailleur
54be4f282b Fix bad function name 2021-02-05 10:56:33 +01:00
Francis Appels
1b55935577 Add critical price patch from 12 to 11. 2021-02-05 10:39:46 +01:00
Laurent Destailleur
3006cf770c FIX Timeout during import 2021-02-05 01:06:59 +01:00
Laurent Destailleur
49470ea216 Trans 2021-02-05 00:56:44 +01:00
Laurent Destailleur
48be1f24d7 Reduce size required to store blockedlogs 2021-02-05 00:43:58 +01:00
Laurent Destailleur
59faccbc60 Load note_private 2021-02-05 00:34:15 +01:00
Laurent Destailleur
12454221ff Optimize output 2021-02-05 00:04:44 +01:00
Laurent Destailleur
21a9a69ba1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	test/phpunit/SecurityTest.php
 2021-02-04 23:38:42 +01:00
Laurent Destailleur
4a2f26415e Fix GETPOST accept < if followed with a number 2021-02-04 23:36:41 +01:00
Laurent Destailleur
865554bbde NEW Can filter on rowid in list of blocked logs. 2021-02-04 23:24:59 +01:00
Laurent Destailleur
d298f54abd Another memory optimization 2021-02-04 23:10:57 +01:00
Laurent Destailleur
42557a0148 Memory optimization in blockedlog module 2021-02-04 23:03:09 +01:00
Laurent Destailleur
98e5a655cc Fix message if not found 2021-02-04 22:20:57 +01:00
Laurent Destailleur
55e7bcb7ab Set max execution time 2021-02-04 22:14:46 +01:00
Laurent Destailleur
a4f6c2d0c6 More log 2021-02-04 22:03:58 +01:00
Laurent Destailleur
2a48529aea Look and feel v14 2021-02-04 20:44:38 +01:00
Laurent Destailleur
964fa7a72d Look and feel v14 2021-02-04 20:29:57 +01:00
Laurent Destailleur
1b7ee97082 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-04 19:49:32 +01:00
Laurent Destailleur
8cbd9fc0d8 CSS 2021-02-04 19:48:57 +01:00
Laurent Destailleur
87a12b39b0 Fix css 2021-02-04 19:28:49 +01:00
Laurent Destailleur
726ef265f2 Look and feel v14 2021-02-04 19:21:07 +01:00