Merge remote-tracking branch 'origin/3.4' into develop

Conflicts:
	htdocs/core/class/infobox.class.php
This commit is contained in:
Laurent Destailleur
2013-06-04 22:59:28 +02:00
26 changed files with 120 additions and 57 deletions

View File

@@ -28,6 +28,7 @@
require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';