dolibarr/htdocs/adherents
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
canvas Merge remote-tracking branch 'origin/3.6' into develop 2014-09-28 02:14:32 +02:00
cartes Renamed llx_c_pays to llx_c_country & field "libelle" to "label" 2014-08-10 13:37:39 +02:00
class Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
stats Renamed llx_c_pays to llx_c_country & field "libelle" to "label" 2014-08-10 13:37:39 +02:00
agenda.php Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
card_subscriptions.php Merge branch 'oop-pdf' of github.com:marcosgdf/dolibarr into 2014-09-23 00:02:19 +02:00
card.php Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
cotisations.php Uniformize code $_SERVER["PHP_SELF"] 2014-09-18 20:13:38 +02:00
document.php Qual: Renamed all files & links "liste.php" into "list.php" 2014-09-18 20:33:37 +02:00
fiche_subscription.php Migrated old error notifications to the """new""" system 2014-07-20 01:09:43 +02:00
htpasswd.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_subscription.php Removed closing php tag 2014-05-03 18:18:44 +02:00
info.php Removed closing php tag 2014-05-03 18:18:44 +02:00
ldap.php Deprecating arbitrary use of dol_htmloutput* functions 2014-07-20 02:32:13 +02:00
list.php Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
note.php Qual: Renamed all files & links "liste.php" into "list.php" 2014-09-18 20:33:37 +02:00
type.php Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00