lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14ab409ca9
dolibarr/htdocs/comm
History
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
..
action Merge remote-tracking branch 'origin/3.6' into develop 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
mailing Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
propal Merge branch 'oop-pdf' of github.com:marcosgdf/dolibarr into 2014-09-23 00:02:19 +02:00
prospect Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
address.php Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
card.php Merge remote-tracking branch 'Upstream/develop' into develop 2014-09-20 06:42:31 +02:00
contact.php Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
index.php Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
list.php Removed SQL string from call debug log 2014-06-13 01:34:39 +02:00
multiprix.php Removed closing php tag 2014-05-03 18:18:44 +02:00
propal.php Add a TODO to explain why we keep some extends into class. 2014-09-23 19:37:59 +02:00
recap-client.php Removed closing php tag 2014-05-03 18:18:44 +02:00
remise.php Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
remx.php Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00