22973 Commits

Author	SHA1	Message	Date
Laurent Destailleur	13442ef0df	FIX Filenames must not contains non ascii char or we will get non ascii ... char into the SMTP header.	2020-02-06 13:01:09 +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
atm-arnaud	bd6d49f04a	FIX advanced target emailing sql and ergonomy	2020-02-06 12:08:50 +01:00
Scrutinizer Auto-Fixer	59c0631172	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-02-06 09:49:12 +00:00
ptibogxiv	2ca6b8f633	Update pdf_espadon.modules.php	2020-02-06 10:49:05 +01:00
ptibogxiv	f1cce26ef0	FIX need weight short label in shipping doc ... need short label because value + term is too long	2020-02-06 10:47:56 +01:00
Laurent Destailleur	48e6db17bd	Fix doc	2020-02-06 10:28:49 +01:00
Laurent Destailleur	2966b2303b	Fix phpcs	2020-02-06 10:23:04 +01:00
Laurent Destailleur	48cd8e1314	Fix doc	2020-02-06 10:17:06 +01:00
Laurent Destailleur	857c22cb29	Fix doc	2020-02-06 10:13:10 +01:00
Laurent Destailleur	dbb731a656	Merge pull request #12957 from TobiasSekan/AddTempWorkFolder ... NEW Hidden option MAIN_TEMP_DIR	2020-02-05 20:43:26 +01:00
Laurent Destailleur	4a07740601	Update conf.class.php	2020-02-05 20:42:44 +01:00
Laurent Destailleur	7cc959e316	Update conf.class.php	2020-02-05 20:42:03 +01:00
stickler-ci	1ecef695f8	Fixing style errors.	2020-02-05 19:40:22 +00:00
Laurent Destailleur	3e73e97f24	Update conf.class.php	2020-02-05 20:39:38 +01:00
Laurent Destailleur	98ac0428a5	Update conf.class.php	2020-02-05 20:37:49 +01:00
Laurent Destailleur	4f3cc87077	FIX Confusion between 'bank reconciled' and 'accounted'. Show both data	2020-02-05 19:23:38 +01:00
Laurent Destailleur	30fa8940a9	FIX Confusion between 'bank reconciled' and 'accounted'. Show both data	2020-02-05 19:23:00 +01:00
Laurent Destailleur	80f4e625be	Fix phpcs	2020-02-05 17:07:42 +01:00
Laurent Destailleur	fdfc45bbe9	Fix wrapping	2020-02-05 15:04:11 +01:00
Florian Mortgat	eb17a52027	FIX 11.0 - default filtering for extrafields of type 'select' should not use a LIKE "%value%" condition because keys might overlap	2020-02-05 14:57:40 +01:00
Laurent Destailleur	a2bb64354b	Fix bad merge	2020-02-05 14:56:01 +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	9515467300	Merge pull request #13005 from RubenRuCh/11.0 ... FIX: #11975 When a product is split between multiple pages in a document, prices/quantity/etc appear on the last relevant page	2020-02-05 14:30:40 +01:00
Laurent Destailleur	c015707cbc	Fix Only dolibarr logos are in root of theme	2020-02-05 14:14:59 +01:00
andreubisquerra	220f02805d	Update image path after move image directory ... We need change path after move image in the commit: de4183ea65 (diff-7af3f43d430a17d6e548d766fbacecc2) Conflicts: htdocs/core/class/dolreceiptprinter.class.php	2020-02-05 14:12:29 +01:00
Laurent Destailleur	320dd69923	Merge pull request #13002 from andreubisquerra/develop ... Update image path after move image directory	2020-02-05 14:10:12 +01:00
Laurent Destailleur	ddd1ca26b9	CSS	2020-02-05 14:04:19 +01:00
Laurent Destailleur	f8daed7f56	Update company.lib.php	2020-02-05 12:49:56 +01:00
Laurent Destailleur	8051e916c0	Merge pull request #13017 from andreubisquerra/develop ... Add bold tags to Receipt Printers module	2020-02-05 12:40:07 +01:00
Laurent Destailleur	63ba601906	Update box_project.php	2020-02-05 12:39:00 +01:00
ptibogxiv	94fd2b40c7	new fix Count of Stripe payment mode must take test/live into account ... fix error message for if no stripe enabled 0b891d5e0c	2020-02-05 12:04:27 +01:00
Pierre Ardoin	81ed70ffc7	Update box_project.php	2020-02-05 09:18:39 +01:00
Pierre Ardoin	d5b74a8ca3	Update box_project.php	2020-02-05 09:06:43 +01:00
Pierre Ardoin	262d889700	Update box_project.php	2020-02-05 08:50:51 +01:00
Laurent Destailleur	0b891d5e0c	FIX Count of Stripe payment mode must take test/live into account	2020-02-04 19:33:47 +01:00
Laurent Destailleur	bc19f72306	FIX Count of Stripe payment mode must take test/live into account	2020-02-04 19:33:20 +01:00
Laurent Destailleur	bb1c9a66dd	Fix code alignement on modulebuilder	2020-02-04 16:37:30 +01:00
Laurent Destailleur	976ce0a954	Fix scrutinizer	2020-02-04 14:33:25 +01:00
Laurent Destailleur	157745a1bb	Fix phpcs	2020-02-04 14:18:37 +01:00
AdrianDominik	4695172028	Merge remote-tracking branch 'upstream/11.0' into 11.0	2020-02-04 11:40:37 +01:00
Pierre Ardoin	d93a597a1e	Fix Compatbility with Multicompany ... Before : Show all projects of all entities Now : Show only projects that are allowed by permissions	2020-02-04 09:17:02 +01:00
Laurent Destailleur	bf4fca0c7e	Fix warning	2020-02-03 22:09:21 +01:00
Laurent Destailleur	c367c6f34e	Avoid warning	2020-02-03 21:17:45 +01:00
Alexandre SPANGARO	d6d3fff9dc	Merge branch 'develop' into 10.0_intracommreport	2020-02-03 21:15:07 +01:00
andreubisquerra	e6dc384ee9	Add bold tags	2020-02-03 19:33:23 +01:00
stickler-ci	5dcd5e5b87	Fixing style errors.	2020-02-03 09:54:35 +01:00
AdrianDominik	ed269a387f	FIX: #11975 When a product is split between multiple pages in a document, prices/quantity/etc appear on the last relevant page	2020-02-03 09:54:34 +01:00
Laurent Destailleur	97d726733c	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/includes/tecnickcom/tcpdf/tcpdf.php	2020-02-03 06:36:43 +01:00