Laurent Destailleur
|
9336828710
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
htdocs/compta/paiement/card.php
htdocs/expedition/class/expedition.class.php
|
2020-05-18 15:54:39 +02:00 |
|
Laurent Destailleur
|
45345440a4
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/expedition/class/expedition.class.php
scripts/cron/cron_run_jobs.php
|
2020-05-18 15:50:36 +02:00 |
|
Laurent Destailleur
|
18a19dafe5
|
Update cron_run_jobs.php
|
2020-05-18 15:01:29 +02:00 |
|
Maxime Kohlhaas
|
54af917afb
|
Fix cron globals reload, missing mysoc and langs
|
2020-05-16 20:13:47 +02:00 |
|
Laurent Destailleur
|
9bbedce3d6
|
Fix phpcs
|
2020-04-05 12:23:58 +02:00 |
|
Laurent Destailleur
|
50790a7f36
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/categories/class/categorie.class.php
htdocs/filefunc.inc.php
|
2020-04-05 03:44:06 +02:00 |
|
Laurent Destailleur
|
d0c4af5855
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2020-04-05 03:42:05 +02:00 |
|
gauthier
|
04564e83ea
|
FIX : picture migration script from doli 9.0
|
2020-03-31 10:31:18 +02:00 |
|
glu000
|
61deab41f9
|
Fix #13394
|
2020-03-22 20:17:52 +01:00 |
|
Frédéric FRANCE
|
9e4fb8d4fe
|
doxygen
|
2019-12-15 10:02:20 +01:00 |
|
Laurent Destailleur
|
e921bf4acb
|
Merge pull request #12593 from frederic34/patch-7
$key is overwriting a variable from outer foreach loop
|
2019-12-03 13:17:42 +01:00 |
|
Laurent Destailleur
|
c692650430
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-12-02 15:23:40 +01:00 |
|
Frédéric FRANCE
|
36bb4eece9
|
$key is overwriting a variable from outer foreach loop
|
2019-12-01 20:34:05 +01:00 |
|
Nicolas
|
13577d8d48
|
FIX #12473
|
2019-11-30 19:52:06 +01:00 |
|
Scrutinizer Auto-Fixer
|
2ecfe41810
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-08 09:53:31 +00:00 |
|
Frédéric FRANCE
|
35751a80ab
|
100% centpercent
|
2019-11-05 21:24:41 +01:00 |
|
Frédéric FRANCE
|
e75f7d448c
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-16 20:00:01 +02:00 |
|
Frédéric FRANCE
|
67cb432cfb
|
cut long lines
|
2019-10-02 23:10:33 +02:00 |
|
Alexandre SPANGARO
|
02dbc11f98
|
Move Gnu.org to https
|
2019-09-23 21:55:30 +02:00 |
|
Laurent Destailleur
|
7154ecb80b
|
Fix reload of conf in cron script
|
2019-06-24 13:56:10 +02:00 |
|
Laurent Destailleur
|
84d7154106
|
Fix phpcs
|
2019-05-29 10:03:18 +02:00 |
|
Laurent Destailleur
|
848b8f9bc4
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/public/cron/cron_run_jobs.php
htdocs/public/payment/newpayment.php
scripts/cron/cron_run_jobs.php
|
2019-05-27 19:01:28 +02:00 |
|
Laurent Destailleur
|
7964bb12ce
|
FIX Use of cron with multicompany
|
2019-05-27 18:13:33 +02:00 |
|
Laurent Destailleur
|
bb86428663
|
Fix line too long
|
2019-05-21 16:20:30 +02:00 |
|
Laurent Destailleur
|
399ffb2dcc
|
Fix phpcs
|
2019-05-16 14:38:01 +02:00 |
|
Laurent Destailleur
|
379c6e1bb1
|
Removed deprecated scripts
|
2019-05-15 16:33:38 +02:00 |
|
Laurent Destailleur
|
a9b3748006
|
__DIR__ was not replaced into scripts dir
|
2019-05-15 13:20:02 +02:00 |
|
Laurent Destailleur
|
585e604ac4
|
Add a message to avoid using wrong script file
|
2019-03-11 18:02:03 +01:00 |
|
Laurent Destailleur
|
f2de44ce51
|
Clean code
|
2019-03-11 01:11:39 +01:00 |
|
Laurent Destailleur
|
9e28db4202
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/tools/export.php
|
2019-02-06 00:51:10 +01:00 |
|
Laurent Destailleur
|
db50ef39e7
|
FIX Translation not loaded by scheduled jobs
|
2019-02-05 20:32:14 +01:00 |
|
Laurent Destailleur
|
e18bd6f986
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 18:27:35 +01:00 |
|
Laurent Destailleur
|
e72d6c50e6
|
Merge pull request #10428 from frederic34/toomanylines
PSR2.Files.EndFileNewline.TooMany
|
2019-01-30 16:17:09 +01:00 |
|
Laurent Destailleur
|
648eea3a70
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 16:00:11 +01:00 |
|
Alexandre SPANGARO
|
cc88c4f8ff
|
Move my email to the new one
|
2019-01-28 21:39:22 +01:00 |
|
Frédéric FRANCE
|
b10558bacd
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-01-27 23:23:38 +01:00 |
|
Laurent Destailleur
|
f30a3d59ba
|
Merge branch 'develop' into toomanylines
|
2019-01-27 17:59:13 +01:00 |
|
Laurent Destailleur
|
4f9f0fd7b5
|
Merge branch 'develop' into elseif
|
2019-01-27 17:54:06 +01:00 |
|
Frédéric FRANCE
|
f0cdf300d1
|
Squiz.Functions.FunctionDeclarationArgumentSpacing
|
2019-01-27 15:20:16 +01:00 |
|
Frédéric FRANCE
|
496fa9b0fb
|
PSR2.Files.EndFileNewline.TooMany
|
2019-01-27 14:10:35 +01:00 |
|
Frédéric FRANCE
|
7ee086b402
|
PSR2 space after comma in function call
|
2019-01-27 11:55:16 +01:00 |
|
Frédéric FRANCE
|
6e91b3cefc
|
PSR2 usage of else if is discouraged
|
2019-01-27 10:49:34 +01:00 |
|
Philippe GRAND
|
655aad8c41
|
update with html5 compliant code
|
2019-01-21 10:14:14 +01:00 |
|
atm-quentin
|
013c078c8b
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_manage_multicompany_for_invoice
|
2019-01-16 10:52:46 +01:00 |
|
atm-quentin
|
6d088e45ee
|
FIX missing getEntity 0 in scripts directory
|
2018-12-14 16:29:47 +01:00 |
|
Maxime Kohlhaas
|
2e496ea83a
|
QUAL rename facnumber by ref
|
2018-12-02 17:33:44 +01:00 |
|
Laurent Destailleur
|
f0ab6e60ec
|
FIX Loading translation of cron tasks
|
2018-11-26 13:31:05 +01:00 |
|
Laurent Destailleur
|
d93d1c7e1b
|
Better log
|
2018-11-19 10:25:07 +01:00 |
|
atm-quentin
|
c18f486179
|
set facture to invoice AND check invoicenumber conf
|
2018-11-16 11:20:03 +01:00 |
|
atm-quentin
|
a8ab666d62
|
remplacement en masse des $conf->entity par des getEntity('facture')
|
2018-11-16 11:17:18 +01:00 |
|