Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
87,683 Commits 36 Branches 189 Tags
bedfb7ac8da5ec9c0a6fcb51a3b6df514850dea3
Commit Graph

943 Commits

Author SHA1 Message Date
Laurent Destailleur
e3126ec999 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/tpl/card_presend.tpl.php
	htdocs/multicurrency/class/multicurrency.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-07-25 00:22:47 +02:00
Laurent Destailleur
6261fa191f Prepare compatibilty with mysql 8 2020-07-24 12:47:29 +02:00
Laurent Destailleur
3dca55661c Fix Add unit test to avoid the big % instead of comon % char. 2020-05-23 22:01:17 +02:00
Laurent Destailleur
4d6a45d491 Major doxygen fix 2020-05-03 22:48:35 +02:00
Laurent Destailleur
31ba277da7 Fix phpcs 2020-04-26 23:18:09 +02:00
Laurent Destailleur
9679b1f04c Merge pull request #13704 from frederic34/actioncomm_note 
actioncomm note deprecated
 2020-04-23 18:52:56 +02:00
Laurent Destailleur
73ddfb1c81 Use label instead of libelle 2020-04-23 18:33:25 +02:00
Laurent Destailleur
098b7828fa Removed useless test 2020-04-23 13:59:40 +02:00
Laurent Destailleur
defef24c3c Fix regression 2020-04-23 13:57:27 +02:00
Frédéric FRANCE
4220d6b253 actioncomm note deprecated 2020-04-23 00:38:42 +02:00
Laurent Destailleur
b8171cacb1 Fix phpcs 2020-02-20 14:07:25 +01:00
Laurent Destailleur
a6b0fec90b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/exports/class/export.class.php
 2020-02-17 12:35:34 +01:00
Laurent Destailleur
504a67daee FIX duplicate class name into some log lines 2020-02-17 12:34:00 +01:00
Laurent Destailleur
05e08b3596 FIX Filenames must not contains non ascii char or we will get non ascii 
char into the SMTP header.
FIX Do not encode subject if it is full ascii (not required)
 2020-02-06 12:58:02 +01:00
Laurent Destailleur
1875b6a49b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/security2.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
 2020-02-05 14:53:47 +01:00
Laurent Destailleur
1fe9783760 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/product/index.php
 2020-02-05 14:38:19 +01:00
Laurent Destailleur
9100b8a548 FIX SQL request and phpunit 2020-02-05 13:41:10 +01:00
Laurent Destailleur
2f1954151f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-30 12:40:35 +01:00
Laurent Destailleur
4d06a3d10b Travis 2020-01-30 03:33:17 +01:00
Laurent Destailleur
651173678c Fix url to test 2020-01-30 02:49:59 +01:00
Laurent Destailleur
74ac6a3204 Fix phpcs 2020-01-16 02:00:52 +01:00
Laurent Destailleur
1cc94ddb44 Fix travis 2020-01-16 01:44:01 +01:00
Laurent Destailleur
8f73bce878 Add warning if zip lib missing 2020-01-16 01:11:39 +01:00
Laurent Destailleur
8728000046 Show log 2020-01-16 00:23:15 +01:00
Laurent Destailleur
e8fbf45807 Fix v12 2020-01-16 00:03:30 +01:00
Laurent Destailleur
023da33297 Export with the new lib 2020-01-15 22:57:47 +01:00
Laurent Destailleur
330cca994e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2019-12-23 15:49:00 +01:00
Laurent Destailleur
3250b13f4a FIX dol_string_nohtmltag when there is html with windows EOL "<br>\r\n" 2019-12-23 15:45:08 +01:00
Laurent Destailleur
1aef1c60dd Merge pull request #11867 from frederic34/socialnetworks 
NEW add socialnetworks dictionary
 2019-11-04 21:10:22 +01:00
Frédéric FRANCE
fecc9e86a5 wip 2019-11-03 19:55:56 +01:00
Frédéric FRANCE
b8202f6ed4 wip 2019-11-03 18:15:24 +01:00
Frédéric FRANCE
2da87bcdc7 Update UserTest.php 2019-11-03 17:52:58 +01:00
Frédéric FRANCE
a43e6f96b5 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-25 08:12:54 +02:00
Frédéric FRANCE
86f22c4563 do not ignore lines with mix od tabs and spaces 2019-10-20 17:17:22 +02:00
Frédéric FRANCE
9ec7836387 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-20 16:37:18 +02:00
Frédéric FRANCE
7581275316 wip 2019-10-20 11:59:21 +02:00
Frédéric FRANCE
f4540dddb8 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-17 20:24:04 +02:00
Laurent Destailleur
b9ec45fd49 Clean code 2019-10-16 14:02:13 +02:00
Frédéric FRANCE
d9ba09bec1 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-12 19:02:24 +02:00
Laurent Destailleur
5446a7bd8e Try phpunit fix 2019-10-11 17:43:15 +02:00
Frédéric FRANCE
367ef4acaf Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-11 16:44:25 +02:00
Laurent Destailleur
b5a2d37315 Fix phpunit of BOM 2019-10-11 16:10:09 +02:00
Frédéric FRANCE
02b706f9c0 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-09 13:40:46 +02:00
Laurent Destailleur
b93213e9a3 Add more phpunit 2019-10-09 13:25:32 +02:00
Laurent Destailleur
7f1aa818d2 Fix php7.4 error 2019-10-09 11:57:49 +02:00
Frédéric FRANCE
37bb548d21 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-02 20:56:32 +02:00
Laurent Destailleur
6ec36ab04e Fix phpunit 2019-10-02 20:36:57 +02:00
Frédéric FRANCE
aca9d92db8 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-01 22:03:33 +02:00
Laurent Destailleur
b79831ec39 Merge pull request #11952 from aspangaro/11.0_https 
Move Gnu.org to https
 2019-10-01 14:48:21 +02:00
Frédéric FRANCE
3b9bf2b06a Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-01 12:25:34 +02:00