Laurent Destailleur 14ab409ca9 Merge remote-tracking branch 'origin/3.6' into develop ... Conflicts: htdocs/admin/stock.php htdocs/admin/system/index.php htdocs/comm/fiche.php htdocs/core/lib/admin.lib.php htdocs/core/lib/holiday.lib.php htdocs/core/lib/pdf.lib.php htdocs/core/login/functions_forceuser.php htdocs/core/login/functions_http.php htdocs/core/menus/standard/auguria.lib.php htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php htdocs/filefunc.inc.php htdocs/holiday/define_holiday.php htdocs/opensurvey/fonctions.php htdocs/societe/canvas/actions_card_common.class.php test/phpunit/CompanyBankAccountTest.php test/phpunit/ExportTest.php test/phpunit/FactureTest.php test/phpunit/FunctionsLibTest.php test/phpunit/PropalTest.php test/phpunit/SocieteTest.php test/phpunit/WebservicesInvoicesTest.php test/phpunit/WebservicesThirdpartyTest.php		2014-09-28 02:14:32 +02:00
..
admin	Fix : [ bug #1549 ] Itïs not possible add ExtraFields	2014-08-06 17:38:44 +02:00
ajax	Better error management	2014-08-31 15:09:10 +02:00
canvas	Merge remote-tracking branch 'origin/3.6' into develop	2014-09-28 02:14:32 +02:00
checkvat	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
class	Merge remote-tracking branch 'origin/3.6' into develop	2014-09-28 02:14:32 +02:00
notify	Qual: Renamed all files & links "fiche.php" into "card.php"	2014-09-18 21:18:25 +02:00
tpl	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
agenda.php	Qual: Renamed all files & links "fiche.php" into "card.php"	2014-09-18 21:18:25 +02:00
ajaxcompanies.php	Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on	2014-09-27 17:13:15 +02:00
ajaxcountries.php	Renamed llx_c_pays to llx_c_country & field "libelle" to "label"	2014-08-10 13:37:39 +02:00
commerciaux.php	Qual: Renamed all files & links "fiche.php" into "card.php"	2014-09-18 21:18:25 +02:00
consumption.php	Correct view greek language	2014-09-17 18:06:31 +03:00
document.php	Removed closing php tag	2014-05-03 18:18:44 +02:00
index.php	Qual: Renamed all files & links "liste.php" into "list.php"	2014-09-18 20:33:37 +02:00
info.php	Squelette plus complet.	2014-08-15 21:18:56 +02:00
note.php	Removed closing php tag	2014-05-03 18:18:44 +02:00
price.php	Merge	2014-09-07 12:22:04 +02:00
rib.php	Deprecating arbitrary use of dol_htmloutput* functions	2014-07-20 02:32:13 +02:00
soc.php	Qual: Renamed all files & links "fiche.php" into "card.php"	2014-09-18 21:18:25 +02:00
societe.php	Deprecating arbitrary use of dol_htmloutput* functions	2014-07-20 02:32:13 +02:00
societecontact.php	Qual: Renamed all files & links "fiche.php" into "card.php"	2014-09-18 21:18:25 +02:00