diff --git a/dev/skeletons/skeleton_class.class.php b/dev/skeletons/skeleton_class.class.php
index 2f8c78556e1916d5b4651c5e9eb58bf3230c4c38..1903d6f4572d65105cb8bea759bd8580f2fe4b6d 100644
--- a/dev/skeletons/skeleton_class.class.php
+++ b/dev/skeletons/skeleton_class.class.php
@@ -35,19 +35,10 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
* Class Skeleton_Class
*
* Put here description of your class
+ * @see CommonObject
*/
class Skeleton_Class extends CommonObject
{
- /**
- * @var string Error code (or message)
- * @deprecated
- * @see Skeleton_Class::errors
- */
- public $error;
- /**
- * @var string[] Error codes (or messages)
- */
- public $errors = array();
/**
* @var string Id to identify managed objects
*/
@@ -62,10 +53,6 @@ class Skeleton_Class extends CommonObject
*/
public $lines = array();
- /**
- * @var int ID
- */
- public $id;
/**
* @var mixed Sample property 1
*/
diff --git a/dev/skeletons/skeleton_page.php b/dev/skeletons/skeleton_page.php
index 2dd9f08e18f4f4b53a179dc6085e7804bb0bf0d3..0eb3b01589c1b30c464304289922509424c92665 100644
--- a/dev/skeletons/skeleton_page.php
+++ b/dev/skeletons/skeleton_page.php
@@ -351,7 +351,7 @@ if ($action == 'list' || (empty($id) && $action != 'create'))
// Part to create
if ($action == 'create')
{
- print_fiche_titre($langs->trans("NewSkeleton"));
+ print load_fiche_titre($langs->trans("NewSkeleton"));
print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
print '<input type="hidden" name="action" value="add">';
diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php
index 51c6a5c671570be22a84451a929f1cb8f3aa20c4..925bf818137780ab9b7cf8f36834e944acb7ac45 100644
--- a/htdocs/accountancy/admin/card.php
+++ b/htdocs/accountancy/admin/card.php
@@ -139,7 +139,7 @@ $htmlacc = new FormVentilation($db);
if ($action == 'create')
{
- print_fiche_titre($langs->trans('NewAccount'));
+ print load_fiche_titre($langs->trans('NewAccount'));
print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n";
print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
diff --git a/htdocs/accountancy/admin/export.php b/htdocs/accountancy/admin/export.php
index 6ba6c05208ac7918739820744134a691f71fe790..9bde2d23c14a40221129f00aefd4d237f03b2362 100644
--- a/htdocs/accountancy/admin/export.php
+++ b/htdocs/accountancy/admin/export.php
@@ -115,7 +115,7 @@ llxHeader();
$form = new Form($db);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans('ConfigAccountingExpert'),$linkback,'title_setup');
+print load_fiche_titre($langs->trans('ConfigAccountingExpert'),$linkback,'title_setup');
$head = admin_accounting_prepare_head();
diff --git a/htdocs/accountancy/admin/fiscalyear.php b/htdocs/accountancy/admin/fiscalyear.php
index bd530eaa8d77d8b062d2a4ac44ee76a5003674b8..31ec91958c9004bfc9744b7bb8ac7600fa742c89 100644
--- a/htdocs/accountancy/admin/fiscalyear.php
+++ b/htdocs/accountancy/admin/fiscalyear.php
@@ -63,7 +63,7 @@ $title = $langs->trans('FiscalYears');
llxHeader('',$title,LOG_ERR);
-print_fiche_titre($langs->trans('FiscalYears'));
+print load_fiche_titre($langs->trans('FiscalYears'));
$sql = "SELECT f.rowid, f.label, f.date_start, f.date_end, f.statut, f.entity";
$sql.= " FROM ".MAIN_DB_PREFIX."accounting_fiscalyear as f";
diff --git a/htdocs/accountancy/admin/fiscalyear_card.php b/htdocs/accountancy/admin/fiscalyear_card.php
index a1692878c55f22829d5c2864cfe5001b96bae3f3..0e39776946a1c350375c3fd9120c31ee8a906013 100644
--- a/htdocs/accountancy/admin/fiscalyear_card.php
+++ b/htdocs/accountancy/admin/fiscalyear_card.php
@@ -170,7 +170,7 @@ $form = new Form($db);
*/
if ($action == 'create')
{
- print_fiche_titre($langs->trans("NewFiscalYear"));
+ print load_fiche_titre($langs->trans("NewFiscalYear"));
print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index 44b2268dc0607cd0d8958dcfd386800a031ca914..af0bccdf00c59988b55bdc8f71b1dfa34e2144fa 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -153,7 +153,7 @@ llxHeader();
$form = new Form($db);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans('ConfigAccountingExpert'),$linkback,'title_setup');
+print load_fiche_titre($langs->trans('ConfigAccountingExpert'),$linkback,'title_setup');
$head = admin_accounting_prepare_head($accounting);
diff --git a/htdocs/accountancy/admin/journal.php b/htdocs/accountancy/admin/journal.php
index e1d4894788aedc929748825ed2dc5f12e803e3d7..b55728ee080aff27b0f3df864968b5b7330af9fc 100644
--- a/htdocs/accountancy/admin/journal.php
+++ b/htdocs/accountancy/admin/journal.php
@@ -83,7 +83,7 @@ llxHeader();
$form = new Form($db);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans('ConfigAccountingExpert'),$linkback,'title_setup');
+print load_fiche_titre($langs->trans('ConfigAccountingExpert'),$linkback,'title_setup');
$head = admin_accounting_prepare_head(null);
diff --git a/htdocs/accountancy/bookkeeping/balancebymonth.php b/htdocs/accountancy/bookkeeping/balancebymonth.php
index 54c239f2db9d91ed513422ef60362d79888687fb..c1902c16fee104e202482968263d08370687cf45 100644
--- a/htdocs/accountancy/bookkeeping/balancebymonth.php
+++ b/htdocs/accountancy/bookkeeping/balancebymonth.php
@@ -56,7 +56,7 @@ llxHeader('', $langs->trans("Bookkeeping"));
$textprevyear = '<a href="' . $_SERVER["PHP_SELF"] . '?year=' . ($year_current - 1) . '">' . img_previous() . '</a>';
$textnextyear = ' <a href="' . $_SERVER["PHP_SELF"] . '?year=' . ($year_current + 1) . '">' . img_next() . '</a>';
-print_fiche_titre($langs->trans("AccountBalanceByMonth") . ' ' . $textprevyear . ' ' . $langs->trans("Year") . ' ' . $year_start . ' ' . $textnextyear);
+print load_fiche_titre($langs->trans("AccountBalanceByMonth") . ' ' . $textprevyear . ' ' . $langs->trans("Year") . ' ' . $year_start . ' ' . $textnextyear);
$sql = "SELECT count(*) FROM " . MAIN_DB_PREFIX . "facturedet as fd";
$sql .= " , " . MAIN_DB_PREFIX . "facture as f";
diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 515b9898c2351dfc76b461ffdc05a282fd882875..d1bf69a8eee27c18ecfbfdd43cc294a138775d3f 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -189,7 +189,7 @@ if ($action == 'delete') {
}
if ($action == 'create') {
- print_fiche_titre($langs->trans("CreateMvts"));
+ print load_fiche_titre($langs->trans("CreateMvts"));
$code_journal_array = array (
$conf->global->ACCOUNTING_SELL_JOURNAL => $conf->global->ACCOUNTING_SELL_JOURNAL,
@@ -250,7 +250,7 @@ if ($action == 'create') {
}
if (! empty($book->piece_num)) {
- print_fiche_titre($langs->trans("UpdateMvts"));
+ print load_fiche_titre($langs->trans("UpdateMvts"));
print '<table class="border" width="100%">';
print '<tr class="pair">';
@@ -280,7 +280,7 @@ if ($action == 'create') {
setEventMessage($book->errors, 'errors');
} else {
- print_fiche_titre($langs->trans("ListeMvts"));
+ print load_fiche_titre($langs->trans("ListeMvts"));
print "<table class=\"noborder\" width=\"100%\">";
if (count($book->linesmvt) > 0) {
@@ -367,7 +367,7 @@ if ($action == 'create') {
}
}
else {
- print_fiche_titre($langs->trans("NoRecords"));
+ print load_fiche_titre($langs->trans("NoRecords"));
}
}
diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index 856306c33048fb3e33e8a7722b54018524d51596..9277bcd9a70e01bdb082c0b5be3296c0caf25839 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -30,11 +30,6 @@
*/
class AccountingAccount extends CommonObject
{
- var $db;
- var $error;
- var $errors;
-
- var $id;
var $rowid;
var $datec; // Creation date
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 374767fe41115697dcd73f3d11bdf6fda62cf9b3..141b122690c1468823670bf317330f98762873bc 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -29,11 +29,6 @@
*/
class BookKeeping extends CommonObject
{
- var $db;
- var $error;
- var $errors;
-
- var $id;
var $doc_date;
var $doc_type;
var $doc_ref;
diff --git a/htdocs/accountancy/customer/card.php b/htdocs/accountancy/customer/card.php
index 74083cbb215a34205d2508ed1ecbfe7b0bf4494b..09e8b24a8ea57ae517e9389a2f4314aaa73198bc 100644
--- a/htdocs/accountancy/customer/card.php
+++ b/htdocs/accountancy/customer/card.php
@@ -108,7 +108,7 @@ if (! empty($id)) {
print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
print '<input type="hidden" name="action" value="ventil">';
- print_fiche_titre($langs->trans('CustomersVentilation'),'','title_setup');
+ print load_fiche_titre($langs->trans('CustomersVentilation'),'','title_setup');
dol_fiche_head();
diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index e4c6104fd1bc42213ada5329522dbaf5ffa14baa..ea37f23745565ee8d560d9c682e2d0a7c063b824 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -98,7 +98,7 @@ llxHeader('', $langs->trans("CustomersVentilation"));
$textprevyear = '<a href="' . $_SERVER["PHP_SELF"] . '?year=' . ($year_current - 1) . '">' . img_previous() . '</a>';
$textnextyear = ' <a href="' . $_SERVER["PHP_SELF"] . '?year=' . ($year_current + 1) . '">' . img_next() . '</a>';
-print_fiche_titre($langs->trans("CustomersVentilation") . " " . $textprevyear . " " . $langs->trans("Year") . " " . $year_start . " " . $textnextyear);
+print load_fiche_titre($langs->trans("CustomersVentilation") . " " . $textprevyear . " " . $langs->trans("Year") . " " . $year_start . " " . $textnextyear);
print '<b>' . $langs->trans("DescVentilCustomer") . '</b>';
print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?action=validatehistory">' . $langs->trans("ValidateHistory") . '</a></div>';
diff --git a/htdocs/accountancy/supplier/card.php b/htdocs/accountancy/supplier/card.php
index 4ba2666973cbff61f11006ae2e637b0c89561dcc..f0747c8d29ceffe2e5d492db6bad8003efbafddd 100644
--- a/htdocs/accountancy/supplier/card.php
+++ b/htdocs/accountancy/supplier/card.php
@@ -107,7 +107,7 @@ if (! empty($id)) {
print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
print '<input type="hidden" name="action" value="ventil">';
- print_fiche_titre($langs->trans('SuppliersVentilation'),'','title_setup');
+ print load_fiche_titre($langs->trans('SuppliersVentilation'),'','title_setup');
dol_fiche_head();
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index 8eaf6681676f2fc5df946cafeb2b6b027aea9642..954eb60300cbbd30db198b15ed091ffae9cb5a84 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -95,7 +95,7 @@ llxHeader('', $langs->trans("SuppliersVentilation"));
$textprevyear = '<a href="' . $_SERVER["PHP_SELF"] . '?year=' . ($year_current - 1) . '">' . img_previous() . '</a>';
$textnextyear = ' <a href="' . $_SERVER["PHP_SELF"] . '?year=' . ($year_current + 1) . '">' . img_next() . '</a>';
-print_fiche_titre($langs->trans("SuppliersVentilation") . " " . $textprevyear . " " . $langs->trans("Year") . " " . $year_start . " " . $textnextyear);
+print load_fiche_titre($langs->trans("SuppliersVentilation") . " " . $textprevyear . " " . $langs->trans("Year") . " " . $year_start . " " . $textnextyear);
print '<b>' . $langs->trans("DescVentilSupplier") . '</b>';
print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?action=validatehistory">' . $langs->trans("ValidateHistory") . '</a></div>';
diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php
index 877c8d785e87b5e48c807b3556b79440f84aac6a..5827e1d22d7bd5e4ae9ef87cbbd53ee724182600 100644
--- a/htdocs/adherents/admin/adherent.php
+++ b/htdocs/adherents/admin/adherent.php
@@ -111,14 +111,14 @@ llxHeader('',$langs->trans("MembersSetup"),$help_url);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("MembersSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("MembersSetup"),$linkback,'title_setup');
$head = member_admin_prepare_head();
dol_fiche_head($head, 'general', $langs->trans("Members"), 0, 'user');
-print_fiche_titre($langs->trans("MemberMainOptions"),'','');
+print load_fiche_titre($langs->trans("MemberMainOptions"),'','');
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Description").'</td>';
@@ -245,7 +245,7 @@ $constantes=array(
'ADHERENT_CARD_FOOTER_TEXT'
);
-print_fiche_titre($langs->trans("MembersCards"),'','');
+print load_fiche_titre($langs->trans("MembersCards"),'','');
form_constantes($constantes);
@@ -263,7 +263,7 @@ print '<br>';
*/
$constantes=array('ADHERENT_ETIQUETTE_TYPE','ADHERENT_ETIQUETTE_TEXT');
-print_fiche_titre($langs->trans("MembersTickets"),'','');
+print load_fiche_titre($langs->trans("MembersTickets"),'','');
form_constantes($constantes);
@@ -293,7 +293,7 @@ $constantes=array(
'ADHERENT_MAIL_FROM',
);
-print_fiche_titre($langs->trans("Other"),'','');
+print load_fiche_titre($langs->trans("Other"),'','');
form_constantes($constantes);
diff --git a/htdocs/adherents/admin/adherent_extrafields.php b/htdocs/adherents/admin/adherent_extrafields.php
index 6ac36cac022ea20e15ae3d6b9648c8c78a8ab57b..32bf1c87b11461da12e304a281e35c20c6047de1 100644
--- a/htdocs/adherents/admin/adherent_extrafields.php
+++ b/htdocs/adherents/admin/adherent_extrafields.php
@@ -65,7 +65,7 @@ llxHeader('',$langs->trans("MembersSetup"),$help_url);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("MembersSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("MembersSetup"),$linkback,'title_setup');
$head = member_admin_prepare_head();
@@ -95,7 +95,7 @@ if ($action != 'create' && $action != 'edit')
if ($action == 'create')
{
print "<br>";
- print_titre($langs->trans('NewAttribute'));
+ print load_fiche_titre($langs->trans('NewAttribute'));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
}
@@ -108,7 +108,7 @@ if ($action == 'create')
if ($action == 'edit' && ! empty($attrname))
{
print "<br>";
- print_titre($langs->trans("FieldEdition", $attrname));
+ print load_fiche_titre($langs->trans("FieldEdition", $attrname));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
}
diff --git a/htdocs/adherents/admin/adherent_type_extrafields.php b/htdocs/adherents/admin/adherent_type_extrafields.php
index 19695a2ef6d727f25825c4f72ffa6d2aec0a80c4..835bd05ea5f34331af6267e9d651b354e8242a08 100644
--- a/htdocs/adherents/admin/adherent_type_extrafields.php
+++ b/htdocs/adherents/admin/adherent_type_extrafields.php
@@ -68,7 +68,7 @@ llxHeader('',$langs->trans("MembersSetup"),$help_url);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("MembersSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("MembersSetup"),$linkback,'title_setup');
$head = member_admin_prepare_head();
@@ -98,7 +98,7 @@ if ($action != 'create' && $action != 'edit')
if ($action == 'create')
{
print "<br>";
- print_titre($langs->trans('NewAttribute'));
+ print load_fiche_titre($langs->trans('NewAttribute'));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
}
@@ -111,7 +111,7 @@ if ($action == 'create')
if ($action == 'edit' && ! empty($attrname))
{
print "<br>";
- print_titre($langs->trans("FieldEdition", $attrname));
+ print load_fiche_titre($langs->trans("FieldEdition", $attrname));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
}
diff --git a/htdocs/adherents/admin/public.php b/htdocs/adherents/admin/public.php
index 187f71e93a83b0d6124fc9e0c59938df67335319..3d88d3bb17175cf3f1bdae47f7abae7caa5737fe 100644
--- a/htdocs/adherents/admin/public.php
+++ b/htdocs/adherents/admin/public.php
@@ -80,7 +80,7 @@ llxHeader('',$langs->trans("MembersSetup"),$help_url);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("MembersSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("MembersSetup"),$linkback,'title_setup');
$head = member_admin_prepare_head();
diff --git a/htdocs/adherents/canvas/actions_adherentcard_common.class.php b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
index 6a8660c7f467510e27b1af96d1021a0d52ab9fd4..06574f7ae107df2ddad3690bfa6ce6726981cb98 100644
--- a/htdocs/adherents/canvas/actions_adherentcard_common.class.php
+++ b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
@@ -211,7 +211,7 @@ abstract class ActionsAdherentCardCommon
{
$this->object->fetch($_POST["adherentid"]);
- $this->object->oldcopy=dol_clone($this->object);
+ $this->object->oldcopy = clone $this->object;
$this->assign_post();
@@ -434,4 +434,3 @@ abstract class ActionsAdherentCardCommon
}
}
-
diff --git a/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php b/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
index 5c40cb22954bb90b7b7f4b5b26501872fcb729db..7e0b12919980de6bd5768d425e0a8424cb2396ad 100644
--- a/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
+++ b/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
@@ -30,12 +30,6 @@ include_once DOL_DOCUMENT_ROOT.'/adherents/canvas/actions_adherentcard_common.cl
*/
class ActionsAdherentCardDefault extends ActionsAdherentCardCommon
{
- var $db;
- var $dirmodule;
- var $targetmodule;
- var $canvas;
- var $card;
-
/**
* Constructor
*
diff --git a/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php b/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php
index 8c44bc48a3f2dc22ccfbfaca1ead382e2c63a5f9..230598895713bdf88645031328a78b807d041b68 100644
--- a/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php
+++ b/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php
@@ -21,7 +21,7 @@
<!-- BEGIN PHP TEMPLATE ADHERENTCARD_CREATE.TPL.PHP DEFAULT -->
<?php
-print_fiche_titre($this->control->tpl['title']);
+print load_fiche_titre($this->control->tpl['title']);
dol_htmloutput_errors((is_numeric($object->error)?'':$object->error),$object->errors);
diff --git a/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php b/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php
index 47c144c238fdf742b0eb38d67c21a17786163d76..1d7f7892276683e6043e294b8fde8e9a472616d3 100644
--- a/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php
+++ b/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php
@@ -24,7 +24,7 @@ $contact = $GLOBALS['objcanvas']->control->object;
<!-- BEGIN PHP TEMPLATE ADHERENTCARD_EDIT.TPL.PHP DEFAULT -->
<?php
-print_fiche_titre($this->control->tpl['title']);
+print load_fiche_titre($this->control->tpl['title']);
dol_htmloutput_errors($this->control->tpl['error'],$this->control->tpl['errors']);
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index a74e19648ea6f024be0fcfa2bda16a2a0e0e1e62..2afa92de068c6df5491fca804ae992397c5f8dac 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -268,7 +268,7 @@ if (empty($reshook))
// Create new object
if ($result > 0 && ! $error)
{
- $object->oldcopy=dol_clone($object);
+ $object->oldcopy = clone $object;
// Change values
$object->civility_id = trim($_POST["civility_id"]);
@@ -779,7 +779,7 @@ else
$adht = new AdherentType($db);
- print_fiche_titre($langs->trans("NewMember"));
+ print load_fiche_titre($langs->trans("NewMember"));
if ($conf->use_javascript_ajax)
{
diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php
index 71fd6f3caa11416ef1efba49c27da68aa13b67cc..92af9c5981e00a447c838a99843a821dc163eb38 100644
--- a/htdocs/adherents/card_subscriptions.php
+++ b/htdocs/adherents/card_subscriptions.php
@@ -827,7 +827,7 @@ if ($rowid > 0)
{
print '<br>';
- print_fiche_titre($langs->trans("NewCotisation"));
+ print load_fiche_titre($langs->trans("NewCotisation"));
// Define default choice to select
$bankdirect=0; // 1 means option by default is write to bank direct with no invoice
diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php
index 98f5e908e16880de0003d0af60ba8f85a5cd5e4b..dc1b6563c53f0a8b52f2331021e62f2fa11a44f3 100644
--- a/htdocs/adherents/cartes/carte.php
+++ b/htdocs/adherents/cartes/carte.php
@@ -219,7 +219,7 @@ $form=new Form($db);
llxHeader('',$langs->trans("MembersCards"));
-print_fiche_titre($langs->trans("LinkToGeneratedPages"));
+print load_fiche_titre($langs->trans("LinkToGeneratedPages"));
print '<br>';
print $langs->trans("LinkToGeneratedPagesDesc").'<br>';
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index d83664fd39289a26c1a31deb8a395adf519186bf..445ec659f5a1a86736a58f01fe98b835212e9fd0 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -44,18 +44,8 @@ class Adherent extends CommonObject
public $table_element='adherent';
protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
- var $error;
- var $errors;
var $mesgs;
- var $id;
-
- var $ref;
- public $ref_ext;
-
- var $civility_id;
- var $firstname;
- var $lastname;
var $login;
var $pass;
var $societe;
@@ -68,10 +58,6 @@ class Adherent extends CommonObject
var $state_code; // Code of department
var $state; // Label of department
- var $country_id;
- var $country_code;
- var $country;
-
var $email;
var $skype;
var $phone;
@@ -80,8 +66,6 @@ class Adherent extends CommonObject
var $morphy;
var $public;
- var $note_private; // Private note
- var $note_public; // Public note
var $statut; // -1:brouillon, 0:resilie, >=1:valide,paye
var $photo;
@@ -99,7 +83,6 @@ class Adherent extends CommonObject
var $user_login;
var $fk_soc;
- var $thirdparty; // Loaded by ->fetch_thirdparty()
// Fields loaded by fetch_subscriptions()
var $first_subscription_date;
@@ -110,9 +93,6 @@ class Adherent extends CommonObject
var $last_subscription_amount;
var $subscriptions=array();
- // var $public;
- var $array_options;
-
var $oldcopy; // To contains a clone of this when we need to save old properties of object
public $entity;
diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index 23ecfd6ea03f6a96ed53e238f997bdafca5fa9b7..af98d7162da7a9aa29f6781c74472e087ee547a8 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -35,18 +35,9 @@ class AdherentType extends CommonObject
public $table_element = 'adherent_type';
public $element = 'adherent_type';
- var $id;
-
- /**
- * @var int
- */
- public $ref;
-
var $libelle;
- var $statut;
var $cotisation; // Soumis a la cotisation
var $vote; // droit de vote
- var $note; // commentaire
var $mail_valid; //mail envoye lors de la validation
diff --git a/htdocs/adherents/class/cotisation.class.php b/htdocs/adherents/class/cotisation.class.php
index ee9358b51da25887a3ee9c5cbdff5877a152706b..40527e6e22e00131ea730d4aaf078548835409c8 100644
--- a/htdocs/adherents/class/cotisation.class.php
+++ b/htdocs/adherents/class/cotisation.class.php
@@ -33,16 +33,12 @@ class Cotisation extends CommonObject
public $element='subscription';
public $table_element='cotisation';
- var $id;
- var $ref;
-
var $datec; // Date creation
var $datem; // Date modification
var $dateh; // Subscription start date (date subscription)
var $datef; // Subscription end date
var $fk_adherent;
var $amount;
- var $note;
var $fk_bank;
diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index 9f404fe1510d20d3248f68026eeb78853378dd12..d6c17337176b455b6df97882a0b90f7a4337ae7f 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -46,7 +46,7 @@ $staticmember=new Adherent($db);
$statictype=new AdherentType($db);
$subscriptionstatic=new Cotisation($db);
-print_fiche_titre($langs->trans("MembersArea"));
+print load_fiche_titre($langs->trans("MembersArea"));
$var=True;
diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php
index c05dc78af83abdfb9ca026091fd8ebabd8ebfd40..89572525c32d95f9a12ebe6e664649a366bbf96e 100644
--- a/htdocs/adherents/ldap.php
+++ b/htdocs/adherents/ldap.php
@@ -173,7 +173,7 @@ if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && $conf->global->LDAP_MEMBER_ACT
// Affichage attributs LDAP
-print_titre($langs->trans("LDAPInformationsForThisMember"));
+print load_fiche_titre($langs->trans("LDAPInformationsForThisMember"));
print '<table width="100%" class="noborder">';
diff --git a/htdocs/adherents/stats/byproperties.php b/htdocs/adherents/stats/byproperties.php
index fdb9153ba88da416d149ce3768e3b439a87a35ec..6f5edf529d9f456a8ce83afbd91e54c5f4b3a7aa 100644
--- a/htdocs/adherents/stats/byproperties.php
+++ b/htdocs/adherents/stats/byproperties.php
@@ -58,7 +58,7 @@ llxHeader('','','','',0,0,array('http://www.google.com/jsapi'));
$title=$langs->trans("MembersStatisticsByProperties");
-print_fiche_titre($title, $mesg);
+print load_fiche_titre($title, $mesg);
dol_mkdir($dir);
@@ -112,7 +112,7 @@ if (! count($data))
}
else
{
- print_fiche_titre($langs->trans("MembersByNature"),'','');
+ print load_fiche_titre($langs->trans("MembersByNature"),'','');
}
// Print array
diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php
index 938e3e172b20424f96e18b3d504a5403baf08000..3b2ca4c3ecd931f1776630324cd850452e024a4d 100644
--- a/htdocs/adherents/stats/geo.php
+++ b/htdocs/adherents/stats/geo.php
@@ -64,7 +64,7 @@ if ($mode == 'memberbytown') $title=$langs->trans("MembersStatisticsByTown");
if ($mode == 'memberbyregion') $title=$langs->trans("MembersStatisticsByRegion");
-print_fiche_titre($title, $mesg);
+print load_fiche_titre($title, $mesg);
dol_mkdir($dir);
diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php
index 41305d3949da2c31889f1eda05ae56f94b0e029c..a3c8fd69aad80f520255665e82cb472bea14279d 100644
--- a/htdocs/adherents/stats/index.php
+++ b/htdocs/adherents/stats/index.php
@@ -58,7 +58,7 @@ $form=new Form($db);
llxHeader();
-print_fiche_titre($langs->trans("SubscriptionsStatistics"), $mesg);
+print load_fiche_titre($langs->trans("SubscriptionsStatistics"), $mesg);
$dir=$conf->adherent->dir_temp;
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 6c9423b6178d963481908462ce56fbf373371b2b..75102ed9f501975bff74974f2cba563213099016 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -166,7 +166,7 @@ $form=new Form($db);
if (! $rowid && $action != 'create' && $action != 'edit')
{
- print_fiche_titre($langs->trans("MembersTypes"));
+ print load_fiche_titre($langs->trans("MembersTypes"));
dol_fiche_head('');
@@ -238,7 +238,7 @@ if ($action == 'create')
{
$object = new AdherentType($db);
- print_fiche_titre($langs->trans("NewMemberType"));
+ print load_fiche_titre($langs->trans("NewMemberType"));
print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php
index 16608a5fae22a50dd0e447562c79e5a00667b94e..287f2a897ebad9db8b00715135ab303ee3978132 100644
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -133,7 +133,7 @@ if (preg_match('/del_(.*)/',$action,$reg))
llxHeader();
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("AgendaSetup"),$linkback,'title_setup');
print "<br>\n";
diff --git a/htdocs/admin/agenda_extrafields.php b/htdocs/admin/agenda_extrafields.php
index d7af0bc8d9eff7019e88c44a4c54ebd1187bed58..9007ef5ad91575ff6bc4de0cb4ccfa8b64e27055 100644
--- a/htdocs/admin/agenda_extrafields.php
+++ b/htdocs/admin/agenda_extrafields.php
@@ -70,7 +70,7 @@ $textobject=$langs->transnoentitiesnoconv("Agenda");
llxHeader('',$langs->trans("AgendaSetup"));
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("AgendaSetup"),$linkback,'title_setup');
print "<br>\n";
$head=agenda_prepare_head();
@@ -100,7 +100,7 @@ if ($action != 'create' && $action != 'edit')
if ($action == 'create')
{
print "<br>";
- print_titre($langs->trans('NewAttribute'));
+ print load_fiche_titre($langs->trans('NewAttribute'));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
}
@@ -113,7 +113,7 @@ if ($action == 'create')
if ($action == 'edit' && ! empty($attrname))
{
print "<br>";
- print_titre($langs->trans("FieldEdition", $attrname));
+ print load_fiche_titre($langs->trans("FieldEdition", $attrname));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
}
diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php
index 2e113f224301e22178b026010a42768a698e83ec..9356674921e028846797bb9094863c07bdffb511 100644
--- a/htdocs/admin/agenda_extsites.php
+++ b/htdocs/admin/agenda_extsites.php
@@ -127,7 +127,7 @@ $arrayofcss=array();
llxHeader('',$langs->trans("AgendaSetup"),'','',0,0,$arrayofjs,$arrayofcss);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("AgendaSetup"),$linkback,'title_setup');
print '<br>';
print '<form name="extsitesconfig" action="'.$_SERVER["PHP_SELF"].'" method="post">';
diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index f892fe7149a7b6f8b6d0d493849d548939ef7ca9..364680757cfbf42b4daf0b73754a0230c77b447c 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -89,7 +89,7 @@ $formactions=new FormActions($db);
llxHeader();
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("AgendaSetup"),$linkback,'title_setup');
print "<br>\n";
diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php
index f7abde2280ea8ee3d7c39820047ea958f7ef451b..dfdac2a8f0f5d9235bbb0bf47db1277817c1e64b 100644
--- a/htdocs/admin/agenda_xcal.php
+++ b/htdocs/admin/agenda_xcal.php
@@ -74,7 +74,7 @@ if (! isset($conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY)) $conf->global->MAIN_A
llxHeader();
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("AgendaSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("AgendaSetup"),$linkback,'title_setup');
print '<br>';
diff --git a/htdocs/admin/askpricesupplier.php b/htdocs/admin/askpricesupplier.php
index 485fbb2ef23a54faf641fbb2d9a1f90b3e66aecb..5644605e625f2dc1f2e487ffdb6369ba0cbc5a7d 100644
--- a/htdocs/admin/askpricesupplier.php
+++ b/htdocs/admin/askpricesupplier.php
@@ -240,7 +240,7 @@ $form=new Form($db);
//if ($mesg) print $mesg;
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("AskPriceSupplierSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("AskPriceSupplierSetup"),$linkback,'title_setup');
$head = askpricesupplier_admin_prepare_head();
@@ -249,7 +249,7 @@ dol_fiche_head($head, 'general', $langs->trans("CommRequests"), 0, 'askpricesupp
/*
* Module numerotation
*/
-print_titre($langs->trans("AskPriceSupplierNumberingModules"));
+print load_fiche_titre($langs->trans("AskPriceSupplierNumberingModules"));
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
@@ -351,7 +351,7 @@ print "</table><br>\n";
* Document templates generators
*/
-print_titre($langs->trans("AskPriceSupplierPDFModules"));
+print load_fiche_titre($langs->trans("AskPriceSupplierPDFModules"));
// Load array def with activated templates
$def = array();
@@ -513,7 +513,7 @@ print '<br>';
* Other options
*
*/
-print_titre($langs->trans("OtherOptions"));
+print load_fiche_titre($langs->trans("OtherOptions"));
$var=true;
print "<table class=\"noborder\" width=\"100%\">";
@@ -594,7 +594,7 @@ print '</table>';
* Directory
*/
print '<br>';
-print_titre($langs->trans("PathToDocuments"));
+print load_fiche_titre($langs->trans("PathToDocuments"));
print "<table class=\"noborder\" width=\"100%\">\n";
print "<tr class=\"liste_titre\">\n";
diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php
index 214ac6b68c04a075823f12004ac466a667852222..8214755fd2b24499725ce1305cbe38da53954027 100644
--- a/htdocs/admin/bank.php
+++ b/htdocs/admin/bank.php
@@ -87,7 +87,7 @@ llxHeader("",$langs->trans("BankSetupModule"));
$form=new Form($db);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("BankSetupModule"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("BankSetupModule"),$linkback,'title_setup');
print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
@@ -142,7 +142,7 @@ print '</form>';
//Show bank account order
-print_titre($langs->trans("BankOrderShow"));
+print load_fiche_titre($langs->trans("BankOrderShow"));
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
diff --git a/htdocs/admin/bank_extrafields.php b/htdocs/admin/bank_extrafields.php
index d8155c57f1ce73c9047cc24ba92982db0641c287..849cbd9f4859ada5c0fda0405fbab3a1a8b08296 100644
--- a/htdocs/admin/bank_extrafields.php
+++ b/htdocs/admin/bank_extrafields.php
@@ -66,7 +66,7 @@ llxHeader('',$langs->trans("BankSetupModule"),$help_url);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("BankSetupModule"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("BankSetupModule"),$linkback,'title_setup');
$head = bank_admin_prepare_head(null);
@@ -96,7 +96,7 @@ if ($action != 'create' && $action != 'edit')
if ($action == 'create')
{
print "<br>";
- print_titre($langs->trans('NewAttribute'));
+ print load_fiche_titre($langs->trans('NewAttribute'));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
}
@@ -109,7 +109,7 @@ if ($action == 'create')
if ($action == 'edit' && ! empty($attrname))
{
print "<br>";
- print_titre($langs->trans("FieldEdition", $attrname));
+ print load_fiche_titre($langs->trans("FieldEdition", $attrname));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
}
diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php
index 7be66a40d4afee32984b57c404b2775e1dcdb6b6..1d51e552280902dc1a922ecaf5dfe2dfdfb624c5 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -130,7 +130,7 @@ $help_url='EN:Module_Barcode|FR:Module_Codes_Barre|ES:Módulo Código de barra';
llxHeader('',$langs->trans("BarcodeSetup"),$help_url);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("BarcodeSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("BarcodeSetup"),$linkback,'title_setup');
// Detect bar codes modules
$barcodelist=array();
@@ -188,7 +188,7 @@ foreach($dirbarcode as $reldir)
$var=true;
print '<br>';
-print_titre($langs->trans("BarcodeEncodeModule"));
+print load_fiche_titre($langs->trans("BarcodeEncodeModule"));
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
@@ -288,7 +288,7 @@ print "<br>";
* Autres options
*
*/
-print_titre($langs->trans("OtherOptions"));
+print load_fiche_titre($langs->trans("OtherOptions"));
print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -358,7 +358,7 @@ print '<br>';
// Select barcode numbering module
if ($conf->produit->enabled)
{
- print_titre($langs->trans("BarCodeNumberManager")." (".$langs->trans("Product").")");
+ print load_fiche_titre($langs->trans("BarCodeNumberManager")." (".$langs->trans("Product").")");
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index 18c63a4879891ea93455eee2917a688eb33cdd33..6b1eb71fafe70ece862a08a97a1998e8148b84ba 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -219,7 +219,7 @@ $form=new Form($db);
llxHeader('',$langs->trans("Boxes"));
-print_fiche_titre($langs->trans("Boxes"),'','title_setup');
+print load_fiche_titre($langs->trans("Boxes"),'','title_setup');
print $langs->trans("BoxesDesc")." ".$langs->trans("OnlyActiveElementsAreShown")."<br>\n";
@@ -323,7 +323,7 @@ $boxtoadd=InfoBox::listBoxes($db,'available',-1,null,$actives);
print "<br>\n";
print "\n\n".'<!-- Boxes Available -->'."\n";
-print_titre($langs->trans("BoxesAvailable"));
+print load_fiche_titre($langs->trans("BoxesAvailable"));
print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
@@ -385,7 +385,7 @@ print "\n".'<!-- End Boxes Available -->'."\n";
$boxactivated=InfoBox::listBoxes($db,'activated',-1,null);
//var_dump($boxactivated);
print "<br>\n\n";
-print_titre($langs->trans("BoxesActivated"));
+print load_fiche_titre($langs->trans("BoxesActivated"));
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
@@ -446,7 +446,7 @@ print '</table><br>';
// Other parameters
print "\n\n".'<!-- Other Const -->'."\n";
-print_titre($langs->trans("Other"));
+print load_fiche_titre($langs->trans("Other"));
print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="addconst">';
diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php
index b6d7e8b3449f5651837fd0461c423101c9678078..1550c0ebef72a77ad72fd6b2d665399994ff5f50 100644
--- a/htdocs/admin/clicktodial.php
+++ b/htdocs/admin/clicktodial.php
@@ -60,7 +60,7 @@ $wikihelp='EN:Module_ClickToDial_En|FR:Module_ClickToDial|ES:Módulo_ClickTodial
llxHeader('',$langs->trans("ClickToDialSetup"),$wikihelp);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("ClickToDialSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("ClickToDialSetup"),$linkback,'title_setup');
print $langs->trans("ClickToDialDesc")."<br>\n";
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 3721c54dd798fea20680ded5d02e1504b53acc85..c83247a9bbfa90956544f47d8bf49a9bd120220b 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -263,7 +263,7 @@ llxHeader("",$langs->trans("OrdersSetup"));
$form=new Form($db);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("OrdersSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("OrdersSetup"),$linkback,'title_setup');
$head = order_admin_prepare_head();
@@ -273,7 +273,7 @@ dol_fiche_head($head, 'general', $langs->trans("Orders"), 0, 'order');
* Orders Numbering model
*/
-print_titre($langs->trans("OrdersNumberingModules"));
+print load_fiche_titre($langs->trans("OrdersNumberingModules"));
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
@@ -377,7 +377,7 @@ print "</table><br>\n";
* Document templates generators
*/
-print_titre($langs->trans("OrdersModelModule"));
+print load_fiche_titre($langs->trans("OrdersModelModule"));
// Load array def with activated templates
$def = array();
@@ -540,7 +540,7 @@ print "<br>";
*
*/
-print_titre($langs->trans("OtherOptions"));
+print load_fiche_titre($langs->trans("OtherOptions"));
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Parameter").'</td>';
@@ -638,7 +638,7 @@ print '<br>';
* Notifications
*/
-print_titre($langs->trans("Notifications"));
+print load_fiche_titre($langs->trans("Notifications"));
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Parameter").'</td>';
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 17c1414106e2fb8b0a8356c670c9322ac6ae29f5..e2b378f5aa23a1aeee9bd9d2c38b814442e55302 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -277,7 +277,7 @@ $formcompany=new FormCompany($db);
$countrynotdefined='<font class="error">'.$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')</font>';
-print_fiche_titre($langs->trans("CompanyFoundation"),'','title_setup');
+print load_fiche_titre($langs->trans("CompanyFoundation"),'','title_setup');
print $langs->trans("CompanyFundationDesc")."<br>\n";
print "<br>\n";
diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php
index 6020cb7947e868d9b74bc2f0f3ac62c2e0750bff..633f88b9cfb6aa996e197120277a345b1f583eba 100644
--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.php
@@ -104,7 +104,7 @@ llxHeader();
$form=new Form($db);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans('ComptaSetup'),$linkback,'title_setup');
+print load_fiche_titre($langs->trans('ComptaSetup'),$linkback,'title_setup');
print '<br>';
diff --git a/htdocs/admin/confexped.php b/htdocs/admin/confexped.php
index a6ed0acae30cb7bdf952068cf41af6e8446ef793..f8d13421b2406646d387ab706a1d1322dc13c2f5 100644
--- a/htdocs/admin/confexped.php
+++ b/htdocs/admin/confexped.php
@@ -74,7 +74,7 @@ $form=new Form($db);
llxHeader("","");
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("SendingsSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("SendingsSetup"),$linkback,'title_setup');
print '<br>';
$h = 0;
diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php
index 0f9213fc2529fc1b965b998032c314186c1a00c2..c1eff57571a155f40f592d05d326fa65e7b8576a 100644
--- a/htdocs/admin/const.php
+++ b/htdocs/admin/const.php
@@ -172,7 +172,7 @@ jQuery(document).ready(function() {
<?php
}
-print_fiche_titre($langs->trans("OtherSetup"),'','title_setup');
+print load_fiche_titre($langs->trans("OtherSetup"),'','title_setup');
print $langs->trans("ConstDesc")."<br>\n";
print "<br>\n";
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index 6c2c690d73cf71f68d229b5d4df2e01d9ae73e22..cf93977fc8b436ac0dad19c0e0f8858e6974524f 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -214,7 +214,7 @@ llxHeader();
$form=new Form($db);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("ContractsSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("ContractsSetup"),$linkback,'title_setup');
print "<br>";
@@ -226,7 +226,7 @@ dol_fiche_head($head, 'contract', $langs->trans("Contracts"), 0, 'contract');
* Contracts Numbering model
*/
-print_titre($langs->trans("ContractsNumberingModules"));
+print load_fiche_titre($langs->trans("ContractsNumberingModules"));
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
@@ -329,7 +329,7 @@ print '</table><br>';
* Documents models for Contracts
*/
-print_titre($langs->trans("TemplatePDFContracts"));
+print load_fiche_titre($langs->trans("TemplatePDFContracts"));
// Defini tableau def des modeles
$def = array();
@@ -494,7 +494,7 @@ print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="set_other">';
-print_titre($langs->trans("OtherOptions"));
+print load_fiche_titre($langs->trans("OtherOptions"));
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Parameter").'</td>';
diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index 1a96bac49ad3e816c43345c7e22187c195af9a9f..d569173aafe1b8f821cb1da05978aa97c873ec80 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -133,7 +133,7 @@ $form = new Form($db);
llxHeader();
-print_fiche_titre($langs->trans("DelaysOfToleranceBeforeWarning"),'','title_setup');
+print load_fiche_titre($langs->trans("DelaysOfToleranceBeforeWarning"),'','title_setup');
print $langs->transnoentities("DelaysOfToleranceDesc",img_warning());
print " ".$langs->trans("OnlyActiveElementsAreShown",DOL_URL_ROOT.'/admin/modules.php')."<br>\n";
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 17c8bcae0484eaa52986bb53d7896743e6426535..b5af472a6cf902e3092bfb1be1d5e06302a4004b 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -813,7 +813,7 @@ if ($id)
$titre.=' - '.$langs->trans($tablib[$id]);
$linkback='<a href="'.$_SERVER['PHP_SELF'].'">'.$langs->trans("BackToDictionaryList").'</a>';
}
-print_fiche_titre($titre,$linkback,'title_setup');
+print load_fiche_titre($titre,$linkback,'title_setup');
if (empty($id))
{
diff --git a/htdocs/admin/ecm.php b/htdocs/admin/ecm.php
index ed75fd141f9596621da79d460b5983954ac7363b..41824fea4c690c59ad438f375bd4fb927870ff5e 100644
--- a/htdocs/admin/ecm.php
+++ b/htdocs/admin/ecm.php
@@ -70,7 +70,7 @@ $help_url='';
llxHeader('',$langs->trans("ECMSetup"),$help_url);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("ECMSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("ECMSetup"),$linkback,'title_setup');
print '<br>';
print '<table class="noborder" width="100%">';
diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php
index ed2a70f1b58ed2641986ae35a469d6306c3dfaab..04a46071142c3f123c9573130c419a4e480f9f0f 100644
--- a/htdocs/admin/events.php
+++ b/htdocs/admin/events.php
@@ -73,7 +73,7 @@ if ($action == "save")
llxHeader('',$langs->trans("Audit"));
//$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("SecuritySetup"),'','title_setup');
+print load_fiche_titre($langs->trans("SecuritySetup"),'','title_setup');
print $langs->trans("LogEventDesc")."<br>\n";
print "<br>\n";
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index 09382e734acda4ec490e3e6616972ce5f4ccf257..9710929ee1796271da68a8d1437f7838d62e1c38 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -217,7 +217,7 @@ $form=new Form($db);
llxHeader("","");
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("SendingsSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("SendingsSetup"),$linkback,'title_setup');
print '<br>';
@@ -248,7 +248,7 @@ dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup"));
* Expedition numbering model
*/
-print_titre($langs->trans("SendingsNumberingModules"));
+print load_fiche_titre($langs->trans("SendingsNumberingModules"));
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
@@ -354,7 +354,7 @@ print '</table><br>';
/*
* Documents models for Sendings Receipt
*/
-print_titre($langs->trans("SendingsReceiptModel"));
+print load_fiche_titre($langs->trans("SendingsReceiptModel"));
// Defini tableau def de modele invoice
$type="shipping";
@@ -516,7 +516,7 @@ print '<br>';
* Other options
*
*/
-print_titre($langs->trans("OtherOptions"));
+print load_fiche_titre($langs->trans("OtherOptions"));
$var=true;
print "<table class=\"noborder\" width=\"100%\">";
diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index c31db84225c67cb1180db2223a12d0a8922f5176..f1b5eeb142788bf671b7c5db806977c68379656f 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -235,7 +235,7 @@ llxHeader();
$form=new Form($db);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("ExpenseReportsSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("ExpenseReportsSetup"),$linkback,'title_setup');
$head=expensereport_admin_prepare_head();
@@ -244,7 +244,7 @@ dol_fiche_head($head, 'expensereport', $langs->trans("ExpenseReports"), 0, 'trip
// Interventions numbering model
/*
-print_titre($langs->trans("FicheinterNumberingModules"));
+print load_fiche_titre($langs->trans("FicheinterNumberingModules"));
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
@@ -346,7 +346,7 @@ print '</table><br>';
* Documents models for Interventions
*/
-print_titre($langs->trans("TemplatePDFExpenseReports"));
+print load_fiche_titre($langs->trans("TemplatePDFExpenseReports"));
// Defini tableau def des modeles
$type='expensereport';
diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php
index e067b5dcb6ea3bfa5cd6b9dd6f071d44afebd990..81f6c093d5e451fdf0d1756414c82e2affe11c5a 100644
--- a/htdocs/admin/external_rss.php
+++ b/htdocs/admin/external_rss.php
@@ -189,7 +189,7 @@ if ($_POST["delete"])
llxHeader('',$langs->trans("ExternalRSSSetup"));
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("ExternalRSSSetup"), $linkback, 'title_setup');
+print load_fiche_titre($langs->trans("ExternalRSSSetup"), $linkback, 'title_setup');
print '<br>';
// Formulaire ajout
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 4fd4c0495938f8daefe6b01c2cb14f4a340562ea..b77df2a7f126e5eae0978b1e8894cbafc8d2bc59 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -293,7 +293,7 @@ $form=new Form($db);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("BillsSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("BillsSetup"),$linkback,'title_setup');
$head = invoice_admin_prepare_head();
dol_fiche_head($head, 'general', $langs->trans("Invoices"), 0, 'invoice');
@@ -302,7 +302,7 @@ dol_fiche_head($head, 'general', $langs->trans("Invoices"), 0, 'invoice');
* Numbering module
*/
-print_titre($langs->trans("BillsNumberingModule"));
+print load_fiche_titre($langs->trans("BillsNumberingModule"));
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
@@ -471,7 +471,7 @@ print '</table>';
* Document templates generators
*/
print '<br>';
-print_titre($langs->trans("BillsPDFModules"));
+print load_fiche_titre($langs->trans("BillsPDFModules"));
// Load array def with activated templates
$type='invoice';
@@ -631,7 +631,7 @@ print '</table>';
* Modes de reglement
*/
print '<br>';
-print_titre($langs->trans("SuggestedPaymentModesIfNotDefinedInInvoice"));
+print load_fiche_titre($langs->trans("SuggestedPaymentModesIfNotDefinedInInvoice"));
print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
@@ -726,7 +726,7 @@ print "</form>";
print "<br>";
-print_titre($langs->trans("OtherOptions"));
+print load_fiche_titre($langs->trans("OtherOptions"));
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
@@ -805,7 +805,7 @@ print '</table>';
* Repertoire
*/
print '<br>';
-print_titre($langs->trans("PathToDocuments"));
+print load_fiche_titre($langs->trans("PathToDocuments"));
print '<table class="noborder" width="100%">'."\n";
print '<tr class="liste_titre">'."\n";
@@ -823,7 +823,7 @@ print "</table>\n";
* Notifications
*/
print '<br>';
-print_titre($langs->trans("Notifications"));
+print load_fiche_titre($langs->trans("Notifications"));
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Parameter").'</td>';
diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php
index 6b608d238f366a5f17eb6a9d2e31b802f3441f77..b605da7e07b6f9bc7e174513a1b144f7a60b9ec5 100644
--- a/htdocs/admin/fckeditor.php
+++ b/htdocs/admin/fckeditor.php
@@ -136,7 +136,7 @@ if (GETPOST('save','alpha'))
llxHeader();
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("AdvancedEditor"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("AdvancedEditor"),$linkback,'title_setup');
print '<br>';
$var=true;
@@ -189,7 +189,7 @@ else
show_skin(null,1);
print '<br>'."\n";
- print_fiche_titre($langs->trans("TestSubmitForm"),'(mode='.$mode.')','');
+ print load_fiche_titre($langs->trans("TestSubmitForm"),'(mode='.$mode.')','');
print '<input type="hidden" name="mode" value="'.dol_escape_htmltag($mode).'">';
$uselocalbrowser=true;
$readonly=($mode=='dolibarr_readonly'?1:0);
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index e70960ccbc01c4f6d2bf3b54985a3b7194f31ba4..ca5e18a410323db038e3acd2dbf1c6d7c06992ac 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -247,7 +247,7 @@ llxHeader();
$form=new Form($db);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("InterventionsSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("InterventionsSetup"),$linkback,'title_setup');
$head=fichinter_admin_prepare_head();
@@ -256,7 +256,7 @@ dol_fiche_head($head, 'ficheinter', $langs->trans("Interventions"), 0, 'interven
// Interventions numbering model
-print_titre($langs->trans("FicheinterNumberingModules"));
+print load_fiche_titre($langs->trans("FicheinterNumberingModules"));
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
@@ -358,7 +358,7 @@ print '</table><br>';
* Documents models for Interventions
*/
-print_titre($langs->trans("TemplatePDFInterventions"));
+print load_fiche_titre($langs->trans("TemplatePDFInterventions"));
// Defini tableau def des modeles
$type='ficheinter';
@@ -512,7 +512,7 @@ print "<br>";
*
*/
-print_titre($langs->trans("OtherOptions"));
+print load_fiche_titre($langs->trans("OtherOptions"));
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Parameter").'</td>';
diff --git a/htdocs/admin/geoipmaxmind.php b/htdocs/admin/geoipmaxmind.php
index 119f97ac84008227694ef05914fd098adf997335..5e4c9de6fd7d5edd9d66172a9e7354b2cd295616 100644
--- a/htdocs/admin/geoipmaxmind.php
+++ b/htdocs/admin/geoipmaxmind.php
@@ -76,7 +76,7 @@ $form=new Form($db);
llxHeader();
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("GeoIPMaxmindSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("GeoIPMaxmindSetup"),$linkback,'title_setup');
print '<br>';
$version='';
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index f3260070fd7274aebc064e7a4e8900e8d604fe20..a29171f79e806460e1e5a0c9375734d760d89b13 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -114,7 +114,7 @@ $form=new Form($db);
$formother=new FormOther($db);
$formadmin=new FormAdmin($db);
-print_fiche_titre($langs->trans("GUISetup"),'','title_setup');
+print load_fiche_titre($langs->trans("GUISetup"),'','title_setup');
print $langs->trans("DisplayDesc")."<br>\n";
print "<br>\n";
@@ -132,7 +132,7 @@ if ($action == 'edit') // Edit
clearstatcache();
$var=true;
- print_fiche_titre($langs->trans("Language"),'','');
+ print load_fiche_titre($langs->trans("Language"),'','');
print '<br>';
print '<table summary="edit" class="noborder" width="100%">';
print '<tr class="liste_titre"><td>'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>';
diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php
index 2d47206d6ade4de00fa22804b198fae46132a6f3..6778f618265460ee6d79debea715fadd211416fc 100644
--- a/htdocs/admin/index.php
+++ b/htdocs/admin/index.php
@@ -43,7 +43,7 @@ llxHeader('',$langs->trans("Setup"),$wikihelp);
$form = new Form($db);
-print_fiche_titre($langs->trans("SetupArea"),'','title_setup.png');
+print load_fiche_titre($langs->trans("SetupArea"),'','title_setup.png');
if (! empty($conf->global->MAIN_MOTD_SETUPPAGE))
diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php
index 53c8777d40454e2f97b20dc61022e3c93518562d..cd55cddbf4599f75b1fade372f65e3c6f24a774d 100644
--- a/htdocs/admin/ldap.php
+++ b/htdocs/admin/ldap.php
@@ -82,7 +82,7 @@ llxHeader('',$langs->trans("LDAPSetup"),'EN:Module_LDAP_En|FR:Module_LDAP|ES:M&o
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("LDAPSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("LDAPSetup"),$linkback,'title_setup');
$head = ldap_prepare_head();
diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php
index a92943b63ba33fa3bd2771f844b5f9633e734f39..d24147417e323889af1781c3f49226318154257f 100644
--- a/htdocs/admin/ldap_contacts.php
+++ b/htdocs/admin/ldap_contacts.php
@@ -95,7 +95,7 @@ if ($action == 'setvalue' && $user->admin)
llxHeader('',$langs->trans("LDAPSetup"),'EN:Module_LDAP_En|FR:Module_LDAP|ES:Módulo_LDAP');
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("LDAPSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("LDAPSetup"),$linkback,'title_setup');
$head = ldap_prepare_head();
diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php
index f9ced81adba76e71b6f6dd1bfa3c63153854e8e8..765a15490384ff47eb220ef2b20ab2305f836a49 100644
--- a/htdocs/admin/ldap_groups.php
+++ b/htdocs/admin/ldap_groups.php
@@ -86,7 +86,7 @@ if ($action == 'setvalue' && $user->admin)
llxHeader('',$langs->trans("LDAPSetup"),'EN:Module_LDAP_En|FR:Module_LDAP|ES:Módulo_LDAP');
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("LDAPSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("LDAPSetup"),$linkback,'title_setup');
$head = ldap_prepare_head();
diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php
index 37b0250d04a3069c229e79fec45902be00ede346..ae92c8f38cda0c5050c0c16dc954ac7e010a9374 100644
--- a/htdocs/admin/ldap_members.php
+++ b/htdocs/admin/ldap_members.php
@@ -110,7 +110,7 @@ if ($action == 'setvalue' && $user->admin)
llxHeader('',$langs->trans("LDAPSetup"),'EN:Module_LDAP_En|FR:Module_LDAP|ES:Módulo_LDAP');
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("LDAPSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("LDAPSetup"),$linkback,'title_setup');
$head = ldap_prepare_head();
diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php
index 0a29302258164b3ef49a7bc475b3801db052f154..096f844436ffb307c39444d729d0b43772adb636 100644
--- a/htdocs/admin/ldap_users.php
+++ b/htdocs/admin/ldap_users.php
@@ -96,7 +96,7 @@ if ($action == 'setvalue' && $user->admin)
llxHeader('',$langs->trans("LDAPSetup"),'EN:Module_LDAP_En|FR:Module_LDAP|ES:Módulo_LDAP');
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("LDAPSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("LDAPSetup"),$linkback,'title_setup');
$head = ldap_prepare_head();
diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php
index 9bfb8f801ede311c33f5d8c03499f4764096e2d0..8949fba6d3c6d27d3d5b2446f29936d1c4f5efb3 100644
--- a/htdocs/admin/limits.php
+++ b/htdocs/admin/limits.php
@@ -88,7 +88,7 @@ $form=new Form($db);
llxHeader();
-print_fiche_titre($langs->trans("LimitsSetup"),'','title_setup');
+print load_fiche_titre($langs->trans("LimitsSetup"),'','title_setup');
print $langs->trans("LimitsDesc")."<br>\n";
diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php
index 41fbe5fc8f48a6d5002be0d46c1763f583537781..9257aada0292cc39c680acc48a83e514bbf05303 100644
--- a/htdocs/admin/livraison.php
+++ b/htdocs/admin/livraison.php
@@ -208,7 +208,7 @@ llxHeader("","");
$form=new Form($db);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("SendingsSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("SendingsSetup"),$linkback,'title_setup');
print '<br>';
@@ -237,7 +237,7 @@ dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup"));
* Livraison numbering model
*/
-print_titre($langs->trans("DeliveryOrderNumberingModules"));
+print load_fiche_titre($langs->trans("DeliveryOrderNumberingModules"));
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
@@ -340,7 +340,7 @@ print '</table>';
* Documents Models for delivery
*/
print '<br>';
-print_titre($langs->trans("DeliveryOrderModel"));
+print load_fiche_titre($langs->trans("DeliveryOrderModel"));
// Defini tableau def de modele
$type="delivery";
@@ -487,7 +487,7 @@ print '</table>';
* Autres Options
*/
print "<br>";
-print_titre($langs->trans("OtherOptions"));
+print load_fiche_titre($langs->trans("OtherOptions"));
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
diff --git a/htdocs/admin/loan.php b/htdocs/admin/loan.php
index a98e44539b9e2c938636ef7cd5972fe017dfa9cb..a966b751955803b43619773dc25503bb1d407b62 100644
--- a/htdocs/admin/loan.php
+++ b/htdocs/admin/loan.php
@@ -78,7 +78,7 @@ llxHeader();
$form = new Form($db);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans('ConfigLoan'),$linkback,'title_setup');
+print load_fiche_titre($langs->trans('ConfigLoan'),$linkback,'title_setup');
print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php
index c934a46b8e076057dd6ee48bce63962bc9c59448..8c4769780fdc1f78974bc16217bae62e256eb8f5 100644
--- a/htdocs/admin/mailing.php
+++ b/htdocs/admin/mailing.php
@@ -81,7 +81,7 @@ if ($action == 'setvalue')
llxHeader('',$langs->trans("MailingSetup"));
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("MailingSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("MailingSetup"),$linkback,'title_setup');
if (! empty($conf->use_javascript_ajax))
{
diff --git a/htdocs/admin/mailman.php b/htdocs/admin/mailman.php
index dc8cf57aa53cc37272e435aaa9327b5f21b17566..686da7fc68c39b6295e800b81cd963cc22d4e0a8 100644
--- a/htdocs/admin/mailman.php
+++ b/htdocs/admin/mailman.php
@@ -152,7 +152,7 @@ llxHeader('',$langs->trans("MailmanSpipSetup"),$help_url);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("MailmanSpipSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("MailmanSpipSetup"),$linkback,'title_setup');
$head = mailmanspip_admin_prepare_head();
@@ -175,7 +175,7 @@ if (! empty($conf->global->ADHERENT_USE_MAILMAN))
'ADHERENT_MAILMAN_LISTS'
);
- print_fiche_titre($langs->trans('MailmanTitle'), $link,'');
+ print load_fiche_titre($langs->trans('MailmanTitle'), $link,'');
print '<br>';
@@ -211,7 +211,7 @@ else
//$link.=img_$langs->trans("Activate")
$link.=img_picto($langs->trans("Disabled"),'switch_off');
$link.='</a>';
- print_fiche_titre($langs->trans('MailmanTitle'), $link,'');
+ print load_fiche_titre($langs->trans('MailmanTitle'), $link,'');
}
dol_fiche_end();
diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 148fcf762686966caec2101822750794d1a71ec2..654d85b572b6c20efe96f8840a48c45381a1800f 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -244,7 +244,7 @@ if (! $server) $server='127.0.0.1';
$wikihelp='EN:Setup EMails|FR:Paramétrage EMails|ES:Configuración EMails';
llxHeader('',$langs->trans("Setup"),$wikihelp);
-print_fiche_titre($langs->trans("EMailsSetup"),'','title_setup');
+print load_fiche_titre($langs->trans("EMailsSetup"),'','title_setup');
print $langs->trans("EMailsDesc")."<br>\n";
print "<br>\n";
@@ -660,7 +660,7 @@ else
if ($action == 'testconnect')
{
print '<br>';
- print_titre($langs->trans("DoTestServerAvailability"));
+ print load_fiche_titre($langs->trans("DoTestServerAvailability"));
// If we use SSL/TLS
if (! empty($conf->global->MAIN_MAIL_EMAIL_TLS) && function_exists('openssl_open')) $server='ssl://'.$server;
@@ -686,7 +686,7 @@ else
if ($action == 'test' || $action == 'testhtml')
{
print '<br>';
- print_titre($action == 'testhtml'?$langs->trans("DoTestSendHTML"):$langs->trans("DoTestSend"));
+ print load_fiche_titre($action == 'testhtml'?$langs->trans("DoTestSendHTML"):$langs->trans("DoTestSend"));
// Cree l'objet formulaire mail
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php
index ad83def9ce8c06abb03e716167dafefccb30294a..c0ac9a3df8c1928fb31b065c1583d37cdafba929 100644
--- a/htdocs/admin/menus.php
+++ b/htdocs/admin/menus.php
@@ -131,7 +131,7 @@ $formadmin=new FormAdmin($db);
$wikihelp='EN:First_setup|FR:Premiers_paramétrages|ES:Primeras_configuraciones';
llxHeader('',$langs->trans("Setup"),$wikihelp);
-print_fiche_titre($langs->trans("Menus"),'','title_setup');
+print load_fiche_titre($langs->trans("Menus"),'','title_setup');
$h = 0;
diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php
index 4ab41c7991e473ba1dc7195ca4d7387d631c4fc5..7c22a17c553cef1a29b59b1452fb0c3f753f9e75 100644
--- a/htdocs/admin/menus/edit.php
+++ b/htdocs/admin/menus/edit.php
@@ -270,7 +270,7 @@ if ($action == 'create')
});
</script>';
- print_fiche_titre($langs->trans("NewMenu"),'','title_setup');
+ print load_fiche_titre($langs->trans("NewMenu"),'','title_setup');
print '<form action="./edit.php?action=add&menuId='.$_GET['menuId'].'" method="post" name="formmenucreate">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -379,7 +379,7 @@ if ($action == 'create')
}
elseif ($action == 'edit')
{
- print_fiche_titre($langs->trans("ModifMenu"),'','title_setup');
+ print load_fiche_titre($langs->trans("ModifMenu"),'','title_setup');
print '<br>';
print '<form action="./edit.php?action=update" method="POST" name="formmenuedit">';
diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php
index 62bf0bbd61733d1e7ab2b5359a5fef2db808e0c3..c8699209268ab4d3a2194d03304c080351096254 100644
--- a/htdocs/admin/menus/index.php
+++ b/htdocs/admin/menus/index.php
@@ -214,7 +214,7 @@ $arrayofcss=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css')
llxHeader('',$langs->trans("Menus"),'','',0,0,$arrayofjs,$arrayofcss);
-print_fiche_titre($langs->trans("Menus"),'','title_setup');
+print load_fiche_titre($langs->trans("Menus"),'','title_setup');
$h = 0;
diff --git a/htdocs/admin/menus/other.php b/htdocs/admin/menus/other.php
index 8a893b21321325cc4e844e40d9cb3f9dab05f09e..73dc0fe3b85960be4944da7b10afc9d3fa4f0ca4 100644
--- a/htdocs/admin/menus/other.php
+++ b/htdocs/admin/menus/other.php
@@ -71,7 +71,7 @@ else if ($action == 'disable_layoutmenu')
llxHeader('',$langs->trans("Setup"));
-print_fiche_titre($langs->trans("Menus"),'','title_setup');
+print load_fiche_titre($langs->trans("Menus"),'','title_setup');
$h = 0;
diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php
index bab6db29959618c2e59d8dd542f106abc67fbf32..fca545e83cd147ca8226cc59c75c901b7d784e6b 100644
--- a/htdocs/admin/notification.php
+++ b/htdocs/admin/notification.php
@@ -115,7 +115,7 @@ $notify = new Notify($db);
llxHeader('',$langs->trans("NotificationSetup"));
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("NotificationSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("NotificationSetup"),$linkback,'title_setup');
print $langs->trans("NotificationsDesc").'<br><br>';
@@ -143,7 +143,7 @@ print '<br>';
if ($conf->societe->enabled)
{
- print_fiche_titre($langs->trans("ListOfNotificationsPerContact"),'','');
+ print load_fiche_titre($langs->trans("ListOfNotificationsPerContact"),'','');
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
@@ -186,7 +186,7 @@ if ($conf->societe->enabled)
}
-print_fiche_titre($langs->trans("ListOfFixedNotifications"),'','');
+print load_fiche_titre($langs->trans("ListOfFixedNotifications"),'','');
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
diff --git a/htdocs/admin/order_extrafields.php b/htdocs/admin/order_extrafields.php
index 0c71c3285ad36ffdf9754637d65ccc59f2c19a41..ea0f99021cfeee6792c2db256a38057eda69e5a0 100644
--- a/htdocs/admin/order_extrafields.php
+++ b/htdocs/admin/order_extrafields.php
@@ -70,7 +70,7 @@ $textobject=$langs->transnoentitiesnoconv("Orders");
llxHeader('',$langs->trans("OrdersSetup"));
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("OrdersSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("OrdersSetup"),$linkback,'title_setup');
print "<br>\n";
$head = order_admin_prepare_head();
@@ -100,7 +100,7 @@ if ($action != 'create' && $action != 'edit')
if ($action == 'create')
{
print "<br>";
- print_titre($langs->trans('NewAttribute'));
+ print load_fiche_titre($langs->trans('NewAttribute'));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
}
@@ -113,7 +113,7 @@ if ($action == 'create')
if ($action == 'edit' && ! empty($attrname))
{
print "<br>";
- print_titre($langs->trans("FieldEdition", $attrname));
+ print load_fiche_titre($langs->trans("FieldEdition", $attrname));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
}
diff --git a/htdocs/admin/orderdet_extrafields.php b/htdocs/admin/orderdet_extrafields.php
index 9f16d7934b184a976480220f24e972869f18515f..8e542e3d8716acf481fe8f8620c9ec042a2e9c48 100644
--- a/htdocs/admin/orderdet_extrafields.php
+++ b/htdocs/admin/orderdet_extrafields.php
@@ -71,7 +71,7 @@ $textobject=$langs->transnoentitiesnoconv("OrderLines");
llxHeader('',$langs->trans("OrdersSetup"));
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("OrdersSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("OrdersSetup"),$linkback,'title_setup');
print "<br>\n";
$head = order_admin_prepare_head();
@@ -101,7 +101,7 @@ if ($action != 'create' && $action != 'edit')
if ($action == 'create')
{
print "<br>";
- print_titre($langs->trans('NewAttribute'));
+ print load_fiche_titre($langs->trans('NewAttribute'));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
}
@@ -114,7 +114,7 @@ if ($action == 'create')
if ($action == 'edit' && ! empty($attrname))
{
print "<br>";
- print_titre($langs->trans("FieldEdition", $attrname));
+ print load_fiche_titre($langs->trans("FieldEdition", $attrname));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
}
diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index 9f12c98e1d8f69e592a21aed8fff1fc927d9b48e..7bd46ac96842fd5ac03430b80f0e44cc888ffb27 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -93,7 +93,7 @@ $form=new Form($db);
$formother=new FormOther($db);
$formadmin=new FormAdmin($db);
-print_fiche_titre($langs->trans("PDF"),'','title_setup');
+print load_fiche_titre($langs->trans("PDF"),'','title_setup');
print $langs->trans("PDFDesc")."<br>\n";
print "<br>\n";
@@ -110,7 +110,7 @@ if ($action == 'edit') // Edit
// Misc options
- print_fiche_titre($langs->trans("DictionaryPaperFormat"),'','').'<br>';
+ print load_fiche_titre($langs->trans("DictionaryPaperFormat"),'','').'<br>';
$var=true;
print '<table summary="more" class="noborder" width="100%">';
print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
@@ -130,7 +130,7 @@ if ($action == 'edit') // Edit
// Addresses
- print_fiche_titre($langs->trans("PDFAddressForging"),'','').'<br>';
+ print load_fiche_titre($langs->trans("PDFAddressForging"),'','').'<br>';
$var=true;
print '<table summary="more" class="noborder" width="100%">';
print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
@@ -212,7 +212,7 @@ if ($action == 'edit') // Edit
print '<br>';
// Other
- print_fiche_titre($langs->trans("Other"),'','').'<br>';
+ print load_fiche_titre($langs->trans("Other"),'','').'<br>';
$var=true;
print '<table summary="more" class="noborder" width="100%">';
print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
@@ -262,7 +262,7 @@ else // Show
$var=true;
// Misc options
- print_fiche_titre($langs->trans("DictionaryPaperFormat"),'','').'<br>';
+ print load_fiche_titre($langs->trans("DictionaryPaperFormat"),'','').'<br>';
$var=true;
print '<table summary="more" class="noborder" width="100%">';
print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
@@ -299,7 +299,7 @@ else // Show
print '<br>';
- print_fiche_titre($langs->trans("PDFAddressForging"),'','').'<br>';
+ print load_fiche_titre($langs->trans("PDFAddressForging"),'','').'<br>';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
@@ -380,7 +380,7 @@ else // Show
print '<br>';
// Other
- print_fiche_titre($langs->trans("Other"),'','').'<br>';
+ print load_fiche_titre($langs->trans("Other"),'','').'<br>';
$var=true;
print '<table summary="more" class="noborder" width="100%">';
print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px" colspan="2">'.$langs->trans("Value").'</td></tr>';
@@ -453,7 +453,7 @@ else // Show
* Library
*/
print '<br>';
- print_titre($langs->trans("Library"));
+ print load_fiche_titre($langs->trans("Library"));
print '<table class="noborder" width="100%">'."\n";
diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php
index 5bb526352f6074514b2085fbf4fc5854ba506901..cf9dce45c08a8953d8149962d18e481f03300d92 100644
--- a/htdocs/admin/perms.php
+++ b/htdocs/admin/perms.php
@@ -64,7 +64,7 @@ if ($action == 'remove')
llxHeader('',$langs->trans("DefaultRights"));
-print_fiche_titre($langs->trans("SecuritySetup"),'','title_setup');
+print load_fiche_titre($langs->trans("SecuritySetup"),'','title_setup');
print $langs->trans("DefaultRightsDesc");
print " ".$langs->trans("OnlyActiveElementsAreShown")."<br><br>\n";
diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php
index 31c1e5e7dba785e990aef28e243de536031bf026..56aa69e9943f52226f9a2c427983679542043707 100644
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@@ -119,7 +119,7 @@ llxHeader('',$langs->trans("WithdrawalsSetup"));
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("WithdrawalsSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("WithdrawalsSetup"),$linkback,'title_setup');
print '<br>';
print '<form method="post" action="prelevement.php?action=set">';
@@ -178,7 +178,7 @@ print '<br>';
if (! empty($conf->global->MAIN_MODULE_NOTIFICATION))
{
$langs->load("mails");
- print_titre($langs->trans("Notifications"));
+ print load_fiche_titre($langs->trans("Notifications"));
$sql = "SELECT u.rowid, u.lastname, u.firstname, u.fk_soc, u.email";
$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
@@ -238,11 +238,11 @@ if (! empty($conf->global->MAIN_MODULE_NOTIFICATION))
print "</tr>\n";
print '<tr class="impair"><td align="left">';
- print $form->selectarray('user',$internalusers);// select_users(0,'user',0);
+ print $form->selectarray('user',$internalusers);// select_dolusers(0,'user',0);
print '</td>';
print '<td>';
- print $form->selectarray('action',$actions);// select_users(0,'user',0);
+ print $form->selectarray('action',$actions);// select_dolusers(0,'user',0);
print '</td>';
print '<td align="right"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td></tr>';
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index 48c16de3531a184279ee26dae931416cce98e786..1294888ceb1663024db4762c514f9ef1fc08ad5f 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -261,7 +261,7 @@ $form=new Form($db);
//if ($mesg) print $mesg;
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("PropalSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("PropalSetup"),$linkback,'title_setup');
$head = propal_admin_prepare_head();
@@ -270,7 +270,7 @@ dol_fiche_head($head, 'general', $langs->trans("Proposals"), 0, 'propal');
/*
* Module numerotation
*/
-print_titre($langs->trans("ProposalsNumberingModules"));
+print load_fiche_titre($langs->trans("ProposalsNumberingModules"));
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
@@ -374,7 +374,7 @@ print "</table><br>\n";
* Document templates generators
*/
-print_titre($langs->trans("ProposalsPDFModules"));
+print load_fiche_titre($langs->trans("ProposalsPDFModules"));
// Load array def with activated templates
$def = array();
@@ -536,7 +536,7 @@ print '<br>';
* Other options
*
*/
-print_titre($langs->trans("OtherOptions"));
+print load_fiche_titre($langs->trans("OtherOptions"));
$var=true;
print "<table class=\"noborder\" width=\"100%\">";
@@ -643,7 +643,7 @@ print '</table>';
* Directory
*/
print '<br>';
-print_titre($langs->trans("PathToDocuments"));
+print load_fiche_titre($langs->trans("PathToDocuments"));
print "<table class=\"noborder\" width=\"100%\">\n";
print "<tr class=\"liste_titre\">\n";
@@ -658,7 +658,7 @@ print "</table>\n<br>";
* Notifications
*/
-print_titre($langs->trans("Notifications"));
+print load_fiche_titre($langs->trans("Notifications"));
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Parameter").'</td>';
diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php
index 00d66944c9783c2698bf6f1ed13494d5d32d628b..100da221ce6d55e085a455f761efaad26b2a30ae 100644
--- a/htdocs/admin/proxy.php
+++ b/htdocs/admin/proxy.php
@@ -81,7 +81,7 @@ $form = new Form($db);
llxHeader('',$langs->trans("Proxy"));
-print_fiche_titre($langs->trans("SecuritySetup"),'','title_setup');
+print load_fiche_titre($langs->trans("SecuritySetup"),'','title_setup');
print $langs->trans("ProxyDesc")."<br>\n";
print "<br>\n";
diff --git a/htdocs/admin/salaries.php b/htdocs/admin/salaries.php
index 291c3848a63f2046d2d45fcc3bf42307ba031fbd..bb37e73fc88d6eae20eeffc95df39d6320808174 100644
--- a/htdocs/admin/salaries.php
+++ b/htdocs/admin/salaries.php
@@ -77,7 +77,7 @@ llxHeader('',$langs->trans('SalariesSetup'));
$form = new Form($db);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans('SalariesSetup'),$linkback,'title_setup');
+print load_fiche_titre($langs->trans('SalariesSetup'),$linkback,'title_setup');
print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index 0eeef2cbe15899ea03098bfb755271ed832d8acd..77e5e75f58d69f38267165578262bde189a94709 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -185,7 +185,7 @@ $form = new Form($db);
llxHeader('',$langs->trans("Passwords"));
-print_fiche_titre($langs->trans("SecuritySetup"),'','title_setup');
+print load_fiche_titre($langs->trans("SecuritySetup"),'','title_setup');
print $langs->trans("GeneratedPasswordDesc")."<br>\n";
print "<br>\n";
diff --git a/htdocs/admin/security_file.php b/htdocs/admin/security_file.php
index e72ece4375ca3e3abf804d590bd4480ca14e3479..a7afaf0ef0a12e3dd996613972173be8b465fc72 100644
--- a/htdocs/admin/security_file.php
+++ b/htdocs/admin/security_file.php
@@ -111,7 +111,7 @@ $form = new Form($db);
llxHeader('',$langs->trans("Files"));
-print_fiche_titre($langs->trans("SecuritySetup"),'','title_setup');
+print load_fiche_titre($langs->trans("SecuritySetup"),'','title_setup');
//print $langs->trans("FilesDesc")."<br>\n";
//print "<br>\n";
diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php
index 74101f29710baf00ef4a77c1db9b6120004eada6..6c040e8d6d63643b1bf255e29a931a240af25792 100644
--- a/htdocs/admin/security_other.php
+++ b/htdocs/admin/security_other.php
@@ -89,7 +89,7 @@ $form = new Form($db);
llxHeader('',$langs->trans("Miscellaneous"));
-print_fiche_titre($langs->trans("SecuritySetup"),'','title_setup');
+print load_fiche_titre($langs->trans("SecuritySetup"),'','title_setup');
print $langs->trans("MiscellaneousDesc")."<br>\n";
print "<br>\n";
diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php
index 44bab100730127fcaf7b6f121bd17e45348dcaa1..4b7818ecadb8732b851c98e3440d78816d265cec 100644
--- a/htdocs/admin/sms.php
+++ b/htdocs/admin/sms.php
@@ -147,7 +147,7 @@ if (preg_match('/^mac/i',PHP_OS)) $linuxlike=0;
$wikihelp='EN:Setup Sms|FR:Paramétrage Sms|ES:Configuración Sms';
llxHeader('',$langs->trans("Setup"),$wikihelp);
-print_fiche_titre($langs->trans("SmsSetup"),'','title_setup');
+print load_fiche_titre($langs->trans("SmsSetup"),'','title_setup');
print $langs->trans("SmsDesc")."<br>\n";
print "<br>\n";
@@ -289,7 +289,7 @@ else
if ($_GET["action"] == 'testconnect')
{
print '<br>';
- print_titre($langs->trans("DoTestServerAvailability"));
+ print load_fiche_titre($langs->trans("DoTestServerAvailability"));
// If we use SSL/TLS
if (! empty($conf->global->MAIN_MAIL_EMAIL_TLS) && function_exists('openssl_open')) $server='ssl://'.$server;
@@ -311,7 +311,7 @@ else
if ($action == 'test')
{
print '<br>';
- print_titre($langs->trans("DoTestSend"));
+ print load_fiche_titre($langs->trans("DoTestSend"));
// Cree l'objet formulaire mail
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formsms.class.php';
diff --git a/htdocs/admin/spip.php b/htdocs/admin/spip.php
index 753fef37be63cad8c9e77d54e9beff57bbd349b2..e46d9b8f5b7dbd0dda9612a88009e8cefe27546e 100644
--- a/htdocs/admin/spip.php
+++ b/htdocs/admin/spip.php
@@ -110,7 +110,7 @@ llxHeader('',$langs->trans("MailmanSpipSetup"),$help_url);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("MailmanSpipSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("MailmanSpipSetup"),$linkback,'title_setup');
$head = mailmanspip_admin_prepare_head();
@@ -137,7 +137,7 @@ if (! empty($conf->global->ADHERENT_USE_SPIP))
'ADHERENT_SPIP_PASS'
);
- print_fiche_titre($langs->trans('SPIPTitle'), $link, '');
+ print load_fiche_titre($langs->trans('SPIPTitle'), $link, '');
print '<br>';
form_constantes($constantes);
print '<br>';
@@ -148,7 +148,7 @@ else
//$link.=$langs->trans("Activate");
$link.=img_picto($langs->trans("Disabled"),'switch_off');
$link.='</a>';
- print_fiche_titre($langs->trans('SPIPTitle'), $link, '');
+ print load_fiche_titre($langs->trans('SPIPTitle'), $link, '');
}
diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index 0f6560ad055edee19ee9b45335d9224d253c1d70..2ed2f4f869eacaae87eaa9f40d199828c75b5b9d 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -113,7 +113,7 @@ if($action)
llxHeader('',$langs->trans("StockSetup"));
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("StockSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("StockSetup"),$linkback,'title_setup');
$form=new Form($db);
diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index 222b813cdbbf369665fcd979ea4e1461cfd0b279..694247e7b81ef6cf5d663b3a09e924e3bcb8d4c0 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -194,7 +194,7 @@ llxHeader("","");
$form=new Form($db);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'title_setup');
print "<br>";
@@ -205,7 +205,7 @@ dol_fiche_head($head, 'invoice', $langs->trans("Suppliers"), 0, 'company');
// Supplier invoice numbering module
-print_titre($langs->trans("SuppliersInvoiceNumberingModel"));
+print load_fiche_titre($langs->trans("SuppliersInvoiceNumberingModel"));
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
@@ -311,7 +311,7 @@ print '</table><br>';
* Modeles documents for supplier invoices
*/
-print_titre($langs->trans("BillsPDFModules"));
+print load_fiche_titre($langs->trans("BillsPDFModules"));
// Defini tableau def de modele
$def = array();
@@ -453,7 +453,7 @@ print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="set_SUPPLIER_INVOICE_FREE_TEXT">';
-print_titre($langs->trans("OtherOptions"));
+print load_fiche_titre($langs->trans("OtherOptions"));
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Parameter").'</td>';
@@ -487,7 +487,7 @@ print '</form>';
* Notifications
*/
-print_titre($langs->trans("Notifications"));
+print load_fiche_titre($langs->trans("Notifications"));
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Parameter").'</td>';
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index 11613a82745266e73309849eb1294dbd3f50ab10..861e94c881bdf0fbfece8a5de2e4515f69997381 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -210,7 +210,7 @@ $dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
llxHeader("","");
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'title_setup');
print "<br>";
@@ -221,7 +221,7 @@ dol_fiche_head($head, 'order', $langs->trans("Suppliers"), 0, 'company');
// Supplier order numbering module
-print_titre($langs->trans("OrdersNumberingModules"));
+print load_fiche_titre($langs->trans("OrdersNumberingModules"));
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
@@ -325,7 +325,7 @@ print '</table><br>';
* Documents models for supplier orders
*/
-print_titre($langs->trans("OrdersModelModule"));
+print load_fiche_titre($langs->trans("OrdersModelModule"));
// Defini tableau def de modele
$def = array();
@@ -464,7 +464,7 @@ print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="set_SUPPLIER_ORDER_OTHER">';
-print_titre($langs->trans("OtherOptions"));
+print load_fiche_titre($langs->trans("OtherOptions"));
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Parameter").'</td>';
@@ -512,7 +512,7 @@ print '</form>';
* Notifications
*/
-print_titre($langs->trans("Notifications"));
+print load_fiche_titre($langs->trans("Notifications"));
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Parameter").'</td>';
diff --git a/htdocs/admin/supplierinvoice_extrafields.php b/htdocs/admin/supplierinvoice_extrafields.php
index 4e9f1fce9aed93ae9511c9107b876ec712c2cfad..315a88788c258e3792a914a73ee4b6338a587d0e 100644
--- a/htdocs/admin/supplierinvoice_extrafields.php
+++ b/htdocs/admin/supplierinvoice_extrafields.php
@@ -74,7 +74,7 @@ $textobject=$langs->transnoentitiesnoconv("BillsSuppliers");
llxHeader('',$langs->trans("SuppliersSetup"));
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'title_setup');
print "<br>\n";
$head = supplierorder_admin_prepare_head();
@@ -104,7 +104,7 @@ if ($action != 'create' && $action != 'edit')
if ($action == 'create')
{
print "<br>";
- print_titre($langs->trans('NewAttribute'));
+ print load_fiche_titre($langs->trans('NewAttribute'));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
}
@@ -117,7 +117,7 @@ if ($action == 'create')
if ($action == 'edit' && ! empty($attrname))
{
print "<br>";
- print_titre($langs->trans("FieldEdition", $attrname));
+ print load_fiche_titre($langs->trans("FieldEdition", $attrname));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
}
diff --git a/htdocs/admin/supplierinvoicedet_extrafields.php b/htdocs/admin/supplierinvoicedet_extrafields.php
index b6f71ecc00c46b4178da2b46fe68750e7a940c08..7e0f0f500fdc8ede48d3e29ffc081de23f9ca7ac 100644
--- a/htdocs/admin/supplierinvoicedet_extrafields.php
+++ b/htdocs/admin/supplierinvoicedet_extrafields.php
@@ -74,7 +74,7 @@ $textobject=$langs->transnoentitiesnoconv("BillsSuppliers");
llxHeader('',$langs->trans("SuppliersSetup"));
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'title_setup');
print "<br>\n";
$head = supplierorder_admin_prepare_head();
@@ -104,7 +104,7 @@ if ($action != 'create' && $action != 'edit')
if ($action == 'create')
{
print "<br>";
- print_titre($langs->trans('NewAttribute'));
+ print load_fiche_titre($langs->trans('NewAttribute'));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
}
@@ -117,7 +117,7 @@ if ($action == 'create')
if ($action == 'edit' && ! empty($attrname))
{
print "<br>";
- print_titre($langs->trans("FieldEdition", $attrname));
+ print load_fiche_titre($langs->trans("FieldEdition", $attrname));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
}
diff --git a/htdocs/admin/supplierorder_extrafields.php b/htdocs/admin/supplierorder_extrafields.php
index 135e02a92b428a002b9d5d193bcffda611125e48..4dbb8f5476062ef329aa800cf9a6474bc0d98460 100644
--- a/htdocs/admin/supplierorder_extrafields.php
+++ b/htdocs/admin/supplierorder_extrafields.php
@@ -70,7 +70,7 @@ $textobject=$langs->transnoentitiesnoconv("SuppliersOrders");
llxHeader('',$langs->trans("SuppliersSetup"));
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'title_setup');
print "<br>\n";
$head = supplierorder_admin_prepare_head();
@@ -100,7 +100,7 @@ if ($action != 'create' && $action != 'edit')
if ($action == 'create')
{
print "<br>";
- print_titre($langs->trans('NewAttribute'));
+ print load_fiche_titre($langs->trans('NewAttribute'));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
}
@@ -113,7 +113,7 @@ if ($action == 'create')
if ($action == 'edit' && ! empty($attrname))
{
print "<br>";
- print_titre($langs->trans("FieldEdition", $attrname));
+ print load_fiche_titre($langs->trans("FieldEdition", $attrname));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
}
diff --git a/htdocs/admin/supplierorderdet_extrafields.php b/htdocs/admin/supplierorderdet_extrafields.php
index 6d422de4d314497dc7121f795f5ef8c3c8feb93b..8518c77a8e41eae9555f7cfe1ef0e52c3c258226 100644
--- a/htdocs/admin/supplierorderdet_extrafields.php
+++ b/htdocs/admin/supplierorderdet_extrafields.php
@@ -71,7 +71,7 @@ $textobject=$langs->transnoentitiesnoconv("SuppliersOrders");
llxHeader('',$langs->trans("SuppliersSetup"));
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'title_setup');
print "<br>\n";
$head = supplierorder_admin_prepare_head();
@@ -101,7 +101,7 @@ if ($action != 'create' && $action != 'edit')
if ($action == 'create')
{
print "<br>";
- print_titre($langs->trans('NewAttribute'));
+ print load_fiche_titre($langs->trans('NewAttribute'));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
}
@@ -114,7 +114,7 @@ if ($action == 'create')
if ($action == 'edit' && ! empty($attrname))
{
print "<br>";
- print_titre($langs->trans("FieldEdition", $attrname));
+ print load_fiche_titre($langs->trans("FieldEdition", $attrname));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
}
diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php
index 44002dc4c746c623228ea830ab740af7af9b7c22..59921dd3687d65ff4d7b3ddd57d65c7b21589aa2 100644
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.php
@@ -157,7 +157,7 @@ llxHeader();
$form=new Form($db);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("SyslogSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("SyslogSetup"),$linkback,'title_setup');
print '<br>';
$def = array();
@@ -178,7 +178,7 @@ if ($conf->global->MAIN_MODULE_MULTICOMPANY && $user->entity)
//print "conf->global->MAIN_FEATURES_LEVEL = ".$conf->global->MAIN_FEATURES_LEVEL."<br><br>\n";
// Output mode
-print_titre($langs->trans("SyslogOutput"));
+print load_fiche_titre($langs->trans("SyslogOutput"));
// Mode
print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
@@ -240,7 +240,7 @@ print "</form>\n";
print '<br>'."\n\n";
-print_titre($langs->trans("SyslogLevel"));
+print load_fiche_titre($langs->trans("SyslogLevel"));
// Level
print '<form action="syslog.php" method="post">';
diff --git a/htdocs/admin/system/about.php b/htdocs/admin/system/about.php
index e4bd9d77928c9289ac9d2b8460d118ebe2941471..737e0712ea623932cf819eef5e5e5795e7a4a5a3 100644
--- a/htdocs/admin/system/about.php
+++ b/htdocs/admin/system/about.php
@@ -38,7 +38,7 @@ $langs->load("members");
llxHeader();
-print_fiche_titre("Dolibarr",'','title_setup');
+print load_fiche_titre("Dolibarr",'','title_setup');
print '<div style="padding-left: 30px;">'.img_picto_common('', 'dolibarr_box.png','height="120"').'</div>';
diff --git a/htdocs/admin/system/browser.php b/htdocs/admin/system/browser.php
index 1a68133127d4e6e1ccfeb0e626bcead8299e997c..30ecc448e4dbf85c80510ec6ff1a8fbf9865f5d5 100644
--- a/htdocs/admin/system/browser.php
+++ b/htdocs/admin/system/browser.php
@@ -42,7 +42,7 @@ $form=new Form($db);
llxHeader();
-print_fiche_titre($langs->trans("InfoBrowser"),'','title_setup');
+print load_fiche_titre($langs->trans("InfoBrowser"),'','title_setup');
$tmp=getBrowserInfo($_SERVER["HTTP_USER_AGENT"]);
diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php
index 16c63b1b1fd61243ad47f65c67380be3c275b209..1ff005e88b23ed17d61aea3e4406d2ea853da91e 100644
--- a/htdocs/admin/system/constall.php
+++ b/htdocs/admin/system/constall.php
@@ -39,10 +39,10 @@ if (!$user->admin)
llxHeader();
-print_fiche_titre($langs->trans("SummaryConst"),'','title_setup');
+print load_fiche_titre($langs->trans("SummaryConst"),'','title_setup');
-print_titre($langs->trans("ConfigurationFile").' ('.$conffiletoshowshort.')');
+print load_fiche_titre($langs->trans("ConfigurationFile").' ('.$conffiletoshowshort.')');
// Parameters in conf.php file (when a parameter start with ?, it is shown only if defined)
$configfileparameters=array(
'dolibarr_main_url_root',
@@ -200,7 +200,7 @@ print '<br>';
// Parameters in database
-print_titre($langs->trans("Database"));
+print load_fiche_titre($langs->trans("Database"));
print '<table class="noborder">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Parameter").'</td>';
diff --git a/htdocs/admin/system/database-tables.php b/htdocs/admin/system/database-tables.php
index 9650b32bd5c4f8d996cf470d3d03b34c437b2313..31d35d3f01d9dc1ac11e1452d066dfc51dc24ab0 100644
--- a/htdocs/admin/system/database-tables.php
+++ b/htdocs/admin/system/database-tables.php
@@ -46,7 +46,7 @@ if ($action == 'convert')
llxHeader();
-print_fiche_titre($langs->trans("Tables")." ".ucfirst($conf->db->type),'','title_setup');
+print load_fiche_titre($langs->trans("Tables")." ".ucfirst($conf->db->type),'','title_setup');
// Define request to get table description
diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php
index e6fc31c44264a4843cef631dfe84c0aff866dd62..365cfaa449dabcaf0689aa422a2493938fc4af01 100644
--- a/htdocs/admin/system/database.php
+++ b/htdocs/admin/system/database.php
@@ -39,7 +39,7 @@ $form=new Form($db);
llxHeader();
-print_fiche_titre($langs->trans("InfoDatabase"),'','title_setup');
+print load_fiche_titre($langs->trans("InfoDatabase"),'','title_setup');
// Database
print '<table class="noborder" width="100%">';
diff --git a/htdocs/admin/system/dbtable.php b/htdocs/admin/system/dbtable.php
index b2e01f65ebb6bf1a372df36617c1e865ccb5edb1..3fc10bb0f3fc615d908de9f7e0e4656f88533eaa 100644
--- a/htdocs/admin/system/dbtable.php
+++ b/htdocs/admin/system/dbtable.php
@@ -41,7 +41,7 @@ $table=GETPOST('table','alpha');
llxHeader();
-print_fiche_titre($langs->trans("Table") . " ".$table,'','title_setup');
+print load_fiche_titre($langs->trans("Table") . " ".$table,'','title_setup');
// Define request to get table description
$base=0;
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index a3788e040238b0908b5cd6d5f8f74818ab4498e5..eeea93a2feaef1adb34c64c71466534dce48407d 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -42,7 +42,7 @@ $form=new Form($db);
llxHeader();
-print_fiche_titre($langs->trans("InfoDolibarr"),'','title_setup');
+print load_fiche_titre($langs->trans("InfoDolibarr"),'','title_setup');
// Version
$var=true;
diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php
index 14c9ea59d9a18cf6308a1a89511475ec779c7e0a..9b7dfb766894e7af062dcd04488e7614847ce42b 100644
--- a/htdocs/admin/system/filecheck.php
+++ b/htdocs/admin/system/filecheck.php
@@ -40,7 +40,7 @@ $error=0;
llxHeader();
-print_fiche_titre($langs->trans("FileCheckDolibarr"),'','title_setup');
+print load_fiche_titre($langs->trans("FileCheckDolibarr"),'','title_setup');
// Version
$var = true;
diff --git a/htdocs/admin/system/index.php b/htdocs/admin/system/index.php
index 133b6cfbfffb980b8e0568c4ad9d003a01aa5ef8..3d473640618e21675ef8e8004e719139b62bb46b 100644
--- a/htdocs/admin/system/index.php
+++ b/htdocs/admin/system/index.php
@@ -45,7 +45,7 @@ if (! $user->admin) accessforbidden();
llxHeader();
-print_fiche_titre($langs->trans("SummarySystem"),'','title_setup');
+print load_fiche_titre($langs->trans("SummarySystem"),'','title_setup');
print '<table class="noborder" width="100%">';
diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php
index 1014beba184b9abf2c6cf81c6da4f8664ed50195..d812f6c29edbd68dd9f10fcf80553ff56c6400ac 100644
--- a/htdocs/admin/system/modules.php
+++ b/htdocs/admin/system/modules.php
@@ -39,7 +39,7 @@ if (! $user->admin)
llxHeader();
-print_fiche_titre($langs->trans("AvailableModules"),'','title_setup');
+print load_fiche_titre($langs->trans("AvailableModules"),'','title_setup');
print $langs->trans("ToActivateModule").'<br>';
print "<br>\n";
diff --git a/htdocs/admin/system/os.php b/htdocs/admin/system/os.php
index 5c20fda1cd4f78fa135aa136cad45ff991762b36..2e9e56565c060bbdd297483361cf6d7c64a3291e 100644
--- a/htdocs/admin/system/os.php
+++ b/htdocs/admin/system/os.php
@@ -35,7 +35,7 @@ if (!$user->admin)
llxHeader();
-print_fiche_titre($langs->trans("InfoOS"),'','title_setup');
+print load_fiche_titre($langs->trans("InfoOS"),'','title_setup');
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
diff --git a/htdocs/admin/system/perf.php b/htdocs/admin/system/perf.php
index a5865b29eac15d11bcc7d7a61b648d877b58ef8f..b993b1ea276e08490dbf2ff2cf4e79340d6d5547 100644
--- a/htdocs/admin/system/perf.php
+++ b/htdocs/admin/system/perf.php
@@ -48,7 +48,7 @@ $nowstring=dol_print_date(dol_now(),'dayhourlog');
llxHeader();
-print_fiche_titre($langs->trans("PerfDolibarr"),'','title_setup');
+print load_fiche_titre($langs->trans("PerfDolibarr"),'','title_setup');
print $langs->trans("YouMayFindPerfAdviceHere",'http://wiki.dolibarr.org/index.php/FAQ_Increase_Performance').' (<a href="'.$_SERVER["PHP_SELF"].'">'.$langs->trans("Reload").'</a>)<br>';
diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php
index 89b0f8cd8dc4556ec9c33380ae7ffbdd44009974..dfb897ba27cfdc15f5183e24095793b0a5e8f0d2 100644
--- a/htdocs/admin/system/phpinfo.php
+++ b/htdocs/admin/system/phpinfo.php
@@ -43,7 +43,7 @@ $title='InfoPHP';
if (isset($title))
{
- print_fiche_titre($langs->trans($title), '', 'title_setup');
+ print load_fiche_titre($langs->trans($title), '', 'title_setup');
}
@@ -67,7 +67,7 @@ print '<br>';
$phparray=phpinfo_array();
foreach($phparray as $key => $value)
{
- //print_titre($key);
+ //print load_fiche_titre($key);
print '<table class="noborder">';
print '<tr class="liste_titre">';
//print '<td width="220px">'.$langs->trans("Parameter").'</td>';
diff --git a/htdocs/admin/system/web.php b/htdocs/admin/system/web.php
index 2d51344b68c4d6a4d363d6cd6e05feb14d95094c..d1864b1b409de3fd904c70b5932b2938282f0a85 100644
--- a/htdocs/admin/system/web.php
+++ b/htdocs/admin/system/web.php
@@ -42,7 +42,7 @@ if (!$user->admin) accessforbidden();
llxHeader();
-print_fiche_titre($langs->trans("InfoWebServer"),'','title_setup');
+print load_fiche_titre($langs->trans("InfoWebServer"),'','title_setup');
print '<table class="noborder" width="100%">';
print "<tr class=\"liste_titre\"><td>".$langs->trans("Parameter")."</td><td>".$langs->trans("Value")."</td></tr>\n";
diff --git a/htdocs/admin/system/xcache.php b/htdocs/admin/system/xcache.php
index e6c0f7ae47708c2d6ad7de9fd46b7def5e4e010c..361be2b461a5d15cce283b30c601f80ff856f0f0 100644
--- a/htdocs/admin/system/xcache.php
+++ b/htdocs/admin/system/xcache.php
@@ -35,7 +35,7 @@ $action=GETPOST('action');
llxHeader();
-print_fiche_titre("XCache",'','title_setup');
+print load_fiche_titre("XCache",'','title_setup');
print "<br>\n";
diff --git a/htdocs/admin/system/xdebug.php b/htdocs/admin/system/xdebug.php
index 501f74b414bb4d845198af84ef664617743b9954..4236d8c6019725fa2c7ab923e6324bc653d77466 100644
--- a/htdocs/admin/system/xdebug.php
+++ b/htdocs/admin/system/xdebug.php
@@ -34,7 +34,7 @@ accessforbidden();
llxHeader();
-print_fiche_titre("XDebug",'','title_setup');
+print load_fiche_titre("XDebug",'','title_setup');
print "<br>\n";
diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php
index 0802b2230ec45e7105d19ae28e6f904e805c57d3..36c2f66aa519cdeb99bbbc9aa94bf18f86928444 100644
--- a/htdocs/admin/taxes.php
+++ b/htdocs/admin/taxes.php
@@ -114,7 +114,7 @@ llxHeader();
$form=new Form($db);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans('TaxSetup'),$linkback,'title_setup');
+print load_fiche_titre($langs->trans('TaxSetup'),$linkback,'title_setup');
dol_fiche_head();
@@ -143,7 +143,7 @@ else
print "</table>\n";
print '<br>';
- print_fiche_titre($langs->trans("SummaryOfVatExigibilityUsedByDefault"),'','');
+ print load_fiche_titre($langs->trans("SummaryOfVatExigibilityUsedByDefault"),'','');
//print ' ('.$langs->trans("CanBeChangedWhenMakingInvoice").')';
print '<table class="noborder" width="100%">';
diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index 6f1783e5d11afa71afb25508d22e6673f1d82a82..a460f667e2a19cf9b8b2ba20d898dd1299fa8ffe 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -110,7 +110,7 @@ jQuery(document).ready(function() {
</script>
<?php
-print_fiche_titre($langs->trans("Backup"),'','title_setup');
+print load_fiche_titre($langs->trans("Backup"),'','title_setup');
print $langs->trans("BackupDesc",DOL_DATA_ROOT).'<br><br>';
@@ -133,7 +133,7 @@ print '<br>';
<?php
-print_titre($title?$title:$langs->trans("BackupDumpWizard"));
+print load_fiche_titre($title?$title:$langs->trans("BackupDumpWizard"));
print '<table width="100%" class="'.($useinecm?'nobordernopadding':'liste').' nohover">';
print '<tr class="liste_titre">';
diff --git a/htdocs/admin/tools/dolibarr_import.php b/htdocs/admin/tools/dolibarr_import.php
index 0826eec832a2111da9e09f01aa026fa2f737e478..e1de295eba5e62657a156dd2f38eef6e351fb1b9 100644
--- a/htdocs/admin/tools/dolibarr_import.php
+++ b/htdocs/admin/tools/dolibarr_import.php
@@ -63,7 +63,7 @@ jQuery(document).ready(function() {
</script>
<?php
-print_fiche_titre($langs->trans("Restore"),'','title_setup');
+print load_fiche_titre($langs->trans("Restore"),'','title_setup');
print $langs->trans("RestoreDesc",DOL_DATA_ROOT).'<br><br>';
?>
diff --git a/htdocs/admin/tools/eaccelerator.php b/htdocs/admin/tools/eaccelerator.php
index da168eec510f76aa6afbfefb9910209381cf033e..588170fbb9009abb383ba9d6875e3a13cb4b55b8 100644
--- a/htdocs/admin/tools/eaccelerator.php
+++ b/htdocs/admin/tools/eaccelerator.php
@@ -227,7 +227,7 @@ function create_key_table($list)
$form=new Form($db);
-print_fiche_titre('Dolibarr eAccelerator '.$info['version'].' control panel','','title_setup');
+print load_fiche_titre('Dolibarr eAccelerator '.$info['version'].' control panel','','title_setup');
$var=true;
diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
index f3f21388cc1322f7136f651869c4114d3e15d1a8..500c766ed770a95ac3ec47cedbbce96db1c198e9 100644
--- a/htdocs/admin/tools/export.php
+++ b/htdocs/admin/tools/export.php
@@ -95,7 +95,7 @@ $formfile = new FormFile($db);
//$help_url='EN:Backups|FR:Sauvegardes|ES:Copias_de_seguridad';
//llxHeader('','',$help_url);
-//print_fiche_titre($langs->trans("Backup"),'','title_setup');
+//print load_fiche_titre($langs->trans("Backup"),'','title_setup');
// Start with empty buffer
diff --git a/htdocs/admin/tools/index.php b/htdocs/admin/tools/index.php
index 4ea716c322bb73c4eb8cc5b96219239c97fe29eb..6d7082728f374e0aca04ce273f45109866d6ac34 100644
--- a/htdocs/admin/tools/index.php
+++ b/htdocs/admin/tools/index.php
@@ -42,7 +42,7 @@ if (GETPOST('leftmenu') == 'modulesadmintools') $title=$langs->trans("ModulesSys
llxHeader(array(),$title);
-print_fiche_titre($title,'','title_setup');
+print load_fiche_titre($title,'','title_setup');
print $langs->trans("SystemToolsAreaDesc").'<br>';
print "<br>";
diff --git a/htdocs/admin/tools/purge.php b/htdocs/admin/tools/purge.php
index 9bd700a7c9e56668f871d79e524f7ab116277041..0c5915fd3268d73284c94af3a17bf8ff428f7fe0 100644
--- a/htdocs/admin/tools/purge.php
+++ b/htdocs/admin/tools/purge.php
@@ -117,7 +117,7 @@ llxHeader();
$form=new Form($db);
-print_fiche_titre($langs->trans("Purge"),'','title_setup');
+print load_fiche_titre($langs->trans("Purge"),'','title_setup');
print $langs->trans("PurgeAreaDesc",$dolibarr_main_data_root).'<br>';
print '<br>';
diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php
index b391ffa0d2a2b62462efc937837d8dd1eb3b700e..54a6cab9cbd6b02ed5284af677dbe9e74b8bde66 100644
--- a/htdocs/admin/tools/update.php
+++ b/htdocs/admin/tools/update.php
@@ -163,7 +163,7 @@ $dirins_ok=(dol_is_dir($dirins));
$wikihelp='EN:Installation_-_Upgrade|FR:Installation_-_Mise_à_jour|ES:Instalación_-_Actualización';
llxHeader('',$langs->trans("Upgrade"),$wikihelp);
-print_fiche_titre($langs->trans("Upgrade"),'','title_setup');
+print load_fiche_titre($langs->trans("Upgrade"),'','title_setup');
print $langs->trans("CurrentVersion").' : <b>'.DOL_VERSION.'</b><br>';
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index cdea31fd7c484265a5bb81d3f69f7ba5a672e30d..0528d090c52b1eea95d3e08cf9581f024abb1d09 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -52,7 +52,7 @@ $action=GETPOST('action');
$wikihelp='EN:Setup|FR:Paramétrage|ES:Configuración';
llxHeader('',$langs->trans("Setup"),$wikihelp);
-print_fiche_titre($langs->trans("TranslationSetup"),'','title_setup');
+print load_fiche_titre($langs->trans("TranslationSetup"),'','title_setup');
print $langs->trans("TranslationDesc")."<br>\n";
print "<br>\n";
diff --git a/htdocs/admin/triggers.php b/htdocs/admin/triggers.php
index fb7085a6ba8836965431fb1a0ff98e7215f981b2..de59c9136b2c29b5d0a7292af173c442f0886093 100644
--- a/htdocs/admin/triggers.php
+++ b/htdocs/admin/triggers.php
@@ -42,7 +42,7 @@ llxHeader("","");
$form = new Form($db);
-print_fiche_titre($langs->trans("TriggersAvailable"),'','title_setup');
+print load_fiche_titre($langs->trans("TriggersAvailable"),'','title_setup');
print $langs->trans("TriggersDesc")."<br>";
print "<br>\n";
diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php
index dc21790ec32dc8df16f4c6f3185e7af0c7708e7e..85ea850110768495d08ed84fd099e5af5091c2fb 100644
--- a/htdocs/admin/user.php
+++ b/htdocs/admin/user.php
@@ -95,7 +95,7 @@ $help_url='EN:Module_Users|FR:Module_Utilisateurs|ES:Módulo_Usuarios';
llxHeader('',$langs->trans("UsersSetup"),$help_url);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("UsersSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("UsersSetup"),$linkback,'title_setup');
$head=user_admin_prepare_head();
diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php
index 255fc0f6d9c3db7709344db1cfe1b5e96b904d73..bdd84a50a7f584aa9f1a379bfa9a43d2a670ad4c 100644
--- a/htdocs/admin/workflow.php
+++ b/htdocs/admin/workflow.php
@@ -61,7 +61,7 @@ if (preg_match('/del(.*)/',$action,$reg))
llxHeader('',$langs->trans("WorkflowSetup"),'');
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("WorkflowSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("WorkflowSetup"),$linkback,'title_setup');
print $langs->trans("WorkflowDesc").'<br>';
print "<br>";
diff --git a/htdocs/api/admin/api.php b/htdocs/api/admin/api.php
index 740d3eb7e8dfc0f137ca38a8c525429c7e14be75..4d3768070ef00147bee16bbc1ac081341229a2db 100644
--- a/htdocs/api/admin/api.php
+++ b/htdocs/api/admin/api.php
@@ -59,7 +59,7 @@ if ($action == 'setproductionmode')
llxHeader();
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("ApiSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("ApiSetup"),$linkback,'title_setup');
print $langs->trans("ApiDesc")."<br>\n";
print "<br>\n";
diff --git a/htdocs/barcode/codeinit.php b/htdocs/barcode/codeinit.php
index bd8f2194fe4449506e8470a8253d2eb13b71d140..9251b5e7ac97413af56975d6e3f4dbb9db7aea82 100644
--- a/htdocs/barcode/codeinit.php
+++ b/htdocs/barcode/codeinit.php
@@ -191,7 +191,7 @@ $form=new Form($db);
llxHeader('',$langs->trans("MassBarcodeInit"));
-print_fiche_titre($langs->trans("MassBarcodeInit"));
+print load_fiche_titre($langs->trans("MassBarcodeInit"));
print '<br>';
print $langs->trans("MassBarcodeInitDesc").'<br>';
@@ -211,7 +211,7 @@ if ($conf->societe->enabled)
{
$nbno=$nbtotal=0;
- print_fiche_titre($langs->trans("BarcodeInitForThirdparties"),'','object_company');
+ print load_fiche_titre($langs->trans("BarcodeInitForThirdparties"),'','object_company');
print '<br>'."\n";
$sql="SELECT count(rowid) as nb FROM ".MAIN_DB_PREFIX."societe where barcode IS NULL or barcode = ''";
$resql=$db->query($sql);
@@ -252,7 +252,7 @@ if ($conf->product->enabled || $conf->product->service)
$nbno=$nbtotal=0;
- print_fiche_titre($langs->trans("BarcodeInitForProductsOrServices"),'','object_product');
+ print load_fiche_titre($langs->trans("BarcodeInitForProductsOrServices"),'','object_product');
print '<br>'."\n";
$sql ="SELECT count(rowid) as nb, fk_product_type, datec";
diff --git a/htdocs/barcode/printsheet.php b/htdocs/barcode/printsheet.php
index b535eb7765d05b177a31012c1d251295f5a2edee..68673d9c83b53362a554ad2c8c13c4c279ebd39b 100644
--- a/htdocs/barcode/printsheet.php
+++ b/htdocs/barcode/printsheet.php
@@ -261,7 +261,7 @@ $form=new Form($db);
llxHeader('',$langs->trans("BarCodePrintsheet"));
-print_fiche_titre($langs->trans("BarCodePrintsheet"));
+print load_fiche_titre($langs->trans("BarCodePrintsheet"));
print '<br>';
print $langs->trans("PageToGenerateBarCodeSheets",$langs->transnoentitiesnoconv("BuildPageToPrint")).'<br>';
diff --git a/htdocs/bookmarks/admin/bookmark.php b/htdocs/bookmarks/admin/bookmark.php
index 51274716edac389a232b726d04a58f551f791af1..05691a227b78919a26607c6c21fa7a304e881f0c 100644
--- a/htdocs/bookmarks/admin/bookmark.php
+++ b/htdocs/bookmarks/admin/bookmark.php
@@ -59,7 +59,7 @@ if ($action == 'setvalue')
llxHeader();
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("BookmarkSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("BookmarkSetup"),$linkback,'title_setup');
print $langs->trans("BookmarkDesc")."<br>\n";
diff --git a/htdocs/bookmarks/card.php b/htdocs/bookmarks/card.php
index a821cf8e94fb750812d51c47e471bdfe88cf57d1..33a0f383fde1cbe8b20de48bcc6a202572a37b68 100644
--- a/htdocs/bookmarks/card.php
+++ b/htdocs/bookmarks/card.php
@@ -149,7 +149,7 @@ if ($action == 'create')
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="add">';
- print_fiche_titre($langs->trans("NewBookmark"));
+ print load_fiche_titre($langs->trans("NewBookmark"));
dol_fiche_head($head, $hselected, $langs->trans("Bookmark"),0,'bookmark');
@@ -165,7 +165,7 @@ if ($action == 'create')
print '</td><td class="hideonsmartphone">'.$langs->trans("ChooseIfANewWindowMustBeOpenedOnClickOnBookmark").'</td></tr>';
print '<tr><td>'.$langs->trans("Owner").'</td><td>';
- $form->select_users(isset($_POST['userid'])?$_POST['userid']:$user->id,'userid',1);
+ $form->select_dolusers(isset($_POST['userid'])?$_POST['userid']:$user->id,'userid',1);
print '</td><td class="hideonsmartphone"> </td></tr>';
// Position
@@ -262,7 +262,7 @@ if ($id > 0 && ! preg_match('/^add/i',$action))
print '<tr><td>'.$langs->trans("Owner").'</td><td>';
if ($action == 'edit' && $user->admin)
{
- $form->select_users(isset($_POST['userid'])?$_POST['userid']:($bookmark->fk_user?$bookmark->fk_user:''),'userid',1);
+ $form->select_dolusers(isset($_POST['userid'])?$_POST['userid']:($bookmark->fk_user?$bookmark->fk_user:''),'userid',1);
}
else
{
diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php
index 7512785d78b7f0d307086867e4c058a172e823c7..c54111239b95b41f6d6415d3e98f1b89da489ceb 100644
--- a/htdocs/bookmarks/list.php
+++ b/htdocs/bookmarks/list.php
@@ -72,7 +72,7 @@ $userstatic=new User($db);
llxHeader();
-print_fiche_titre($langs->trans("Bookmarks"));
+print load_fiche_titre($langs->trans("Bookmarks"));
$sql = "SELECT b.fk_soc as rowid, b.dateb, b.rowid as bid, b.fk_user, b.url, b.target, b.title, b.favicon, b.position,";
$sql.= " u.login, u.lastname, u.firstname";
diff --git a/htdocs/cashdesk/admin/cashdesk.php b/htdocs/cashdesk/admin/cashdesk.php
index 48804958b209e9d1cd74d5593ff53d792db7c71f..74560e8ff6af515dd4e3af3bd60b69e51fad9e20 100644
--- a/htdocs/cashdesk/admin/cashdesk.php
+++ b/htdocs/cashdesk/admin/cashdesk.php
@@ -85,7 +85,7 @@ $formproduct=new FormProduct($db);
llxHeader('',$langs->trans("CashDeskSetup"));
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("CashDeskSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("CashDeskSetup"),$linkback,'title_setup');
print '<br>';
diff --git a/htdocs/categories/admin/categorie.php b/htdocs/categories/admin/categorie.php
index 23ebc01f3e2490ec67eb0187632b9fd000efadd7..37ed08703f84328926df8f8e2f8b9d29dbb01aad 100644
--- a/htdocs/categories/admin/categorie.php
+++ b/htdocs/categories/admin/categorie.php
@@ -77,7 +77,7 @@ $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToM
llxHeader('',$langs->trans("Categories"),$help_url);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("CategoriesSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("CategoriesSetup"),$linkback,'title_setup');
$head=categoriesadmin_prepare_head();
diff --git a/htdocs/categories/admin/categorie_extrafields.php b/htdocs/categories/admin/categorie_extrafields.php
index df31e07d95bb63dc365357c6511fa265c25f22ff..87e907c696eef6c4fb373d0d86f7e40509b8f778 100644
--- a/htdocs/categories/admin/categorie_extrafields.php
+++ b/htdocs/categories/admin/categorie_extrafields.php
@@ -64,7 +64,7 @@ llxHeader('',$langs->trans("Categories"),$help_url);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("CategoriesSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("CategoriesSetup"),$linkback,'title_setup');
$head = categoriesadmin_prepare_head();
@@ -93,7 +93,7 @@ if ($action != 'create' && $action != 'edit')
if ($action == 'create')
{
print "<br>";
- print_titre($langs->trans('NewAttribute'));
+ print load_fiche_titre($langs->trans('NewAttribute'));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
}
@@ -106,7 +106,7 @@ if ($action == 'create')
if ($action == 'edit' && ! empty($attrname))
{
print "<br>";
- print_titre($langs->trans("FieldEdition", $attrname));
+ print load_fiche_titre($langs->trans("FieldEdition", $attrname));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
}
diff --git a/htdocs/categories/card.php b/htdocs/categories/card.php
index 6c4c1a39bdd38bf15bd740698e76b50796a0842a..5bd73202f159ed85d898a11a650075d6d3171a8b 100644
--- a/htdocs/categories/card.php
+++ b/htdocs/categories/card.php
@@ -236,7 +236,7 @@ if ($user->rights->categorie->creer)
if ($origin) print '<input type="hidden" name="origin" value="'.$origin.'">';
if ($catorigin) print '<input type="hidden" name="catorigin" value="'.$catorigin.'">';
- print_fiche_titre($langs->trans("CreateCat"));
+ print load_fiche_titre($langs->trans("CreateCat"));
dol_fiche_head('');
@@ -256,7 +256,7 @@ if ($user->rights->categorie->creer)
// Color
print '<tr><td>'.$langs->trans("Color").'</td><td>';
- print $formother->select_color($color,'color');
+ print $formother->selectColor($color,'color');
print '</td></tr>';
// Parent category
diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php
index 43803d045bbabec214ce83957f0e075c6bb6e92a..b573d02bf162b2e0fd6e32086648e696306d76c5 100644
--- a/htdocs/categories/categorie.php
+++ b/htdocs/categories/categorie.php
@@ -641,7 +641,7 @@ function formCategory($db,$object,$typeid,$socid=0,$showclassifyform=1)
}
print '<br>';
- print_fiche_titre($title,$linktocreate,'');
+ print load_fiche_titre($title,$linktocreate,'');
// Form to add record into a category
if ($showclassifyform)
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index ac051a45666b38f53141ae6d77bb18515da4f091..bcb53f8a0f5bb09a7b7dd2b9944eb44d37d90926 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -112,7 +112,6 @@ class Categorie extends CommonObject
public $element='category';
public $table_element='categories';
- var $id;
var $fk_parent;
var $label;
var $description;
@@ -134,7 +133,6 @@ class Categorie extends CommonObject
* @see Categorie::TYPE_CONTACT
*/
var $type;
- var $import_key;
var $cats=array(); // Tableau en memoire des categories
var $motherof=array();
diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php
index 28a97d3d89d22c823f470f2dd8ed1e1528ace318..836970e7a3c50311e99dbd892552a16f2aaa2235 100644
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -121,7 +121,7 @@ $formother = new FormOther($db);
llxHeader("","",$langs->trans("Categories"));
-print_fiche_titre($langs->trans("ModifCat"));
+print load_fiche_titre($langs->trans("ModifCat"));
$object->fetch($id);
@@ -156,7 +156,7 @@ print '</td></tr>';
print '<tr>';
print '<td>'.$langs->trans("Color").'</td>';
print '<td >';
-print $formother->select_color($object->color, 'color');
+print $formother->selectColor($object->color, 'color');
print '</td></tr>';
// Parent category
diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php
index b22b19896739dc9f89871af1afe69f82c5d339e4..ff585212dffb4bb6637b7c6c3fb611ceb6d43011 100644
--- a/htdocs/categories/index.php
+++ b/htdocs/categories/index.php
@@ -61,7 +61,7 @@ $arrayofcss=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css')
llxHeader('',$title,'','',0,0,$arrayofjs,$arrayofcss);
-print_fiche_titre($title);
+print load_fiche_titre($title);
//print '<table border="0" width="100%" class="notopnoleftnoright">';
//print '<tr><td valign="top" width="30%" class="notopnoleft">';
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 8eef2b06b8b84e19071a8e218169dddb14768bd8..1e4b969644c4adb7a9c19ba498f254337015226e 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -636,8 +636,8 @@ if ($action == 'create')
if ($backtopage) print '<input type="hidden" name="backtopage" value="'.($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"]).'">';
if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) print '<input type="hidden" name="actioncode" value="'.dol_getIdFromCode($db, 'AC_OTH', 'c_actioncomm').'">';
- if (GETPOST("actioncode") == 'AC_RDV') print_fiche_titre($langs->trans("AddActionRendezVous"));
- else print_fiche_titre($langs->trans("AddAnAction"));
+ if (GETPOST("actioncode") == 'AC_RDV') print load_fiche_titre($langs->trans("AddActionRendezVous"));
+ else print load_fiche_titre($langs->trans("AddAnAction"));
dol_fiche_head();
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 9d793e16ba080814572d6fe4f34cfff8330878f5..2b347036a58f3610e2d7cfe034016ad725fda6c3 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -107,7 +107,6 @@ class ActionComm extends CommonObject
var $transparency; // Transparency (ical standard). Used to say if people assigned to event are busy or not by event. 0=available, 1=busy, 2=busy (refused events)
var $priority; // Small int (0 By default)
- var $note; // Description
var $userassigned = array(); // Array of user ids
var $userownerid; // Id of user owner = fk_user_action into table
@@ -148,12 +147,6 @@ class ActionComm extends CommonObject
*/
var $contact;
- /**
- * Id of project (optional)
- * @var int
- */
- var $fk_project;
-
// Properties for links to other objects
var $fk_element; // Id of record
var $elementtype; // Type of record. This if property ->element of object linked to.
@@ -409,8 +402,8 @@ class ActionComm extends CommonObject
$this->db->begin();
- // Load source object
- $objFrom = dol_clone($this);
+ // Load source object
+ $objFrom = clone $this;
$this->fetch_optionals();
$this->fetch_userassigned();
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index f445c7f35961e474cef21bdede8faf90d21341da..6b3384b92dd08e27568cc3f92dce12f67ec541c4 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -414,7 +414,7 @@ else // If javascript off
$link.='</a>';
}
-print_fiche_titre($s, $link.' '.$nav, '');
+print load_fiche_titre($s, $link.' '.$nav, '');
// Load events from database into $eventarray
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 5f8ce1563de01e383c8881c3c61fe64c69f072b3..41270d7996e6d1f4c874b61a7ccc567829515260 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -337,7 +337,7 @@ if ($conf->use_javascript_ajax)
$link='';
-print_fiche_titre($s, $link.' '.$nav, '');
+print load_fiche_titre($s, $link.' '.$nav, '');
// Get event in an array
diff --git a/htdocs/comm/address.php b/htdocs/comm/address.php
index 963847aee18d19ddc2572a0d562c1d8a46dca753..eb3c51b17609b305af5eb2096d9aa000bea21886 100644
--- a/htdocs/comm/address.php
+++ b/htdocs/comm/address.php
@@ -211,7 +211,7 @@ if ($action == 'create')
$object->country = $tmparray['label'];
}
- print_fiche_titre($langs->trans("AddAddress"));
+ print load_fiche_titre($langs->trans("AddAddress"));
print "<br>\n";
@@ -306,7 +306,7 @@ elseif ($action == 'edit')
dol_fiche_head($head, 'card', $societe->name);
- print_titre($langs->trans("EditAddress"));
+ print load_fiche_titre($langs->trans("EditAddress"));
print "<br>\n";
if ($socid)
diff --git a/htdocs/comm/admin/askpricesupplier_extrafields.php b/htdocs/comm/admin/askpricesupplier_extrafields.php
index 4342549c46ab9d2b4b05ff099729a54450f0fd1e..0fb0554203fcc5d285b856b7cffe223fd67bbb28 100644
--- a/htdocs/comm/admin/askpricesupplier_extrafields.php
+++ b/htdocs/comm/admin/askpricesupplier_extrafields.php
@@ -60,7 +60,7 @@ llxHeader('',$langs->trans("AskPriceSupplierSetup"));
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("AskPriceSupplierSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("AskPriceSupplierSetup"),$linkback,'title_setup');
$head = askpricesupplier_admin_prepare_head();
@@ -128,7 +128,7 @@ if ($action != 'create' && $action != 'edit')
if ($action == 'create')
{
print "<br>";
- print_titre($langs->trans('NewAttribute'));
+ print load_fiche_titre($langs->trans('NewAttribute'));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
}
@@ -141,7 +141,7 @@ if ($action == 'create')
if ($action == 'edit' && ! empty($attrname))
{
print "<br>";
- print_titre($langs->trans("FieldEdition", $attrname));
+ print load_fiche_titre($langs->trans("FieldEdition", $attrname));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
}
diff --git a/htdocs/comm/admin/askpricesupplierdet_extrafields.php b/htdocs/comm/admin/askpricesupplierdet_extrafields.php
index e419b6a31684866bb64ac0a30f3f0073ac5edf47..09c215d1f3d4f05eddcc3c4ab158807a685dfdf8 100644
--- a/htdocs/comm/admin/askpricesupplierdet_extrafields.php
+++ b/htdocs/comm/admin/askpricesupplierdet_extrafields.php
@@ -66,7 +66,7 @@ $textobject=$langs->transnoentitiesnoconv("CommRequests");
llxHeader('',$langs->trans("AskPriceSupplierSetup"));
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("AskPriceSupplierSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("AskPriceSupplierSetup"),$linkback,'title_setup');
$head = askpricesupplier_admin_prepare_head();
@@ -130,7 +130,7 @@ if ($action != 'create' && $action != 'edit')
if ($action == 'create')
{
print "<br>";
- print_titre($langs->trans('NewAttribute'));
+ print load_fiche_titre($langs->trans('NewAttribute'));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
}
@@ -143,7 +143,7 @@ if ($action == 'create')
if ($action == 'edit' && ! empty($attrname))
{
print "<br>";
- print_titre($langs->trans("FieldEdition", $attrname));
+ print load_fiche_titre($langs->trans("FieldEdition", $attrname));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
}
diff --git a/htdocs/comm/admin/propal_extrafields.php b/htdocs/comm/admin/propal_extrafields.php
index bd0ce34329debfbea376126d491133dad110d8a9..9c55c606e81f3a776876116808d51416b52d83e4 100644
--- a/htdocs/comm/admin/propal_extrafields.php
+++ b/htdocs/comm/admin/propal_extrafields.php
@@ -64,7 +64,7 @@ $textobject=$langs->transnoentitiesnoconv("Proposals");
llxHeader('',$langs->trans("PropalSetup"));
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("PropalSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("PropalSetup"),$linkback,'title_setup');
$head = propal_admin_prepare_head();
@@ -94,7 +94,7 @@ if ($action != 'create' && $action != 'edit')
if ($action == 'create')
{
print "<br>";
- print_titre($langs->trans('NewAttribute'));
+ print load_fiche_titre($langs->trans('NewAttribute'));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
}
@@ -107,7 +107,7 @@ if ($action == 'create')
if ($action == 'edit' && ! empty($attrname))
{
print "<br>";
- print_titre($langs->trans("FieldEdition", $attrname));
+ print load_fiche_titre($langs->trans("FieldEdition", $attrname));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
}
diff --git a/htdocs/comm/admin/propaldet_extrafields.php b/htdocs/comm/admin/propaldet_extrafields.php
index 58ab3adf109e77c8a093e539e239ce058c803d51..97d4763ace3f7865ba9dee927d66fbc47451a23f 100644
--- a/htdocs/comm/admin/propaldet_extrafields.php
+++ b/htdocs/comm/admin/propaldet_extrafields.php
@@ -72,7 +72,7 @@ $textobject=$langs->transnoentitiesnoconv("Proposals");
llxHeader('',$langs->trans("PropalSetup"));
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("PropalSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("PropalSetup"),$linkback,'title_setup');
$head = propal_admin_prepare_head();
@@ -101,7 +101,7 @@ if ($action != 'create' && $action != 'edit')
if ($action == 'create')
{
print "<br>";
- print_titre($langs->trans('NewAttribute'));
+ print load_fiche_titre($langs->trans('NewAttribute'));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
}
@@ -114,7 +114,7 @@ if ($action == 'create')
if ($action == 'edit' && ! empty($attrname))
{
print "<br>";
- print_titre($langs->trans("FieldEdition", $attrname));
+ print load_fiche_titre($langs->trans("FieldEdition", $attrname));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
}
diff --git a/htdocs/comm/askpricesupplier/card.php b/htdocs/comm/askpricesupplier/card.php
index 22732c1a19ddd45d808918ec6ae77acd55533795..5b8bd88a9209ed93c8d1ad4c0eacfd067133e443 100644
--- a/htdocs/comm/askpricesupplier/card.php
+++ b/htdocs/comm/askpricesupplier/card.php
@@ -29,6 +29,7 @@ require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaskpricesupplier.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formmargin.class.php';
require_once DOL_DOCUMENT_ROOT . '/comm/askpricesupplier/class/askpricesupplier.class.php';
require_once DOL_DOCUMENT_ROOT . '/comm/action/class/actioncomm.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/modules/askpricesupplier/modules_askpricesupplier.php';
@@ -977,6 +978,7 @@ $form = new Form($db);
$formother = new FormOther($db);
$formfile = new FormFile($db);
$formaskpricesupplier = new FormAskPriceSupplier($db);
+$formmargin = new FormMargin($this->db);
$companystatic = new Societe($db);
$now = dol_now();
@@ -984,7 +986,7 @@ $now = dol_now();
// Add new askprice
if ($action == 'create')
{
- print_fiche_titre($langs->trans("NewAskPrice"));
+ print load_fiche_titre($langs->trans("NewAskPrice"));
$soc = new Societe($db);
if ($socid > 0)
@@ -1263,7 +1265,7 @@ if ($action == 'create')
print '<br>';
$title = $langs->trans('ProductsAndServices');
- print_titre($title);
+ print load_fiche_titre($title);
print '<table class="noborder" width="100%">';
@@ -1500,7 +1502,7 @@ if ($action == 'create')
// Margin Infos
if (! empty($conf->margin->enabled)) {
print '<td valign="top" width="50%" rowspan="4">';
- $object->displayMarginInfos();
+ $formmargin->displayMarginInfos($object);
print '</td>';
}
print '</tr>';
@@ -1770,7 +1772,7 @@ if ($action == 'create')
print '<div class="clearboth"></div>';
print '<br>';
- print_fiche_titre($langs->trans('SendAskByMail'));
+ print load_fiche_titre($langs->trans('SendAskByMail'));
dol_fiche_head('');
diff --git a/htdocs/comm/askpricesupplier/class/askpricesupplier.class.php b/htdocs/comm/askpricesupplier/class/askpricesupplier.class.php
index bee62cb384dd680f52d32be56192cfe873cb5cbc..971b53a3534dc582d1d9f7409fe05a76d451b416 100644
--- a/htdocs/comm/askpricesupplier/class/askpricesupplier.class.php
+++ b/htdocs/comm/askpricesupplier/class/askpricesupplier.class.php
@@ -53,18 +53,13 @@ class AskPriceSupplier extends CommonObject
*/
protected $table_ref_field = 'ref';
- var $id;
-
var $socid; // Id client
- var $client; // Objet societe client (a charger par fetch_client)
- var $fk_project;
/**
* @deprecated
* @see user_author_id
*/
var $author;
- var $ref;
var $ref_fourn; //Reference saisie lors de l'ajout d'une ligne à la demande
var $statut; // 0 (draft), 1 (validated), 2 (signed), 3 (not signed), 4 (billed)
var $date; // Date of proposal
@@ -99,12 +94,6 @@ class AskPriceSupplier extends CommonObject
var $user_valid_id;
var $user_close_id;
- var $total_ht; // Total net of tax
- var $total_tva; // Total VAT
- var $total_localtax1; // Total Local Taxes 1
- var $total_localtax2; // Total Local Taxes 2
- var $total_ttc; // Total with tax
-
/**
* @deprecated
* @see price_ht
@@ -121,22 +110,11 @@ class AskPriceSupplier extends CommonObject
*/
var $total;
- var $cond_reglement_id;
var $cond_reglement_code;
- var $fk_account; // Id of bank account
- var $mode_reglement_id;
var $mode_reglement_code;
var $remise;
var $remise_percent;
var $remise_absolue;
- /**
- * @deprecated
- * @see note_public, note_private
- */
- var $note;
- var $note_private;
- var $note_public;
- var $shipping_method_id;
var $products=array();
var $extraparams=array();
@@ -144,9 +122,6 @@ class AskPriceSupplier extends CommonObject
var $lines = array();
var $line;
- var $origin;
- var $origin_id;
-
var $labelstatut=array();
var $labelstatut_short=array();
@@ -950,8 +925,8 @@ class AskPriceSupplier extends CommonObject
foreach($this->lines as $line)
$line->fetch_optionals($line->rowid);
- // Load source object
- $objFrom = dol_clone($this);
+ // Load source object
+ $objFrom = clone $this;
$objsoc=new Societe($this->db);
diff --git a/htdocs/comm/askpricesupplier/index.php b/htdocs/comm/askpricesupplier/index.php
index 681a889ed25709a931ca54d6abe147674612f5e9..6936defda494f2da3cf331ab33896c488377b745 100644
--- a/htdocs/comm/askpricesupplier/index.php
+++ b/htdocs/comm/askpricesupplier/index.php
@@ -52,7 +52,7 @@ $help_url="EN:Module_Ask_Price_Supplier|FR:Module_Demande_de_prix_fournisseur";
llxHeader("",$langs->trans("AskPriceSupplierArea"),$help_url);
-print_fiche_titre($langs->trans("AskPriceSupplierArea"));
+print load_fiche_titre($langs->trans("AskPriceSupplierArea"));
print '<div class="fichecenter"><div class="fichethirdleft">';
diff --git a/htdocs/comm/askpricesupplier/tpl/linkedobjectblock.tpl.php b/htdocs/comm/askpricesupplier/tpl/linkedobjectblock.tpl.php
index 48d916c6a5cbce3376c5e51712fb66bb5aa75754..bf16d01fa1e5642af22a179b0a0780f2f2a1f4e6 100644
--- a/htdocs/comm/askpricesupplier/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/comm/askpricesupplier/tpl/linkedobjectblock.tpl.php
@@ -29,7 +29,7 @@ $langs = $GLOBALS['langs'];
$linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
echo '<br>';
-print_titre($langs->trans('RelatedAskPriceSupplier'));
+print load_fiche_titre($langs->trans('RelatedAskPriceSupplier'));
?>
<table class="noborder allwidth">
<tr class="liste_titre">
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 7dc359b4568a2c1e91958c466f1d61fc9ca552f2..6aee0fe939c27a8c61656038353cb605c0f46c6e 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -68,7 +68,7 @@ if (! empty($conf->commande->enabled)) $orderstatic=new Commande($db);
llxHeader();
-print_fiche_titre($langs->trans("CommercialArea"),'','title_commercial.png');
+print load_fiche_titre($langs->trans("CommercialArea"),'','title_commercial.png');
print '<div class="fichecenter"><div class="fichethirdleft">';
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index b7d4f909fa7e72cc094de99e078e0908b0903c02..fde56efb25ee36b8641123a056ef5b5e30a3da71 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -673,7 +673,7 @@ if ($action == 'create')
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="add">';
- print_fiche_titre($langs->trans("NewMailing"));
+ print load_fiche_titre($langs->trans("NewMailing"));
dol_fiche_head();
@@ -958,7 +958,7 @@ else
// Affichage formulaire de TEST
if ($action == 'test')
{
- print_titre($langs->trans("TestMailing"));
+ print load_fiche_titre($langs->trans("TestMailing"));
// Create l'objet formulaire mail
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
@@ -991,7 +991,7 @@ else
}
// Print mail content
- print_fiche_titre($langs->trans("EMail"),'','');
+ print load_fiche_titre($langs->trans("EMail"),'','');
dol_fiche_head('');
@@ -1102,7 +1102,7 @@ else
print '<input type="hidden" name="id" value="'.$object->id.'">';
// Print mail content
- print_fiche_titre($langs->trans("EMail"),'','');
+ print load_fiche_titre($langs->trans("EMail"),'','');
print '<table class="border" width="100%">';
// Subject
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 99c73dc48374524ebd9ce42363ab8d74653f4d62..cd3ff7b00ee1346a9dda1b498e919933dff27112 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -223,7 +223,7 @@ if ($object->fetch($id) >= 0)
// Show email selectors
if ($allowaddtarget && $user->rights->mailing->creer)
{
- print_fiche_titre($langs->trans("ToAddRecipientsChooseHere"),($user->admin?info_admin($langs->trans("YouCanAddYourOwnPredefindedListHere"),1):''),'');
+ print load_fiche_titre($langs->trans("ToAddRecipientsChooseHere"),($user->admin?info_admin($langs->trans("YouCanAddYourOwnPredefindedListHere"),1):''),'');
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php
index 1df5a7ad18f9ec4e28817c3494320d1de9d4846e..f3866f80b9683d862a2ade8c996bebbc418bc376 100644
--- a/htdocs/comm/mailing/class/mailing.class.php
+++ b/htdocs/comm/mailing/class/mailing.class.php
@@ -34,8 +34,6 @@ class Mailing extends CommonObject
public $element='mailing';
public $table_element='mailing';
- var $id;
- var $statut;
var $titre;
var $sujet;
var $body;
diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php
index 5c6ae896e42870e16888ecd019c1eda97d309db8..59753ee1904ae3273b1d5c9a0ab76ef66b6af3d4 100644
--- a/htdocs/comm/mailing/index.php
+++ b/htdocs/comm/mailing/index.php
@@ -42,7 +42,7 @@ $result=restrictedArea($user,'mailing');
$help_url='EN:Module_EMailing|FR:Module_Mailing|ES:Módulo_Mailing';
llxHeader('','EMailing',$help_url);
-print_fiche_titre($langs->trans("MailingArea"));
+print load_fiche_titre($langs->trans("MailingArea"));
//print '<table class="notopnoleftnoright" width="100%">';
//print '<tr><td valign="top" width="30%" class="notopnoleft">';
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 24b7ab16d695a01cf93ba2db17a3cdadc6373e86..e8f374c3b8d4247c665abbfdedb8a9448535c92e 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -35,6 +35,7 @@ require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/class/html.formpropal.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formmargin.class.php';
require_once DOL_DOCUMENT_ROOT . '/comm/propal/class/propal.class.php';
require_once DOL_DOCUMENT_ROOT . '/comm/action/class/actioncomm.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/modules/propale/modules_propale.php';
@@ -1183,6 +1184,7 @@ $form = new Form($db);
$formother = new FormOther($db);
$formfile = new FormFile($db);
$formpropal = new FormPropal($db);
+$formmargin = new FormMargin($this->db);
$companystatic = new Societe($db);
if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
@@ -1191,7 +1193,7 @@ $now = dol_now();
// Add new proposal
if ($action == 'create')
{
- print_fiche_titre($langs->trans("NewProp"));
+ print load_fiche_titre($langs->trans("NewProp"));
$soc = new Societe($db);
if ($socid > 0)
@@ -1579,7 +1581,7 @@ if ($action == 'create')
print '<br>';
$title = $langs->trans('ProductsAndServices');
- print_titre($title);
+ print load_fiche_titre($title);
print '<table class="noborder" width="100%">';
@@ -1986,7 +1988,7 @@ if ($action == 'create')
// Margin Infos
if (! empty($conf->margin->enabled)) {
print '<td valign="top" width="50%" rowspan="4">';
- $object->displayMarginInfos();
+ $formmargin->displayMarginInfos($object);
print '</td>';
}
print '</tr>';
@@ -2287,7 +2289,7 @@ if ($action == 'create')
print '<div class="clearboth"></div>';
print '<br>';
- print_fiche_titre($langs->trans('SendPropalByMail'));
+ print load_fiche_titre($langs->trans('SendPropalByMail'));
dol_fiche_head('');
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 421b2506e7388ffc82cb8d126062c4a39146cb98..2645f39968b580e750b99a0796b4f026a0fc2007 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -54,23 +54,14 @@ class Propal extends CommonObject
*/
protected $table_ref_field = 'ref';
- var $id;
-
/**
* ID of the client
* @var int
*/
var $socid;
- /**
- * Client (loaded by fetch_client)
- * @var Societe
- */
- var $client;
var $contactid;
- var $fk_project;
var $author;
- var $ref;
var $ref_client;
/**
@@ -122,12 +113,6 @@ class Propal extends CommonObject
var $user_valid_id;
var $user_close_id;
- var $total_ht; // Total net of tax
- var $total_tva; // Total VAT
- var $total_localtax1; // Total Local Taxes 1
- var $total_localtax2; // Total Local Taxes 2
- var $total_ttc; // Total with tax
-
/**
* @deprecated
* @see total_ht
@@ -144,29 +129,14 @@ class Propal extends CommonObject
*/
var $total;
- var $cond_reglement_id;
var $cond_reglement_code;
- var $fk_account; // Id of bank account
- var $mode_reglement_id;
var $mode_reglement_code;
var $remise;
var $remise_percent;
var $remise_absolue;
- /**
- * @deprecated
- * @see note_private, note_public
- */
- var $note;
- var $note_private;
- var $note_public;
- /**
- * @deprecated
- */
- var $fk_delivery_address;
var $fk_address;
var $address_type;
var $address;
- var $shipping_method_id;
var $availability_id;
var $availability_code;
var $demand_reason_id;
@@ -181,19 +151,11 @@ class Propal extends CommonObject
var $lines = array();
var $line;
- var $origin;
- var $origin_id;
-
var $labelstatut=array();
var $labelstatut_short=array();
var $specimen;
- //Incorterms
- var $fk_incoterms;
- var $location_incoterms;
- var $libelle_incoterms; //Used into tooltip
-
/**
* Draft status
*/
@@ -647,7 +609,7 @@ class Propal extends CommonObject
$line = new PropaleLigne($this->db);
$line->fetch($rowid);
- $staticline = clone $line;
+ $staticline = clone $line;
$line->oldline = $staticline;
$this->line = $line;
@@ -1077,7 +1039,7 @@ class Propal extends CommonObject
$line->fetch_optionals($line->rowid);
// Load source object
- $objFrom = dol_clone($this);
+ $objFrom = clone $this;
$objsoc=new Societe($this->db);
diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php
index 8fc50f853c60e39d1f0c9da46f46572e8c15c3bc..1bcbec9723d6b5d6985e3a18b34c78a7e4a14dac 100644
--- a/htdocs/comm/propal/index.php
+++ b/htdocs/comm/propal/index.php
@@ -52,7 +52,7 @@ $help_url="EN:Module_Commercial_Proposals|FR:Module_Propositions_commerciales|ES
llxHeader("",$langs->trans("ProspectionArea"),$help_url);
-print_fiche_titre($langs->trans("ProspectionArea"));
+print load_fiche_titre($langs->trans("ProspectionArea"));
//print '<table width="100%" class="notopnoleftnoright">';
//print '<tr><td valign="top" width="30%" class="notopnoleft">';
diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php
index 9a2a712e33975cea0c1e35946c3f4c84990b0579..e99c7122a10dc2a867b7045ab3e4fe5b330eae19 100644
--- a/htdocs/comm/propal/stats/index.php
+++ b/htdocs/comm/propal/stats/index.php
@@ -65,7 +65,7 @@ $langs->load('other');
llxHeader('', $langs->trans("ProposalsStatistics"));
-print_fiche_titre($langs->trans("ProposalsStatistics"),'','title_commercial.png');
+print load_fiche_titre($langs->trans("ProposalsStatistics"),'','title_commercial.png');
$dir=$conf->propal->dir_temp;
diff --git a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
index 66cde8692ce70304c3e2630f67386650bfe1959f..6f53fd37a95c5b9a89c7cfc0bbd2f343c7a804c0 100644
--- a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
@@ -34,7 +34,7 @@ $langs = $GLOBALS['langs'];
$linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
echo '<br>';
-print_titre($langs->trans('RelatedCommercialProposals'));
+print load_fiche_titre($langs->trans('RelatedCommercialProposals'));
?>
<table class="noborder allwidth">
<tr class="liste_titre">
diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php
index f5f600ddd08dfd9ca7b0a18c8ce3fcc202ad226f..fba2fe9d1cdba79afac6e6b63334aed2d9be1959 100644
--- a/htdocs/comm/prospect/index.php
+++ b/htdocs/comm/prospect/index.php
@@ -44,7 +44,7 @@ $companystatic=new Societe($db);
llxHeader();
-print_fiche_titre($langs->trans("ProspectionArea"));
+print load_fiche_titre($langs->trans("ProspectionArea"));
//print '<table border="0" width="100%" class="notopnoleftnoright">';
//print '<tr><td valign="top" width="30%" class="notopnoleft">';
diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php
index 6d0d1dedb2a92ad9ba2a136513e408816bb6facb..ea9e1382d40651499281dbf4e708b7953818f945 100644
--- a/htdocs/comm/remise.php
+++ b/htdocs/comm/remise.php
@@ -124,7 +124,7 @@ if ($socid > 0)
print '</table>';
print '<br>';
- print_fiche_titre($langs->trans("NewRelativeDiscount"),'','');
+ print load_fiche_titre($langs->trans("NewRelativeDiscount"),'','');
print '<table class="border" width="100%">';
diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index 471232ef708ea4d1847cd87eaf7f7bdb64dec45d..957f109268abfa23135631e7ce63600e61d79c9d 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -264,7 +264,7 @@ if ($socid > 0)
print '</table>';
print '<br>';
- print_fiche_titre($langs->trans("NewGlobalDiscount"),'','');
+ print load_fiche_titre($langs->trans("NewGlobalDiscount"),'','');
print '<table class="border" width="100%">';
print '<tr><td width="38%">'.$langs->trans("AmountHT").'</td>';
print '<td><input type="text" size="5" name="amount_ht" value="'.$_POST["amount_ht"].'">';
@@ -317,7 +317,7 @@ if ($socid > 0)
$resql=$db->query($sql);
if ($resql)
{
- print_titre($langs->trans("DiscountStillRemaining"));
+ print load_fiche_titre($langs->trans("DiscountStillRemaining"));
print '<table width="100%" class="noborder">';
print '<tr class="liste_titre">';
print '<td width="120" align="left">'.$langs->trans("Date").'</td>'; // Need 120+ for format with AM/PM
@@ -457,7 +457,7 @@ if ($socid > 0)
if ($resql) $resql2=$db->query($sql2);
if ($resql2)
{
- print_titre($langs->trans("DiscountAlreadyCounted"));
+ print load_fiche_titre($langs->trans("DiscountAlreadyCounted"));
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td width="120" align="left">'.$langs->trans("Date").'</td>'; // Need 120+ for format with AM/PM
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 83b86ee5525accf3550ea3e17cf4302fe9869de5..d5f3427b77c79203b1f5f99e1b733a2e9bbdd056 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -36,6 +36,7 @@
require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/class/html.formorder.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formmargin.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/modules/commande/modules_commande.php';
require_once DOL_DOCUMENT_ROOT . '/commande/class/commande.class.php';
require_once DOL_DOCUMENT_ROOT . '/comm/action/class/actioncomm.class.php';
@@ -129,7 +130,7 @@ if (empty($reshook))
if ($object->id > 0)
{
// Because createFromClone modifies the object, we must clone it so that we can restore it later
- $orig = dol_clone($object);
+ $orig = clone $object;
$result=$object->createFromClone($socid);
if ($result > 0)
@@ -1222,6 +1223,7 @@ llxHeader('', $langs->trans('Order'), 'EN:Customers_Orders|FR:Commandes_Clients|
$form = new Form($db);
$formfile = new FormFile($db);
$formorder = new FormOrder($db);
+$formmargin = new FormMargin($db);
if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
/**
@@ -1233,7 +1235,7 @@ if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
*/
if ($action == 'create' && $user->rights->commande->creer)
{
- print_fiche_titre($langs->trans('CreateOrder'),'','title_commercial.png');
+ print load_fiche_titre($langs->trans('CreateOrder'),'','title_commercial.png');
$soc = new Societe($db);
if ($socid > 0)
@@ -1574,7 +1576,7 @@ if ($action == 'create' && $user->rights->commande->creer)
// Show origin lines
if (! empty($origin) && ! empty($originid) && is_object($objectsrc)) {
$title = $langs->trans('ProductsAndServices');
- print_titre($title);
+ print load_fiche_titre($title);
print '<table class="noborder" width="100%">';
@@ -2084,7 +2086,7 @@ if ($action == 'create' && $user->rights->commande->creer)
// Margin Infos
if (! empty($conf->margin->enabled)) {
print '<td valign="top" width="50%" colspan="2" rowspan="' . $rowspan . '">';
- $object->displayMarginInfos();
+ $formmargin->displayMarginInfos($object);
print '</td>';
} else
print '<td width="50%" colspan="2" rowspan="' . $rowspan . '"></td>';
@@ -2376,7 +2378,7 @@ if ($action == 'create' && $user->rights->commande->creer)
print '<div class="clearboth"></div>';
print '<br>';
- print_fiche_titre($langs->trans('SendOrderByMail'));
+ print load_fiche_titre($langs->trans('SendOrderByMail'));
dol_fiche_head('');
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 32fe2d52726a3f920da6778f9123a44a3ca0dc02..a50e18fe0d4cfef5fdf144035e9a4bc5e904d359 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -51,26 +51,15 @@ class Commande extends CommonOrder
*/
protected $table_ref_field = 'ref';
- var $id;
-
/**
* Client ID
* @var int
*/
var $socid;
- /**
- * Client (loaded by fetch_client)
- * @var Societe
- */
- var $client;
-
- var $ref;
var $ref_client;
- var $ref_ext;
var $ref_int;
var $contactid;
- var $fk_project;
/**
* Status of the order. Check the following constants:
@@ -86,16 +75,12 @@ class Commande extends CommonOrder
var $billed; // billed or not
var $brouillon;
- var $cond_reglement_id;
var $cond_reglement_code;
- var $fk_account;
- var $mode_reglement_id;
var $mode_reglement_code;
var $availability_id;
var $availability_code;
var $demand_reason_id;
var $demand_reason_code;
- var $fk_delivery_address;
var $address;
var $date; // Date commande
/**
@@ -104,31 +89,15 @@ class Commande extends CommonOrder
*/
var $date_commande;
var $date_livraison; // Date livraison souhaitee
- var $shipping_method_id;
var $fk_remise_except;
var $remise_percent;
- var $total_ht; // Total net of tax
- var $total_ttc; // Total with tax
- var $total_tva; // Total VAT
- var $total_localtax1; // Total Local tax 1
- var $total_localtax2; // Total Local tax 2
var $remise_absolue;
- var $modelpdf;
var $info_bits;
var $rang;
var $special_code;
var $source; // Origin of order
- /**
- * @deprecated
- * @see note_private, note_public
- */
- var $note;
- var $note_private;
- var $note_public;
var $extraparams=array();
- var $origin;
- var $origin_id;
var $linked_objects=array();
var $user_author_id;
@@ -138,11 +107,6 @@ class Commande extends CommonOrder
*/
var $lines = array();
- //Incorterms
- var $fk_incoterms;
- var $location_incoterms;
- var $libelle_incoterms; //Used into tooltip
-
// Pour board
var $nbtodo;
var $nbtodolate;
@@ -958,7 +922,7 @@ class Commande extends CommonOrder
$line->fetch_optionals($line->rowid);
// Load source object
- $objFrom = dol_clone($this);
+ $objFrom = clone $this;
// Change socid if needed
if (! empty($socid) && $socid != $this->socid)
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index 5baa7b7c30fcc696681feb31481f35097bcc994b..d6432a257baaf438019248819b21c56a1d604012 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -53,7 +53,7 @@ $help_url="EN:Module_Customers_Orders|FR:Module_Commandes_Clients|ES:Módulo_Ped
llxHeader("",$langs->trans("Orders"),$help_url);
-print_fiche_titre($langs->trans("OrdersArea"));
+print load_fiche_titre($langs->trans("OrdersArea"));
//print '<table width="100%" class="notopnoleftnoright">';
//print '<tr><td valign="top" width="30%" class="notopnoleft">';
diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php
index 2896a6e22c61835b6afd0f62b7100ef440666237..136ac6c1b894007ed94fbf127d60be4196841589 100644
--- a/htdocs/commande/orderstoinvoice.php
+++ b/htdocs/commande/orderstoinvoice.php
@@ -370,7 +370,7 @@ if ($action == 'create' && !$error)
$facturestatic=new Facture($db);
llxHeader();
- print_fiche_titre($langs->trans('NewBill'));
+ print load_fiche_titre($langs->trans('NewBill'));
$soc = new Societe($db);
if ($socid) $res=$soc->fetch($socid);
@@ -570,7 +570,7 @@ if (($action != 'create' && $action != 'add') || ($action == 'create' && $error)
$title = $langs->trans('ListOfOrders');
$title.=' - '.$langs->trans('StatusOrderValidated').', '.$langs->trans("StatusOrderSent").', '.$langs->trans('StatusOrderToBill');
$num = $db->num_rows($resql);
- print_fiche_titre($title);
+ print load_fiche_titre($title);
$i = 0;
$period=$html->select_date($date_start,'date_start',0,0,1,'',1,0,1).' - '.$html->select_date($date_end,'date_end',0,0,1,'',1,0,1);
$periodely=$html->select_date($date_starty,'date_start_dely',0,0,1,'',1,0,1).' - '.$html->select_date($date_endy,'date_end_dely',0,0,1,'',1,0,1);
diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
index ea781a4828fc1ac41636f575b58675466b4aada4..c4d48d8f72e05a407446e1dbb0529a3bc4833b59 100644
--- a/htdocs/commande/stats/index.php
+++ b/htdocs/commande/stats/index.php
@@ -77,7 +77,7 @@ if ($mode == 'supplier')
$dir=$conf->fournisseur->dir_output.'/commande/temp';
}
-print_fiche_titre($title,'','title_commercial.png');
+print load_fiche_titre($title,'','title_commercial.png');
dol_mkdir($dir);
diff --git a/htdocs/commande/tpl/linkedobjectblock.tpl.php b/htdocs/commande/tpl/linkedobjectblock.tpl.php
index a661013802dc7a6afbe160ba9246ee78a46eb2e0..bf399c250d9d6188494c0ce6c6ff52eac51696e2 100644
--- a/htdocs/commande/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/commande/tpl/linkedobjectblock.tpl.php
@@ -30,7 +30,7 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
$langs->load("orders");
echo '<br>';
-print_titre($langs->trans('RelatedCustomerOrders'));
+print load_fiche_titre($langs->trans('RelatedCustomerOrders'));
?>
<table class="noborder allwidth">
diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php
index 10e9674ec8de251bb5a70bebbba609816f549d29..deed3b1b97ad57230f296af051cbbf9290722bf4 100644
--- a/htdocs/compta/bank/account.php
+++ b/htdocs/compta/bank/account.php
@@ -469,7 +469,7 @@ if ($id > 0 || ! empty($ref))
// Form to add a transaction with no invoice
if ($user->rights->banque->modifier && $action == 'addline')
{
- print_fiche_titre($langs->trans("AddBankRecordLong"),'','');
+ print load_fiche_titre($langs->trans("AddBankRecordLong"),'','');
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
diff --git a/htdocs/compta/bank/bilan.php b/htdocs/compta/bank/bilan.php
index edfc84c23cc6f33aa0172f89b872f2f6c2c66a31..7e44778b9bdb4bb3282bc9935aaeb50eead3a9a0 100644
--- a/htdocs/compta/bank/bilan.php
+++ b/htdocs/compta/bank/bilan.php
@@ -58,7 +58,7 @@ function valeur($sql)
llxHeader();
-print_titre("Bilan");
+print load_fiche_titre("Bilan");
print '<br>';
print '<table class="noborder" width="100%" cellspacing="0" cellpadding="2">';
diff --git a/htdocs/compta/bank/budget.php b/htdocs/compta/bank/budget.php
index f22ce342bf02cdecce8bca4b0b3c7a5435598220..c35dec41e7d7fffe53d88debc4cfe58e1cf00ad0 100644
--- a/htdocs/compta/bank/budget.php
+++ b/htdocs/compta/bank/budget.php
@@ -44,7 +44,7 @@ $companystatic=new Societe($db);
llxHeader();
// List movements bu category for bank transactions
-print_fiche_titre($langs->trans("BankTransactionByCategories"), '', 'title_bank.png');
+print load_fiche_titre($langs->trans("BankTransactionByCategories"), '', 'title_bank.png');
print '<table class="noborder" width="100%">';
print "<tr class=\"liste_titre\">";
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index c6c34d871296602aa0b6c9c91aa004f1865d3f58..063fee8ca786cd36ac89272f90eb5327ff8c643b 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -243,7 +243,7 @@ if ($action == 'create')
{
$account=new Account($db);
- print_fiche_titre($langs->trans("NewFinancialAccount"), '', 'title_bank.png');
+ print load_fiche_titre($langs->trans("NewFinancialAccount"), '', 'title_bank.png');
if ($conf->use_javascript_ajax)
{
@@ -777,7 +777,7 @@ else
$account = new Account($db);
$account->fetch(GETPOST('id','int'));
- print_fiche_titre($langs->trans("EditFinancialAccount"), '', 'title_bank.png');
+ print load_fiche_titre($langs->trans("EditFinancialAccount"), '', 'title_bank.png');
if ($conf->use_javascript_ajax)
{
diff --git a/htdocs/compta/bank/categ.php b/htdocs/compta/bank/categ.php
index 00755959ab924131540be11a01f07f44eb01a818..1d9da7f9f59a018715254206743e8628c17033d9 100644
--- a/htdocs/compta/bank/categ.php
+++ b/htdocs/compta/bank/categ.php
@@ -108,7 +108,7 @@ if ($action == 'delete')
llxHeader();
-print_fiche_titre($langs->trans("Rubriques"), '', 'title_bank.png');
+print load_fiche_titre($langs->trans("Rubriques"), '', 'title_bank.png');
print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 8c5a2a727b24192e25a953be3a010f7e167294bd..e8978310ca3676e814e59c7db52d0ae2f5273b9e 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -44,9 +44,7 @@ class Account extends CommonObject
* @see id
*/
var $rowid;
- var $id;
- var $ref;
var $label;
//! 1=Compte courant/check/carte, 2=Compte liquide, 0=Compte épargne
var $courant;
@@ -75,10 +73,6 @@ class Account extends CommonObject
var $state_code;
var $state;
- var $country_id;
- var $country_code;
- var $country;
-
var $type_lib=array();
var $account_number;
diff --git a/htdocs/compta/bank/document.php b/htdocs/compta/bank/document.php
index 0b588fa64d02596595d29d5975ad02dec95f14ec..2290edd8cc51caea1abb0a1902abf580f40931a0 100644
--- a/htdocs/compta/bank/document.php
+++ b/htdocs/compta/bank/document.php
@@ -200,7 +200,7 @@ if ($id > 0 || !empty($ref)) {
* Confirmation suppression fichier
*/
if ($action == 'delete') {
- $ret = $form->form_confirm($_SERVER["PHP_SELF"] . '?id=' . $object->id . '&urlfile=' . urlencode($_GET["urlfile"]),
+ $ret = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id . '&urlfile=' . urlencode($_GET["urlfile"]),
$langs->trans('DeleteFile'),
$langs->trans('ConfirmDeleteFile'), 'confirm_deletefile',
'', 0, 1);
diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php
index ac175b5b7d7d6f0285c0d4596f150d334a9f9cf0..46b382ed0805f4529d3f43d7207ddb3b41518d49 100644
--- a/htdocs/compta/bank/index.php
+++ b/htdocs/compta/bank/index.php
@@ -51,7 +51,7 @@ llxHeader('',$langs->trans('AccountsArea'),$help_url);
$link='';
if ($statut == '') $link='<a href="'.$_SERVER["PHP_SELF"].'?statut=all">'.$langs->trans("IncludeClosedAccount").'</a>';
if ($statut == 'all') $link='<a href="'.$_SERVER["PHP_SELF"].'">'.$langs->trans("OnlyOpenedAccount").'</a>';
-print_fiche_titre($langs->trans("AccountsArea"),$link, 'title_bank.png');
+print load_fiche_titre($langs->trans("AccountsArea"),$link, 'title_bank.png');
// On charge tableau des comptes financiers (ouverts par defaut)
diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php
index 4186dae55616a59d5fd44976c89fafadd84ffd37..45a87fea87c621317af7671858b1bb8cdd54cbbc 100644
--- a/htdocs/compta/bank/ligne.php
+++ b/htdocs/compta/bank/ligne.php
@@ -553,7 +553,7 @@ if ($result)
if ($acct->canBeConciliated() > 0) // Si compte rapprochable
{
print '<br>'."\n";
- print_fiche_titre($langs->trans("Reconciliation"), '', 'title_bank.png');
+ print load_fiche_titre($langs->trans("Reconciliation"), '', 'title_bank.png');
print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'?rowid='.$objp->rowid.'">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="setreconcile">';
diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php
index 8468bfbd5fb72558aafe0b5535816890b8bbdc0f..aa9f043b2d514f40995cc25bd799137473eaa5a3 100644
--- a/htdocs/compta/bank/rappro.php
+++ b/htdocs/compta/bank/rappro.php
@@ -182,7 +182,7 @@ if ($resql)
$var=True;
$num = $db->num_rows($resql);
- print_fiche_titre($langs->trans("Reconciliation").': <a href="account.php?account='.$acct->id.'">'.$acct->label.'</a>', '', 'title_bank.png');
+ print load_fiche_titre($langs->trans("Reconciliation").': <a href="account.php?account='.$acct->id.'">'.$acct->label.'</a>', '', 'title_bank.png');
print '<br>';
// Show last bank receipts
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 73fd8df531a862dabbd4225fe3fae252d6b34d35..9620b00098b738a19affd878916f9e981d84c7ef 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -285,7 +285,7 @@ else
$mesprevnext ="<a href=\"releve.php?rel=prev&num=$num&ve=$ve&account=$object->id\">".img_previous()."</a> ";
$mesprevnext.= $langs->trans("AccountStatement")." $num";
$mesprevnext.=" <a href=\"releve.php?rel=next&num=$num&ve=$ve&account=$object->id\">".img_next()."</a>";
- print_fiche_titre($langs->trans("AccountStatement").' '.$num.', '.$langs->trans("BankAccount").' : '.$object->getNomUrl(0),$mesprevnext, 'title_bank.png');
+ print load_fiche_titre($langs->trans("AccountStatement").' '.$num.', '.$langs->trans("BankAccount").' : '.$object->getNomUrl(0),$mesprevnext, 'title_bank.png');
print '<br>';
print "<form method=\"post\" action=\"releve.php\">";
diff --git a/htdocs/compta/bank/virement.php b/htdocs/compta/bank/virement.php
index d81390a0205ac722ca1c9b1cb200ea87576d8ac2..3a64d0cc3d10713448476b561a98938658e98171 100644
--- a/htdocs/compta/bank/virement.php
+++ b/htdocs/compta/bank/virement.php
@@ -152,7 +152,7 @@ if($error)
$amount = GETPOST('amount','int');
}
-print_fiche_titre($langs->trans("BankTransfer"), '', 'title_bank.png');
+print load_fiche_titre($langs->trans("BankTransfer"), '', 'title_bank.png');
print $langs->trans("TransferDesc");
print "<br><br>";
diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index 45b10f2363cf54b74f5c274532366f0aabbb998b..69b95d16e034524e4156b6138181f0f27fea631c 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -75,7 +75,7 @@ if (GETPOST("mode") == 'sconly') $param='&mode=sconly';
if ($sortfield) $param.='&sortfield='.$sortfield;
if ($sortorder) $param.='&sortorder='.$sortorder;
-print_fiche_titre($title, ($year?"<a href='index.php?year=".($year-1).$param."'>".img_previous()."</a> ".$langs->trans("Year")." $year <a href='index.php?year=".($year+1).$param."'>".img_next()."</a>":""), 'title_accountancy.png');
+print load_fiche_titre($title, ($year?"<a href='index.php?year=".($year-1).$param."'>".img_previous()."</a> ".$langs->trans("Year")." $year <a href='index.php?year=".($year+1).$param."'>".img_next()."</a>":""), 'title_accountancy.png');
if ($year) $param.='&year='.$year;
@@ -92,7 +92,7 @@ if ($conf->salaries->enabled)
{
$sal = new PaymentSalary($db);
- print_fiche_titre($langs->trans("SalariesPayments").($year?' ('.$langs->trans("Year").' '.$year.')':''), '', '');
+ print load_fiche_titre($langs->trans("SalariesPayments").($year?' ('.$langs->trans("Year").' '.$year.')':''), '', '');
$sql = "SELECT s.rowid, s.amount, s.label, s.datep as datep, s.datev as datev, s.datesp, s.dateep, s.salary, u.salary as current_salary";
$sql.= " FROM ".MAIN_DB_PREFIX."payment_salary as s, ".MAIN_DB_PREFIX."user as u";
@@ -172,7 +172,7 @@ if ($conf->tax->enabled)
// Social contributions only
if (GETPOST("mode") != 'sconly')
{
- print_fiche_titre($langs->trans("SocialContributionsPayments").($year?' ('.$langs->trans("Year").' '.$year.')':''), '', '');
+ print load_fiche_titre($langs->trans("SocialContributionsPayments").($year?' ('.$langs->trans("Year").' '.$year.')':''), '', '');
}
print '<table class="noborder" width="100%">';
@@ -286,7 +286,7 @@ if ($conf->tax->enabled)
$tva = new Tva($db);
- print_fiche_titre($langs->trans("VATPayments").($year?' ('.$langs->trans("Year").' '.$year.')':''), '', '');
+ print load_fiche_titre($langs->trans("VATPayments").($year?' ('.$langs->trans("Year").' '.$year.')':''), '', '');
$sql = "SELECT pv.rowid, pv.amount, pv.label, pv.datev as dm";
$sql.= " FROM ".MAIN_DB_PREFIX."tva as pv";
@@ -386,7 +386,7 @@ while($j<$numlt)
$tva = new Tva($db);
- print_fiche_titre($langs->transcountry(($j==1?"LT1Payments":"LT2Payments"),$mysoc->country_code).($year?' ('.$langs->trans("Year").' '.$year.')':''), '', '');
+ print load_fiche_titre($langs->transcountry(($j==1?"LT1Payments":"LT2Payments"),$mysoc->country_code).($year?' ('.$langs->trans("Year").' '.$year.')':''), '', '');
$sql = "SELECT pv.rowid, pv.amount, pv.label, pv.datev as dm, pv.datep as dp";
diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php
index 083aeb489860676eab3c52d98f90558c4539c396..d4858d5ab29358625856786ef9d38697068c9c7f 100644
--- a/htdocs/compta/deplacement/card.php
+++ b/htdocs/compta/deplacement/card.php
@@ -240,7 +240,7 @@ if ($action == 'create')
//WYSIWYG Editor
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
- print_fiche_titre($langs->trans("NewTrip"));
+ print load_fiche_titre($langs->trans("NewTrip"));
$datec = dol_mktime(12, 0, 0, GETPOST('remonth','int'), GETPOST('reday','int'), GETPOST('reyear','int'));
diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php
index f09875456c2d10c45b0f4fd5136dfdf32fc6eb88..4b2dce9f14e670ae82c72faeca8a5c9674ae5b68 100644
--- a/htdocs/compta/deplacement/class/deplacement.class.php
+++ b/htdocs/compta/deplacement/class/deplacement.class.php
@@ -37,23 +37,13 @@ class Deplacement extends CommonObject
public $fk_element = '';
protected $ismultientitymanaged = 0; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
- var $id;
-
var $datec; // Creation date
var $dated;
var $fk_user_author;
var $fk_user;
var $km;
- /**
- * @deprecated
- * @see note_private, note_public
- */
- var $note; // TODO deprecated
- var $note_private;
- var $note_public;
var $socid;
var $statut; // 0=draft, 1=validated
- var $fk_project;
var $extraparams=array();
var $statuts=array();
diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php
index b8920bb45a407b28aee7f69cdbe0c380a96680c9..0d9d63e8bb2995d7187a9c3a7a707a63a88e5396 100644
--- a/htdocs/compta/deplacement/index.php
+++ b/htdocs/compta/deplacement/index.php
@@ -91,7 +91,7 @@ if ($result)
}
-print_fiche_titre($langs->trans("ExpensesArea"));
+print load_fiche_titre($langs->trans("ExpensesArea"));
print '<div class="fichecenter"><div class="fichethirdleft">';
diff --git a/htdocs/compta/deplacement/stats/index.php b/htdocs/compta/deplacement/stats/index.php
index 0d0a32a877c7b30b3b3e1e301103287a90fd4f39..1d9f7b70201219110b5986fb06f36f4c4e9cf0a3 100644
--- a/htdocs/compta/deplacement/stats/index.php
+++ b/htdocs/compta/deplacement/stats/index.php
@@ -78,7 +78,7 @@ llxHeader();
$title=$langs->trans("TripsAndExpensesStatistics");
$dir=$conf->deplacement->dir_temp;
-print_fiche_titre($title, $mesg);
+print load_fiche_titre($title, $mesg);
dol_mkdir($dir);
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 6b0af5f70432a94a92a22aa82e1f2d336e5b1530..e23f1f9414a96447975e60be3429ffb3bebad621 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -42,6 +42,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/modules/facture/modules_facture.php';
require_once DOL_DOCUMENT_ROOT . '/core/class/discount.class.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 . '/core/class/html.formmargin.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/lib/invoice.lib.php';
require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
@@ -1800,6 +1801,7 @@ if (empty($reshook))
$form = new Form($db);
$formother = new FormOther($db);
$formfile = new FormFile($db);
+$formmargin = new FormMargin($this->db);
$bankaccountstatic = new Account($db);
if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
@@ -1822,7 +1824,7 @@ if ($action == 'create')
$facturestatic = new Facture($db);
$extralabels = $extrafields->fetch_name_optionals_label($facturestatic->table_element);
- print_fiche_titre($langs->trans('NewBill'));
+ print load_fiche_titre($langs->trans('NewBill'));
$soc = new Societe($db);
if ($socid > 0)
@@ -2435,7 +2437,7 @@ if ($action == 'create')
print '<br>';
$title = $langs->trans('ProductsAndServices');
- print_titre($title);
+ print load_fiche_titre($title);
print '<table class="noborder" width="100%">';
@@ -3166,7 +3168,7 @@ else if ($id > 0 || ! empty($ref))
if (! empty($conf->margin->enabled))
{
print '<br>';
- $object->displayMarginInfos($object->statut > 0);
+ $formmargin->displayMarginInfos($object, $object->statut > 0);
}
print '</td></tr>';
@@ -3804,7 +3806,7 @@ else if ($id > 0 || ! empty($ref))
print '<div class="clearboth"></div>';
print '<br>';
- print_fiche_titre($langs->trans($titreform));
+ print load_fiche_titre($langs->trans($titreform));
// Cree l'objet formulaire mail
dol_fiche_head();
diff --git a/htdocs/compta/facture/admin/facture_cust_extrafields.php b/htdocs/compta/facture/admin/facture_cust_extrafields.php
index 58d4e46f8dd6d5dc5c991c4f1c091acf15db98b4..fa2c3ba3a1e23b19af839292a3b9c7ddb70dd602 100644
--- a/htdocs/compta/facture/admin/facture_cust_extrafields.php
+++ b/htdocs/compta/facture/admin/facture_cust_extrafields.php
@@ -65,7 +65,7 @@ $textobject=strtolower($langs->transnoentitiesnoconv("BillsCustomers"));
llxHeader('',$langs->trans("BillsSetup"));
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("BillsSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("BillsSetup"),$linkback,'title_setup');
print '<br>';
$head = invoice_admin_prepare_head();
@@ -95,7 +95,7 @@ if ($action != 'create' && $action != 'edit')
if ($action == 'create')
{
print "<br>";
- print_titre($langs->trans('NewAttribute'));
+ print load_fiche_titre($langs->trans('NewAttribute'));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
}
@@ -110,7 +110,7 @@ if ($action == 'edit' && ! empty($attrname))
$langs->load("members");
print "<br>";
- print_titre($langs->trans("FieldEdition", $attrname));
+ print load_fiche_titre($langs->trans("FieldEdition", $attrname));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
}
diff --git a/htdocs/compta/facture/admin/facturedet_cust_extrafields.php b/htdocs/compta/facture/admin/facturedet_cust_extrafields.php
index e69060aa3cf51684139c801e0695a92aa87adec1..50749f89ab16b3ee8e831cd62e8fa54de99760be 100644
--- a/htdocs/compta/facture/admin/facturedet_cust_extrafields.php
+++ b/htdocs/compta/facture/admin/facturedet_cust_extrafields.php
@@ -66,7 +66,7 @@ $textobject=strtolower($langs->transnoentitiesnoconv("BillsCustomers"));
llxHeader('',$langs->trans("BillsSetup"));
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("BillsSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("BillsSetup"),$linkback,'title_setup');
print '<br>';
$head = invoice_admin_prepare_head();
@@ -96,7 +96,7 @@ if ($action != 'create' && $action != 'edit')
if ($action == 'create')
{
print "<br>";
- print_titre($langs->trans('NewAttribute'));
+ print load_fiche_titre($langs->trans('NewAttribute'));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
}
@@ -109,7 +109,7 @@ if ($action == 'create')
if ($action == 'edit' && ! empty($attrname))
{
print "<br>";
- print_titre($langs->trans("FieldEdition", $attrname));
+ print load_fiche_titre($langs->trans("FieldEdition", $attrname));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
}
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 7d0de20ce0bf52feef041bc27c2e334ccf414bb3..204092b257a6674ac43be7692d6ebfa5d6d94406 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -42,35 +42,20 @@ class FactureRec extends Facture
public $table_element_line='facturedet_rec';
public $fk_element='fk_facture';
- var $id;
-
- //! Id customer
- var $socid;
- //! Customer object (charging by fetch_client)
- var $client;
-
var $number;
- var $author;
var $date;
- var $ref;
var $amount;
var $remise;
var $tva;
var $total;
- var $note_private;
- var $note_public;
var $db_table;
var $propalid;
- var $fk_project;
var $rang;
var $special_code;
var $usenewprice=0;
- var $lines=array();
-
-
/**
* Constructor
*
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 3d1558118c1e5d5bf6f1ada1c5d676867fd31661..d9e0e198456f75fa26654b9a470c96d9a9ed87ae 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -58,27 +58,15 @@ class Facture extends CommonInvoice
*/
protected $table_ref_field = 'facnumber';
- var $id;
- //! Id client
var $socid;
- //! Objet societe client (to load with fetch_client method)
- /**
- * Customer
- * @var Societe
- */
- var $client;
var $author;
var $fk_user_author;
var $fk_user_valid;
- //! Invoice date
- var $date; // Invoice date
var $date_creation; // Creation date
var $date_validation; // Validation date
var $datem;
- var $ref;
var $ref_client;
- var $ref_ext;
var $ref_int;
//Check constants for types
var $type = self::TYPE_STANDARD;
@@ -90,20 +78,7 @@ class Facture extends CommonInvoice
var $total_tva=0;
var $total_ttc=0;
var $revenuestamp;
- /**
- * @deprecated
- * @see note_private, note_public
- */
- var $note;
- var $note_private;
- var $note_public;
- /**
- * Invoice status
- * @var int
- * @see Facture::STATUS_DRAFT, Facture::STATUS_VALIDATED, Facture::STATUS_PAID, Facture::STATUS_ABANDONED
- */
- var $statut;
//! Fermeture apres paiement partiel: discount_vat, badcustomer, abandon
//! Fermeture alors que aucun paiement: replaced (si remplace), abandon
var $close_code;
@@ -113,18 +88,11 @@ class Facture extends CommonInvoice
var $paye;
//! id of source invoice if replacement invoice or credit note
var $fk_facture_source;
- var $origin;
- var $origin_id;
var $linked_objects=array();
- var $fk_project;
var $date_lim_reglement;
- var $cond_reglement_id; // Id in llx_c_paiement
var $cond_reglement_code; // Code in llx_c_paiement
- var $mode_reglement_id; // Id in llx_c_paiement
var $mode_reglement_code; // Code in llx_c_paiement
- var $fk_account; // Id of bank account
var $fk_bank; // Field to store bank id to use when payment mode is withdraw
- var $modelpdf;
/**
* @deprecated
*/
@@ -139,11 +107,6 @@ class Facture extends CommonInvoice
var $fac_rec;
- //Incoterms
- var $fk_incoterms;
- var $location_incoterms;
- var $libelle_incoterms; //Used into tooltip
-
/**
* @var int Situation cycle reference number
*/
@@ -159,64 +122,6 @@ class Facture extends CommonInvoice
*/
public $situation_final;
- /**
- * Standard invoice
- */
- const TYPE_STANDARD = 0;
-
- /**
- * Replacement invoice
- */
- const TYPE_REPLACEMENT = 1;
-
- /**
- * Credit note invoice
- */
- const TYPE_CREDIT_NOTE = 2;
-
- /**
- * Deposit invoice
- */
- const TYPE_DEPOSIT = 3;
-
- /**
- * Proforma invoice
- */
- const TYPE_PROFORMA = 4;
-
- /**
- * Situation invoice
- */
- const TYPE_SITUATION = 5;
-
- /**
- * Draft
- */
- const STATUS_DRAFT = 0;
-
- /**
- * Validated (need to be paid)
- */
- const STATUS_VALIDATED = 1;
-
- /**
- * Classified paid.
- * If paid partially, $this->close_code can be:
- * - CLOSECODE_DISCOUNTVAT
- * - CLOSECODE_BADDEBT
- * If paid completelly, this->close_code will be null
- */
- const STATUS_CLOSED = 2;
-
- /**
- * Classified abandoned and no payment done.
- * $this->close_code can be:
- * - CLOSECODE_BADDEBT
- * - CLOSECODE_ABANDONED
- * - CLOSECODE_REPLACED
- */
- const STATUS_ABANDONED = 3;
-
const CLOSECODE_DISCOUNTVAT = 'discount_vat';
const CLOSECODE_BADDEBT = 'badcustomer';
const CLOSECODE_ABANDONED = 'abandon';
@@ -701,7 +606,7 @@ class Facture extends CommonInvoice
$line->fetch_optionals($line->rowid);
// Load source object
- $objFrom = dol_clone($this);
+ $objFrom = clone $this;
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 460c0bffcab69a7c276a8d3ccaad384ca34e890b..f01c288e29edfc49712b4324fdef0a51aad3bca2 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -118,7 +118,7 @@ $companystatic = new Societe($db);
*/
if ($action == 'create')
{
- print_fiche_titre($langs->trans("CreateRepeatableInvoice"),'','title_accountancy.png');
+ print load_fiche_titre($langs->trans("CreateRepeatableInvoice"),'','title_accountancy.png');
$object = new Facture($db); // Source invoice
$product_static = new Product($db);
@@ -191,7 +191,7 @@ if ($action == 'create')
else if (empty($conf->product->enabled))
$title = $langs->trans("Services");
- print_titre($title);
+ print load_fiche_titre($title);
/*
* Invoice lines
@@ -456,7 +456,7 @@ else
else if (empty($conf->product->enabled))
$title = $langs->trans("Services");
- print_titre($title);
+ print load_fiche_titre($title);
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 6a1e7894701ab91f1f18b31748c384451242207e..11931de6a7eaef5f74e5208befb4208956fa4eb6 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -191,7 +191,7 @@ if ($search_refcustomer) $sql .= natural_search('f.ref_client', $search_refcusto
if ($search_societe) $sql .= natural_search('s.nom', $search_societe);
if ($search_montant_ht != '') $sql.= natural_search('f.total', $search_montant_ht, 1);
if ($search_montant_ttc != '') $sql.= natural_search('f.total_ttc', $search_montant_ttc, 1);
-if ($search_status != '') $sql.= " AND f.fk_statut = '".$db->escape($search_status)."'";
+if ($search_status >= 0 ) $sql.= " AND f.fk_statut = ".$db->escape($search_status);
if ($month > 0)
{
if ($year > 0 && empty($day))
diff --git a/htdocs/compta/facture/mergepdftool.php b/htdocs/compta/facture/mergepdftool.php
index 498d6051f97571c1a105beeb5f271c44d306f709..72276b7706926717f7521a9a4803954c6f84be8a 100644
--- a/htdocs/compta/facture/mergepdftool.php
+++ b/htdocs/compta/facture/mergepdftool.php
@@ -544,7 +544,7 @@ if ($resql)
$param.=(! empty($option)?"&option=".$option:"");
- print_fiche_titre($titre,$link);
+ print load_fiche_titre($titre,$link);
//print_barre_liste($titre,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',0); // We don't want pagination on this page
print '<form id="form_unpaid" method="POST" action="'.$_SERVER["PHP_SELF"].'?sortfield='. $sortfield .'&sortorder='. $sortorder .'">';
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index f86fb1d975b866a9c3530ade507879ed7b2fa779..f61e92687f6816fb4c988d6068a42f5af25febaa 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -75,7 +75,7 @@ if ($mode == 'supplier')
$dir=$conf->fournisseur->dir_output.'/facture/temp';
}
-print_fiche_titre($title, $mesg, 'title_accountancy.png');
+print load_fiche_titre($title, $mesg, 'title_accountancy.png');
dol_mkdir($dir);
diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
index b295e72f19e178909f2e2c1d5c2fa418fd3fc37b..b0c28efe4c03398c58e14d09874e854914de4d86 100644
--- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
@@ -30,7 +30,7 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
$langs->load("bills");
echo '<br>';
-print_titre($langs->trans("RelatedCustomerInvoices"));
+print load_fiche_titre($langs->trans("RelatedCustomerInvoices"));
?>
<table class="noborder allwidth">
<tr class="liste_titre">
diff --git a/htdocs/compta/hrm.php b/htdocs/compta/hrm.php
index 4e931ef2b9d098e189f0b9e267626f5d1109de52..12b410e29af60b51ee06263c4416cd28922fcc80 100644
--- a/htdocs/compta/hrm.php
+++ b/htdocs/compta/hrm.php
@@ -67,7 +67,7 @@ $childids[]=$user->id;
llxHeader(array(),$langs->trans('HRMArea'));
-print_fiche_titre($langs->trans("HRMArea"),'', 'title_hrm.png');
+print load_fiche_titre($langs->trans("HRMArea"),'', 'title_hrm.png');
print '<div class="fichecenter"><div class="fichethirdleft">';
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 5b0e8ec288dcfd4e9a669216b9565be53f450d22..cf5d6c990aa27c422f6cbf82b95454e5c6790ca7 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -81,7 +81,7 @@ $thirdpartystatic = new Societe($db);
llxHeader("",$langs->trans("AccountancyTreasuryArea"));
-print_fiche_titre($langs->trans("AccountancyTreasuryArea"),'','title_accountancy.png');
+print load_fiche_titre($langs->trans("AccountancyTreasuryArea"),'','title_accountancy.png');
print '<div class="fichecenter"><div class="fichethirdleft">';
diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php
index 308bcac6dc92800aa81898c6157204126f097814..579d80ea91932c5cf24ffb3cf6f559a8db0e96d3 100644
--- a/htdocs/compta/localtax/card.php
+++ b/htdocs/compta/localtax/card.php
@@ -154,7 +154,7 @@ if ($_GET["action"] == 'create')
print '<input type="hidden" name="localTaxType" value="'.$lttype.'">';
print '<input type="hidden" name="action" value="add">';
- print_fiche_titre($langs->transcountry($lttype==2?"newLT2Payment":"newLT1Payment",$mysoc->country_code));
+ print load_fiche_titre($langs->transcountry($lttype==2?"newLT2Payment":"newLT1Payment",$mysoc->country_code));
if ($mesg) print $mesg;
diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php
index 0446111727192d4b45b6c312febb85217442632c..067c8dc9cbe5562f129a6658437974138d3d541a 100644
--- a/htdocs/compta/localtax/class/localtax.class.php
+++ b/htdocs/compta/localtax/class/localtax.class.php
@@ -29,15 +29,12 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
*/
class Localtax extends CommonObject
{
- var $id;
- var $ref;
var $ltt;
var $tms;
var $datep;
var $datev;
var $amount;
var $label;
- var $note;
var $fk_bank;
var $fk_user_creat;
var $fk_user_modif;
diff --git a/htdocs/compta/localtax/index.php b/htdocs/compta/localtax/index.php
index 1e8570d7378b06bd7c82093df774146be763c18b..c3512fdcc1e7410b39d781255dfc1d70c682f23f 100644
--- a/htdocs/compta/localtax/index.php
+++ b/htdocs/compta/localtax/index.php
@@ -122,7 +122,7 @@ if($localTaxType==1) {
$textprevyear="<a href=\"index.php?localTaxType=".$localTaxType."&year=" . ($year_current-1) . "\">".img_previous()."</a>";
$textnextyear=" <a href=\"index.php?localTaxType=".$localTaxType."&year=" . ($year_current+1) . "\">".img_next()."</a>";
-print_fiche_titre($langs->transcountry($LT,$mysoc->country_code),"$textprevyear ".$langs->trans("Year")." $year_start $textnextyear");
+print load_fiche_titre($langs->transcountry($LT,$mysoc->country_code),"$textprevyear ".$langs->trans("Year")." $year_start $textnextyear");
print $langs->trans("LTReportBuildWithOptionDefinedInModule").'<br>';
print '('.$langs->trans("TaxModuleSetupToModifyRulesLT",DOL_URL_ROOT.'/admin/company.php').')<br>';
@@ -130,10 +130,10 @@ print '<br>';
print '<table width="100%" class="nobordernopadding">';
print '<tr><td>';
-print_titre($langs->transcountry($LTSummary,$mysoc->country_code));
+print load_fiche_titre($langs->transcountry($LTSummary,$mysoc->country_code));
print '</td><td width="5"> </td><td>';
-print_titre($langs->transcountry($LTPaid,$mysoc->country_code));
+print load_fiche_titre($langs->transcountry($LTPaid,$mysoc->country_code));
print '</td></tr>';
print '<tr><td width="50%" valign="top">';
diff --git a/htdocs/compta/localtax/quadri_detail.php b/htdocs/compta/localtax/quadri_detail.php
index 7396c6251658863a18eb5f4be4715c51e6a21b1c..0e88980796b385c7b04bd7818c0abba965488f45 100644
--- a/htdocs/compta/localtax/quadri_detail.php
+++ b/htdocs/compta/localtax/quadri_detail.php
@@ -116,7 +116,7 @@ $product_static=new Product($db);
$payment_static=new Paiement($db);
$paymentfourn_static=new PaiementFourn($db);
-//print_fiche_titre($langs->trans("VAT"),"");
+//print load_fiche_titre($langs->trans("VAT"),"");
//$fsearch.='<br>';
$fsearch.=' <input type="hidden" name="year" value="'.$year.'">';
diff --git a/htdocs/compta/localtax/reglement.php b/htdocs/compta/localtax/reglement.php
index 6d8c1bc7a9cf461a2f0c13e66c80ae96c26fc162..bfe0cb828c0efb887f421071890dc79d71c0c19d 100644
--- a/htdocs/compta/localtax/reglement.php
+++ b/htdocs/compta/localtax/reglement.php
@@ -41,7 +41,7 @@ llxHeader();
$localtax_static = new Localtax($db);
-print_fiche_titre($langs->transcountry($ltt==2?"LT2Payments":"LT1Payments",$mysoc->country_code));
+print load_fiche_titre($langs->transcountry($ltt==2?"LT2Payments":"LT1Payments",$mysoc->country_code));
$sql = "SELECT rowid, amount, label, f.datev as dm";
$sql.= " FROM ".MAIN_DB_PREFIX."localtax as f ";
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index aaebcf697f33b1065aa0d047196da36488fee4a8..5534468da3588fa5759e90407853a2eaba358fb9 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -277,7 +277,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
$title='';
if ($facture->type != 2) $title.=$langs->trans("EnterPaymentReceivedFromCustomer");
if ($facture->type == 2) $title.=$langs->trans("EnterPaymentDueToCustomer");
- print_fiche_titre($title);
+ print load_fiche_titre($title);
// Initialize data for confirmation (this is used because data can be change during confirmation)
if ($action == 'add_paiement')
@@ -658,7 +658,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
$text.='<br>'.$langs->trans("AllCompletelyPayedInvoiceWillBeClosed");
print '<input type="hidden" name="closepaidinvoices" value="'.GETPOST('closepaidinvoices').'">';
}
- $form->form_confirm($_SERVER['PHP_SELF'].'?facid='.$facture->id.'&socid='.$facture->socid.'&type='.$facture->type,$langs->trans('ReceivedCustomersPayments'),$text,'confirm_paiement',$formquestion,$preselectedchoice);
+ $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$facture->id.'&socid='.$facture->socid.'&type='.$facture->type,$langs->trans('ReceivedCustomersPayments'),$text,'confirm_paiement',$formquestion,$preselectedchoice);
}
print "</form>\n";
diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php
index 0b7b3ed0c5779f7ffd537df3ab454ddbf063eae8..bf6ed4f807a831ca1f20383ab48d50259a893e5f 100644
--- a/htdocs/compta/paiement/cheque/card.php
+++ b/htdocs/compta/paiement/cheque/card.php
@@ -312,7 +312,7 @@ if ($action == 'new')
$hselected = $h;
$h++;
- print_fiche_titre($langs->trans("Cheques"));
+ print load_fiche_titre($langs->trans("Cheques"));
}
else
{
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index a95a7ce8756c33ba5d27790eedd8a8bdc80c4254..e70993bcaedbe80e773edadce9a8a2882f124465 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -36,14 +36,11 @@ class RemiseCheque extends CommonObject
public $element='chequereceipt';
public $table_element='bordereau_cheque';
- var $id;
var $num;
var $intitule;
- var $ref_ext;
//! Numero d'erreur Plage 1024-1279
var $errno;
- public $statut;
public $amount;
public $date_bordereau;
public $account_id;
diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php
index 362493b7f193585e2637d5e609af907e656a8ba1..ebe9f6e8461c4dc86c9d4c4827413a4c3a1d2e46 100644
--- a/htdocs/compta/paiement/cheque/index.php
+++ b/htdocs/compta/paiement/cheque/index.php
@@ -47,7 +47,7 @@ $accountstatic=new Account($db);
llxHeader('',$langs->trans("ChequesArea"));
-print_fiche_titre($langs->trans("ChequesArea"));
+print load_fiche_titre($langs->trans("ChequesArea"));
//print '<table border="0" width="100%" class="notopnoleftnoright">';
//print '<tr><td valign="top" width="30%" class="notopnoleft">';
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 9baa15a417f4bfb183936cbef460ac5bce0ec20b..7e92a608c5293ce7d5d8b330e731bc34466b9177 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -36,8 +36,6 @@ class Paiement extends CommonObject
public $element='payment';
public $table_element='paiement';
- var $id;
- var $ref;
var $facid;
var $datepaye;
/**
@@ -59,8 +57,6 @@ class Paiement extends CommonObject
var $num_paiement; // Numero du CHQ, VIR, etc...
var $bank_account; // Id compte bancaire du paiement
var $bank_line; // Id de la ligne d'ecriture bancaire
- var $fk_account; // Id of bank account
- var $note;
// fk_paiement dans llx_paiement est l'id du type de paiement (7 pour CHQ, ...)
// fk_paiement dans llx_paiement_facture est le rowid du paiement
diff --git a/htdocs/compta/paiement/index.php b/htdocs/compta/paiement/index.php
index 89a57fdc79fd01d9eeeb099e1ba32e3f7d63bdb5..8575db7028830b7ff4a32c6dc2891dd0c3c01c9b 100644
--- a/htdocs/compta/paiement/index.php
+++ b/htdocs/compta/paiement/index.php
@@ -29,7 +29,7 @@ if (!$user->admin && $user->societe_id > 0)
llxHeader();
-print_fiche_titre("Payments");
+print load_fiche_titre("Payments");
diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php
index 142ea7b5a4ac153c05db1fbf14c4053733933423..8f23036f6afbef09d890319c1caa9c4bc13d1df9 100644
--- a/htdocs/compta/paiement/rapport.php
+++ b/htdocs/compta/paiement/rapport.php
@@ -88,7 +88,7 @@ $formother=new FormOther($db);
llxHeader();
$titre=($year?$langs->trans("PaymentsReportsForYear",$year):$langs->trans("PaymentsReports"));
-print_fiche_titre($titre,'','title_accountancy.png');
+print load_fiche_titre($titre,'','title_accountancy.png');
// Formulaire de generation
print '<form method="post" action="rapport.php?year='.$year.'">';
diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
index 173226f6ab5283c83d46e1970dc1f600359526a8..30a3d17ab3f130833c686da12d8d2694b5f92c33 100644
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -162,7 +162,7 @@ if ($_GET["action"] == 'create')
$total = $charge->amount;
- print_fiche_titre($langs->trans("DoPayment"));
+ print load_fiche_titre($langs->trans("DoPayment"));
print "<br>\n";
if ($mesg)
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 3f813e009380581f94ab32f676fbd44cdeacb4f3..38f83c5ac541c9f4005ef3d3fee8e415fa04973c 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -37,8 +37,6 @@ require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
*/
class BonPrelevement extends CommonObject
{
- var $db;
-
var $date_echeance;
var $raison_sociale;
var $reference_remise;
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 64ec4ad1895794ce6d5bd287bc5cb18dc6ce471d..7e81e181d1110e7cfa70c236446b2df80700d6c7 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -106,7 +106,7 @@ $h++;
dol_fiche_head($head, $hselected, $langs->trans("StandingOrders"), 0, 'payment');
*/
-print_fiche_titre($langs->trans("NewStandingOrder"));
+print load_fiche_titre($langs->trans("NewStandingOrder"));
dol_fiche_head();
@@ -183,7 +183,7 @@ if ($resql)
$num = $db->num_rows($resql);
$i = 0;
- print_fiche_titre($langs->trans("InvoiceWaitingWithdraw").($num > 0?' ('.$num.')':''),'','');
+ print load_fiche_titre($langs->trans("InvoiceWaitingWithdraw").($num > 0?' ('.$num.')':''),'','');
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
@@ -248,7 +248,7 @@ else
*/
$limit=5;
-print_fiche_titre($langs->trans("LastWithdrawalReceipts",$limit),'','');
+print load_fiche_titre($langs->trans("LastWithdrawalReceipts",$limit),'','');
$sql = "SELECT p.rowid, p.ref, p.amount, p.statut";
$sql.= ", p.datec";
diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php
index 0e9174ef034c20430335ed1381204d92aaf1a3d9..83de06bc13c6ee5c66b6fe0f5ad924617b95cc05 100644
--- a/htdocs/compta/prelevement/fiche-stat.php
+++ b/htdocs/compta/prelevement/fiche-stat.php
@@ -120,7 +120,7 @@ if ($prev_id)
$num = $db->num_rows($resql);
$i = 0;
- print_fiche_titre($langs->trans("StatisticsByLineStatus"),'','');
+ print load_fiche_titre($langs->trans("StatisticsByLineStatus"),'','');
print"\n<!-- debut table -->\n";
print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index 36e4ed71341e98c20cb4cbd8055204fad3645e3d..7c700dfeabb73e94a79a9c158ead91bfbcf80620 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -64,7 +64,7 @@ if (prelevement_check_config() < 0)
print '</div>';
}
-print_fiche_titre($langs->trans("CustomersStandingOrdersArea"));
+print load_fiche_titre($langs->trans("CustomersStandingOrdersArea"));
print '<div class="fichecenter"><div class="fichethirdleft">';
diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php
index c3667f8b69f076f648c7941065e6a3304557703a..5e20815469c8fa4f2cf6fd3f2402b7ef8fd217b6 100644
--- a/htdocs/compta/prelevement/stats.php
+++ b/htdocs/compta/prelevement/stats.php
@@ -45,7 +45,7 @@ $result = restrictedArea($user, 'prelevement','','','bons');
llxHeader('',$langs->trans("WithdrawStatistics"));
-print_fiche_titre($langs->trans("Statistics"));
+print load_fiche_titre($langs->trans("Statistics"));
// Define total and nbtotal
$sql = "SELECT sum(pl.amount), count(pl.amount)";
@@ -73,7 +73,7 @@ if ($resql)
*/
print '<br>';
-print_titre($langs->trans("WithdrawStatistics"));
+print load_fiche_titre($langs->trans("WithdrawStatistics"));
$ligne=new LignePrelevement($db,$user);
@@ -143,7 +143,7 @@ else
*
*/
print '<br>';
-print_titre($langs->trans("WithdrawRejectStatistics"));
+print load_fiche_titre($langs->trans("WithdrawRejectStatistics"));
// Define total and nbtotal
diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php
index 19ac5705ef1bb96e0666d4e634256e1dfd176264..cfcd0a6f746d0aff5caa1ef72ece5f304e8603b6 100644
--- a/htdocs/compta/recap-compta.php
+++ b/htdocs/compta/recap-compta.php
@@ -84,7 +84,7 @@ if ($socid > 0)
if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
{
// Factures
- print_fiche_titre($langs->trans("CustomerPreview"));
+ print load_fiche_titre($langs->trans("CustomerPreview"));
print '<table class="noborder" width="100%">';
diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php
index f96531b059c3c82d47f58a06042c3edc2ce308cd..04fc8db5b286c1e22363db525f4237454b65ea91 100644
--- a/htdocs/compta/salaries/card.php
+++ b/htdocs/compta/salaries/card.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2011-2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
+/* Copyright (C) 2011-2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2014 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
* Copyright (C) 2015 Charlie BENKE <charlie@patas-monkey.com>
@@ -83,7 +83,7 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
$object->note=GETPOST("note");
$object->type_payment=GETPOST("paymenttype");
$object->num_payment=GETPOST("num_payment");
- $object->fk_user_creat=$user->id;
+ $object->fk_user_author=$user->id;
// Set user current salary as ref salaray for the payment
$fuser=new User($db);
@@ -225,52 +225,52 @@ if ($action == 'create')
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="add">';
- print_fiche_titre($langs->trans("NewSalaryPayment"),'', 'title_accountancy.png');
+ print load_fiche_titre($langs->trans("NewSalaryPayment"),'', 'title_accountancy.png');
dol_fiche_head('', '');
print '<table class="border" width="100%">';
print "<tr>";
- print '<td class="fieldrequired">'.$langs->trans("DatePayment").'</td><td>';
+ print '<td class="fieldrequired"><label for="datep">'.$langs->trans("DatePayment").'</label></td><td>';
print $form->select_date((empty($datep)?-1:$datep),"datep",'','','','add',1,1);
print '</td></tr>';
- print '<tr><td>'.$langs->trans("DateValue").'</td><td>';
+ print '<tr><td><label for="datev">'.$langs->trans("DateValue").'</label></td><td>';
print $form->select_date((empty($datev)?-1:$datev),"datev",'','','','add',1,1);
print '</td></tr>';
// Employee
print "<tr>";
- print '<td class="fieldrequired">'.$langs->trans("Employee").'</td><td>';
+ print '<td class="fieldrequired"><label for="fk_user">'.$langs->trans("Employee").'</label></td><td>';
print $form->select_dolusers(GETPOST('fk_user','int'),'fk_user',1);
print '</td></tr>';
// Label
- print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input name="label" size="40" value="'.($_POST["label"]?$_POST["label"]:$langs->trans("SalaryPayment")).'"></td></tr>';
+ print '<tr><td class="fieldrequired"><label for="label">'.$langs->trans("Label").'</label></td><td><input name="label" id="label" size="40" value="'.($_POST["label"]?$_POST["label"]:$langs->trans("SalaryPayment")).'"></td></tr>';
print "<tr>";
- print '<td class="fieldrequired">'.$langs->trans("DateStartPeriod").'</td><td>';
+ print '<td class="fieldrequired"><label for="datesp">'.$langs->trans("DateStartPeriod").'</label></td><td>';
print $form->select_date($datesp,"datesp",'','','','add');
print '</td></tr>';
- print '<tr><td class="fieldrequired">'.$langs->trans("DateEndPeriod").'</td><td>';
+ print '<tr><td class="fieldrequired"><label for="dateep">'.$langs->trans("DateEndPeriod").'</label></td><td>';
print $form->select_date($dateep,"dateep",'','','','add');
print '</td></tr>';
// Amount
- print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input name="amount" size="10" value="'.GETPOST("amount").'"></td></tr>';
+ print '<tr><td class="fieldrequired"><label for="amount">'.$langs->trans("Amount").'</label></td><td><input name="amount" id="amount" size="10" value="'.GETPOST("amount").'"></td></tr>';
// Bank
if (! empty($conf->banque->enabled))
{
- print '<tr><td class="fieldrequired">'.$langs->trans("Account").'</td><td>';
+ print '<tr><td class="fieldrequired"><label for="selectaccountid">'.$langs->trans("Account").'</label></td><td>';
$form->select_comptes($_POST["accountid"],"accountid",0,'',1); // Affiche liste des comptes courant
print '</td></tr>';
}
// Type payment
- print '<tr><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td>';
+ print '<tr><td class="fieldrequired"><label for="selectpaymenttype">'.$langs->trans("PaymentMode").'</label></td><td>';
$form->select_types_paiements(GETPOST("paymenttype"), "paymenttype");
print "</td>\n";
print "</tr>";
@@ -278,9 +278,10 @@ if ($action == 'create')
if (! empty($conf->banque->enabled))
{
// Number
- print '<tr><td>'.$langs->trans('Numero');
+ print '<tr><td><label for="num_payment">'.$langs->trans('Numero');
print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
- print '<td><input name="num_payment" type="text" value="'.GETPOST("num_payment").'"></td></tr>'."\n";
+ print '</label></td>';
+ print '<td><input name="num_payment" id="num_payment" type="text" value="'.GETPOST("num_payment").'"></td></tr>'."\n";
}
// Other attributes
@@ -314,7 +315,6 @@ if ($id)
dol_fiche_head($head, 'card', $langs->trans("SalaryPayment"), 0, 'payment');
-
print '<table class="border" width="100%">';
print "<tr>";
diff --git a/htdocs/compta/salaries/class/paymentsalary.class.php b/htdocs/compta/salaries/class/paymentsalary.class.php
index cc0029620cb2b8ac76e53b49f9e304dd71896b8a..a4bee09d7de52676d1ae1f949285497a1a1ddd6a 100644
--- a/htdocs/compta/salaries/class/paymentsalary.class.php
+++ b/htdocs/compta/salaries/class/paymentsalary.class.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2011-2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
+/* Copyright (C) 2011-2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2014 Juanjo Menent <jmenent@2byte.es>
*
* This program is free software; you can redistribute it and/or modify
@@ -34,9 +34,6 @@ class PaymentSalary extends CommonObject
//public $element='payment_salary'; //!< Id that identify managed objects
//public $table_element='payment_salary'; //!< Name of table without prefix where object is stored
- var $id;
- var $ref;
-
var $tms;
var $fk_user;
var $datep;
@@ -47,9 +44,8 @@ class PaymentSalary extends CommonObject
var $label;
var $datesp;
var $dateep;
- var $note;
var $fk_bank;
- var $fk_user_creat;
+ var $fk_user_author;
var $fk_user_modif;
@@ -85,7 +81,7 @@ class PaymentSalary extends CommonObject
$this->label=trim($this->label);
$this->note=trim($this->note);
$this->fk_bank=trim($this->fk_bank);
- $this->fk_user_creat=trim($this->fk_user_creat);
+ $this->fk_user_author=trim($this->fk_user_author);
$this->fk_user_modif=trim($this->fk_user_modif);
// Check parameters
@@ -112,7 +108,7 @@ class PaymentSalary extends CommonObject
$sql.= " dateep=".$this->db->idate($this->dateep).",";
$sql.= " note='".$this->db->escape($this->note)."',";
$sql.= " fk_bank=".($this->fk_bank > 0 ? "'".$this->fk_bank."'":"null").",";
- $sql.= " fk_user_creat='".$this->fk_user_creat."',";
+ $sql.= " fk_user_author='".$this->fk_user_author."',";
$sql.= " fk_user_modif='".$this->fk_user_modif."'";
$sql.= " WHERE rowid=".$this->id;
@@ -171,7 +167,7 @@ class PaymentSalary extends CommonObject
$sql.= " s.dateep,";
$sql.= " s.note,";
$sql.= " s.fk_bank,";
- $sql.= " s.fk_user_creat,";
+ $sql.= " s.fk_user_author,";
$sql.= " s.fk_user_modif,";
$sql.= " b.fk_account,";
$sql.= " b.fk_type,";
@@ -203,7 +199,7 @@ class PaymentSalary extends CommonObject
$this->dateep = $this->db->jdate($obj->dateep);
$this->note = $obj->note;
$this->fk_bank = $obj->fk_bank;
- $this->fk_user_creat = $obj->fk_user_creat;
+ $this->fk_user_author = $obj->fk_user_author;
$this->fk_user_modif = $obj->fk_user_modif;
$this->fk_account = $obj->fk_account;
$this->fk_type = $obj->fk_type;
@@ -275,7 +271,7 @@ class PaymentSalary extends CommonObject
$this->dateep='';
$this->note='';
$this->fk_bank='';
- $this->fk_user_creat='';
+ $this->fk_user_author='';
$this->fk_user_modif='';
}
@@ -290,13 +286,14 @@ class PaymentSalary extends CommonObject
global $conf,$langs;
$error=0;
+ $now=dol_now();
// Clean parameters
$this->amount=price2num(trim($this->amount));
$this->label=trim($this->label);
$this->note=trim($this->note);
$this->fk_bank=trim($this->fk_bank);
- $this->fk_user_creat=trim($this->fk_user_creat);
+ $this->fk_user_author=trim($this->fk_user_author);
$this->fk_user_modif=trim($this->fk_user_modif);
// Check parameters
@@ -340,7 +337,8 @@ class PaymentSalary extends CommonObject
$sql.= ", label";
$sql.= ", datesp";
$sql.= ", dateep";
- $sql.= ", fk_user_creat";
+ $sql.= ", fk_user_author";
+ $sql.= ", datec";
$sql.= ", fk_bank";
$sql.= ", entity";
$sql.= ") ";
@@ -357,6 +355,7 @@ class PaymentSalary extends CommonObject
$sql.= ", '".$this->db->idate($this->datesp)."'";
$sql.= ", '".$this->db->idate($this->dateep)."'";
$sql.= ", '".$user->id."'";
+ $sql.= ", '".$this->db->idate($now)."'";
$sql.= ", NULL";
$sql.= ", ".$conf->entity;
$sql.= ")";
@@ -511,4 +510,41 @@ class PaymentSalary extends CommonObject
return $result;
}
+ /**
+ * Information on record
+ *
+ * @param int $id Id of record
+ * @return void
+ */
+ function info($id)
+ {
+ $sql = 'SELECT ps.rowid, ps.datec, ps.fk_user_author';
+ $sql.= ' FROM '.MAIN_DB_PREFIX.'payment_salary as ps';
+ $sql.= ' WHERE ps.rowid = '.$id;
+
+ dol_syslog(get_class($this).'::info', LOG_DEBUG);
+ $result = $this->db->query($sql);
+
+ if ($result)
+ {
+ if ($this->db->num_rows($result))
+ {
+ $obj = $this->db->fetch_object($result);
+ $this->id = $obj->rowid;
+ if ($obj->fk_user_author)
+ {
+ $cuser = new User($this->db);
+ $cuser->fetch($obj->fk_user_author);
+ $this->user_creation = $cuser;
+ }
+ $this->date_creation = $this->db->jdate($obj->datec);
+ }
+ $this->db->free($result);
+ }
+ else
+ {
+ dol_print_error($this->db);
+ }
+ }
+
}
diff --git a/htdocs/compta/sociales/charges.php b/htdocs/compta/sociales/charges.php
index 7be1360287c175ab4ee1ba923de18b0b6bb42810..29606fa6a9aac01e50422e58621523ed153e5add 100644
--- a/htdocs/compta/sociales/charges.php
+++ b/htdocs/compta/sociales/charges.php
@@ -232,7 +232,7 @@ llxHeader("",$langs->trans("SocialContribution"),$help_url);
// Mode creation
if ($action == 'create')
{
- print_fiche_titre($langs->trans("NewSocialContribution"));
+ print load_fiche_titre($langs->trans("NewSocialContribution"));
$var=false;
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index dc70126ab9ef3cd7114da053bffda20fe0f4b918..7712fd0902998d27e79afbf88856303b152b8cd5 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -39,8 +39,6 @@ class ChargeSociales extends CommonObject
*/
protected $table_ref_field = 'ref';
- var $id;
- var $ref;
var $date_ech;
var $lib;
var $type;
diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
index ade44bff415392d23f2c83d181bb340e194d1954..e3bf17b3418cbfc1531b328786226d6e00a61304 100644
--- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
+++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
@@ -33,9 +33,6 @@ class PaymentSocialContribution extends CommonObject
public $element='paiementcharge'; //!< Id that identify managed objects
public $table_element='paiementcharge'; //!< Name of table without prefix where object is stored
- var $id;
- var $ref;
-
var $fk_charge;
var $datec='';
var $tms='';
@@ -49,7 +46,6 @@ class PaymentSocialContribution extends CommonObject
var $amounts=array(); // Array of amounts
var $fk_typepaiement;
var $num_paiement;
- var $note;
var $fk_bank;
var $fk_user_creat;
var $fk_user_modif;
diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php
index 3afbba0df791dfe4eaa3da55ab09cd203100dea1..639bf51fefd839ab82a4d02e8cbe8a47ac59d505 100644
--- a/htdocs/compta/sociales/index.php
+++ b/htdocs/compta/sociales/index.php
@@ -136,7 +136,7 @@ if ($resql)
if ($year)
{
- print_fiche_titre($langs->trans("SocialContributions"),($year?"<a href='index.php?year=".($year-1)."'>".img_previous()."</a> ".$langs->trans("Year")." $year <a href='index.php?year=".($year+1)."'>".img_next()."</a>":""));
+ print load_fiche_titre($langs->trans("SocialContributions"),($year?"<a href='index.php?year=".($year-1)."'>".img_previous()."</a> ".$langs->trans("Year")." $year <a href='index.php?year=".($year+1)."'>".img_next()."</a>":""));
}
else
{
diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index 78883afbc3085495d25214d110b4f6f197d5cec0..688f88759c4d1f35ddea1e3b8c047b035cc4c276 100644
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -188,7 +188,7 @@ if ($id)
// Formulaire saisie tva
if ($action == 'create')
{
- print_fiche_titre($langs->trans("VAT") . ' - ' . $langs->trans("New"));
+ print load_fiche_titre($langs->trans("VAT") . ' - ' . $langs->trans("New"));
if (! empty($conf->use_javascript_ajax))
{
diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index 68aeeebc2c856a76d66ca7e453de302eb8fbe236..d556a84a8046d0d0a56f819b78392229390902f4 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -35,9 +35,6 @@ class Tva extends CommonObject
//public $element='tva'; //!< Id that identify managed objects
//public $table_element='tva'; //!< Name of table without prefix where object is stored
- var $id;
- var $ref;
-
var $tms;
var $datep;
var $datev;
@@ -45,7 +42,6 @@ class Tva extends CommonObject
var $type_payment;
var $num_payment;
var $label;
- var $note;
var $fk_bank;
var $fk_user_creat;
var $fk_user_modif;
diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php
index 0625dd4978dbd9e622fd6a88339ca9b0662c3d78..b2a2d6b26389768b79eb7a4eda4db35baa1bdbba 100644
--- a/htdocs/compta/tva/clients.php
+++ b/htdocs/compta/tva/clients.php
@@ -227,7 +227,7 @@ $vatsup=$langs->trans("VATPaid");
// VAT Received
//print "<br>";
-//print_titre($vatcust);
+//print load_fiche_titre($vatcust);
print "<table class=\"noborder\" width=\"100%\">";
print "<tr class=\"liste_titre\">";
@@ -306,7 +306,7 @@ if (is_array($coll_list)) {
// VAT Paid
//print "<br>";
-//print_titre($vatsup);
+//print load_fiche_titre($vatsup);
//print "<table class=\"noborder\" width=\"100%\">";
print "<tr class=\"liste_titre\">";
diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php
index c84c7d2b633f7ac38369bf5f82d2a2cfde9e6fd6..a5f45d0c72cf521924ae1a6a603bab1396660565 100644
--- a/htdocs/compta/tva/index.php
+++ b/htdocs/compta/tva/index.php
@@ -116,7 +116,7 @@ $tva = new Tva($db);
$textprevyear="<a href=\"index.php?year=" . ($year_current-1) . "\">".img_previous()."</a>";
$textnextyear=" <a href=\"index.php?year=" . ($year_current+1) . "\">".img_next()."</a>";
-print_fiche_titre($langs->trans("VAT"),"$textprevyear ".$langs->trans("Year")." $year_start $textnextyear");
+print load_fiche_titre($langs->trans("VAT"),"$textprevyear ".$langs->trans("Year")." $year_start $textnextyear");
print $langs->trans("VATReportBuildWithOptionDefinedInModule").'<br>';
print '('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')<br>';
@@ -124,12 +124,12 @@ print '<br>';
print '<table width="100%" class="notopnoleftnoright">';
print '<tr><td class="notopnoleft" width="50%">';
-print_titre($langs->trans("VATSummary"));
+print load_fiche_titre($langs->trans("VATSummary"));
// The report mode is the one defined by defaut in tax module setup
//print $modetax;
//print '('.$langs->trans("SeeVATReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modetax=0">','</a>').')';
print '</td><td>';
-print_titre($langs->trans("VATPaid"));
+print load_fiche_titre($langs->trans("VATPaid"));
print '</td></tr>';
print '<tr><td class="notopnoleft" width="50%" valign="top">';
diff --git a/htdocs/compta/tva/quadri.php b/htdocs/compta/tva/quadri.php
index 3918b56c3bffddbd00c6034b93cb86b6d869fcef..a8434a7086853269d3b14f7ba5c9b1d8f9c5f12a 100644
--- a/htdocs/compta/tva/quadri.php
+++ b/htdocs/compta/tva/quadri.php
@@ -190,12 +190,12 @@ llxHeader();
$textprevyear="<a href=\"quadri.php?year=" . ($year_current-1) . "\">".img_previous()."</a>";
$textnextyear=" <a href=\"quadri.php?year=" . ($year_current+1) . "\">".img_next()."</a>";
-print_fiche_titre($langs->trans("VAT"),"$textprevyear ".$langs->trans("Year")." $year_start $textnextyear");
+print load_fiche_titre($langs->trans("VAT"),"$textprevyear ".$langs->trans("Year")." $year_start $textnextyear");
echo '<table width="100%">';
echo '<tr><td>';
-print_fiche_titre($langs->trans("VATSummary"));
+print load_fiche_titre($langs->trans("VATSummary"));
echo '</td></tr>';
echo '<tr>';
diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php
index f551e92cb9d69fbeed1407244715b62e99f3e4c7..cedc38a2143c25a520d72a5ab6c79d5560b964cb 100644
--- a/htdocs/compta/tva/quadri_detail.php
+++ b/htdocs/compta/tva/quadri_detail.php
@@ -115,7 +115,7 @@ $product_static=new Product($db);
$payment_static=new Paiement($db);
$paymentfourn_static=new PaiementFourn($db);
-//print_fiche_titre($langs->trans("VAT"),"");
+//print load_fiche_titre($langs->trans("VAT"),"");
//$fsearch.='<br>';
$fsearch.=' <input type="hidden" name="year" value="'.$year.'">';
diff --git a/htdocs/compta/tva/quarter_report.php b/htdocs/compta/tva/quarter_report.php
index 09a6622147eb55ee502475eb85edd5e2c7d203d2..e906b65ed4f0fd3ee5d71452caab68daf1c63460 100644
--- a/htdocs/compta/tva/quarter_report.php
+++ b/htdocs/compta/tva/quarter_report.php
@@ -135,7 +135,7 @@ $product_static=new Product($db);
$payment_static=new Paiement($db);
$paymentfourn_static=new PaiementFourn($db);
-//print_fiche_titre($langs->trans("VAT"),"");
+//print load_fiche_titre($langs->trans("VAT"),"");
//$fsearch.='<br>';
$fsearch.=' <input type="hidden" name="year" value="'.$year.'">';
diff --git a/htdocs/compta/ventilation/card.php b/htdocs/compta/ventilation/card.php
index 7201dfe9e29fd1c5bb1d3856d6e14624f3288400..463f88842425f9b419118a8e57c2a9249416d9bd 100644
--- a/htdocs/compta/ventilation/card.php
+++ b/htdocs/compta/ventilation/card.php
@@ -112,7 +112,7 @@ if($_GET["id"])
}
- print_fiche_titre("Ventilation");
+ print load_fiche_titre("Ventilation");
print '<table class="border" width="100%">';
diff --git a/htdocs/compta/ventilation/fournisseur/card.php b/htdocs/compta/ventilation/fournisseur/card.php
index d62694512fc9c2631cd2852335e8532aa56a2a9b..9c69b61369794a71d024a7de2599e47b60abb282 100644
--- a/htdocs/compta/ventilation/fournisseur/card.php
+++ b/htdocs/compta/ventilation/fournisseur/card.php
@@ -101,7 +101,7 @@ if($_GET["id"])
}
- print_titre("Ventilation");
+ print load_fiche_titre("Ventilation");
print '<table class="border" width="100%" cellspacing="0" cellpadding="4">';
print '<tr><td>Facture</td>';
diff --git a/htdocs/contact/canvas/actions_contactcard_common.class.php b/htdocs/contact/canvas/actions_contactcard_common.class.php
index ad628fd65747c9bf4ec3f3f5fa7b9d2e075a7215..7e43270a32c88589eb00d2a2f695da38d38443e9 100644
--- a/htdocs/contact/canvas/actions_contactcard_common.class.php
+++ b/htdocs/contact/canvas/actions_contactcard_common.class.php
@@ -207,7 +207,7 @@ abstract class ActionsContactCardCommon
{
$this->object->fetch($_POST["contactid"]);
- $this->object->oldcopy=dol_clone($this->object);
+ $this->object->oldcopy = clone $this->object;
$this->assign_post();
diff --git a/htdocs/contact/canvas/default/actions_contactcard_default.class.php b/htdocs/contact/canvas/default/actions_contactcard_default.class.php
index 3bfcf347c3fd0e7293f69e21288679aa106fcd61..30a52469da29ddfe90848a768209394f3bb855d7 100644
--- a/htdocs/contact/canvas/default/actions_contactcard_default.class.php
+++ b/htdocs/contact/canvas/default/actions_contactcard_default.class.php
@@ -29,12 +29,6 @@ include_once DOL_DOCUMENT_ROOT.'/contact/canvas/actions_contactcard_common.class
*/
class ActionsContactCardDefault extends ActionsContactCardCommon
{
- var $db;
- var $dirmodule;
- var $targetmodule;
- var $canvas;
- var $card;
-
/**
* Constructor
*
diff --git a/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
index 70d6b41bf3516de2baf224698402ca46d2ddd051..3fce45b848fab8a0bf8f0e56fb230b3336a54b1c 100644
--- a/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
+++ b/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
@@ -20,7 +20,7 @@
<!-- BEGIN PHP TEMPLATE CONTACTCARD_CREATE.TPL.PHP DEFAULT -->
<?php
-print_fiche_titre($this->control->tpl['title']);
+print load_fiche_titre($this->control->tpl['title']);
dol_htmloutput_errors((is_numeric($object->error)?'':$object->error),$object->errors);
diff --git a/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
index 3be1d16bc8dd6fe239bf638aaa8f6dae86e28acd..c275902d384b707b1ba7ad022e7962f957447f62 100644
--- a/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
+++ b/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
@@ -23,7 +23,7 @@ $contact = $GLOBALS['objcanvas']->control->object;
<!-- BEGIN PHP TEMPLATE CONTACTCARD_EDIT.TPL.PHP DEFAULT -->
<?php
-print_fiche_titre($this->control->tpl['title']);
+print load_fiche_titre($this->control->tpl['title']);
dol_htmloutput_errors($this->control->tpl['error'],$this->control->tpl['errors']);
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 9778d0c8a7113bf47ecd7dd519719c18c4dafa5f..92d3913814fe4ce56e6d8baceca023e91131d101 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -289,7 +289,7 @@ if (empty($reshook))
$object->fetch($contactid);
- $object->oldcopy=dol_clone($object);
+ $object->oldcopy = clone$object;
$object->old_lastname = GETPOST("old_lastname");
$object->old_firstname = GETPOST("old_firstname");
@@ -443,7 +443,7 @@ else
$title = $addcontact = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("AddContact") : $langs->trans("AddContactAddress"));
$linkback='';
- print_fiche_titre($title,$linkback,'title_companies.png');
+ print load_fiche_titre($title,$linkback,'title_companies.png');
// Affiche les erreurs
dol_htmloutput_errors(is_numeric($error)?'':$error,$errors);
@@ -626,7 +626,7 @@ else
// Add personnal information
- print_fiche_titre('<div class="comboperso">'.$langs->trans("PersonalInformations").'</div>','','');
+ print load_fiche_titre('<div class="comboperso">'.$langs->trans("PersonalInformations").'</div>','','');
print '<table class="border" width="100%">';
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index f3c0b9bd3f5ff4011b3a53b3c863105752f74f34..9673e1923ac2437d3d2f4f6d876a35105d91d5ea 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -41,11 +41,7 @@ class Contact extends CommonObject
public $table_element='socpeople';
protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
- var $id;
- var $ref_ext;
var $civility_id; // In fact we store civility_code
- var $lastname;
- var $firstname;
var $address;
var $zip;
var $town;
@@ -69,10 +65,6 @@ class Contact extends CommonObject
var $state_code; // Code of department
var $state; // Label of department
- var $country_id; // Id of country
- var $country_code; // Code of country
- var $country; // Label of country
-
var $poste; // Position
var $socid; // fk_soc
@@ -91,13 +83,6 @@ class Contact extends CommonObject
var $birthday;
var $default_lang;
- var $note_public; // Public note
- /**
- * @deprecated
- * @see note_public, note_private
- */
- var $note;
- var $note_private; // Private note
var $no_email; // 1=Don't send e-mail to this contact, 0=do
var $ref_facturation; // Nb de reference facture pour lequel il est contact
@@ -107,7 +92,6 @@ class Contact extends CommonObject
var $user_id;
var $user_login;
- var $import_key;
var $oldcopy; // To contains a clone of this when we need to save old properties of object
diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php
index 187dea70def4e7134169a699b2375a67333436a6..9a8fde8e14f21ac1ffd5ee819ebf53b9e1fdd81f 100644
--- a/htdocs/contact/ldap.php
+++ b/htdocs/contact/ldap.php
@@ -156,7 +156,7 @@ if (! empty($conf->global->LDAP_CONTACT_ACTIVE) && $conf->global->LDAP_CONTACT_A
// Affichage attributs LDAP
-print_titre($langs->trans("LDAPInformationsForThisContact"));
+print load_fiche_titre($langs->trans("LDAPInformationsForThisContact"));
print '<table width="100%" class="noborder">';
diff --git a/htdocs/contrat/admin/contract_extrafields.php b/htdocs/contrat/admin/contract_extrafields.php
index 29e060551dedbb9779003db98dac14a3b3484c18..9711379f45801ee85afdeab1092bce66b2ca76ff 100644
--- a/htdocs/contrat/admin/contract_extrafields.php
+++ b/htdocs/contrat/admin/contract_extrafields.php
@@ -67,7 +67,7 @@ $textobject = $langs->transnoentitiesnoconv('Contracts');
llxHeader();
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("ContractsSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("ContractsSetup"),$linkback,'title_setup');
print '<br>';
$head=contract_admin_prepare_head();
@@ -97,7 +97,7 @@ if ($action != 'create' && $action != 'edit')
if ($action == 'create')
{
print "<br>";
- print_titre($langs->trans('NewAttribute'));
+ print load_fiche_titre($langs->trans('NewAttribute'));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
}
@@ -110,7 +110,7 @@ if ($action == 'create')
if ($action == 'edit' && ! empty($attrname))
{
print "<br>";
- print_titre($langs->trans("FieldEdition", $attrname));
+ print load_fiche_titre($langs->trans("FieldEdition", $attrname));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
}
diff --git a/htdocs/contrat/admin/contractdet_extrafields.php b/htdocs/contrat/admin/contractdet_extrafields.php
index 283a400bc80d12b250079df8fcdda3aafdf8a7f3..8014334c008ae486da6af7c38c41826d7f7b89ce 100644
--- a/htdocs/contrat/admin/contractdet_extrafields.php
+++ b/htdocs/contrat/admin/contractdet_extrafields.php
@@ -67,7 +67,7 @@ $textobject = $langs->transnoentitiesnoconv('Contracts');
llxHeader();
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("ContractsSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("ContractsSetup"),$linkback,'title_setup');
print '<br>';
$head=contract_admin_prepare_head();
@@ -97,7 +97,7 @@ if ($action != 'create' && $action != 'edit')
if ($action == 'create')
{
print "<br>";
- print_titre($langs->trans('NewAttribute'));
+ print load_fiche_titre($langs->trans('NewAttribute'));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
}
@@ -110,7 +110,7 @@ if ($action == 'create')
if ($action == 'edit' && ! empty($attrname))
{
print "<br>";
- print_titre($langs->trans("FieldEdition", $attrname));
+ print load_fiche_titre($langs->trans("FieldEdition", $attrname));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
}
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 429547ed602e5d350a8a450ee0ebdb4738329705..5615eaf76a4da85d0582fba362b1d6e4c8454a5d 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -930,7 +930,7 @@ if ($result > 0)
*********************************************************************/
if ($action == 'create')
{
- print_fiche_titre($langs->trans('AddContract'),'','title_commercial.png');
+ print load_fiche_titre($langs->trans('AddContract'),'','title_commercial.png');
$soc = new Societe($db);
if ($socid>0) $soc->fetch($socid);
@@ -1599,7 +1599,7 @@ else
'text' => $langs->trans("ConfirmMoveToAnotherContractQuestion"),
array('type' => 'select', 'name' => 'newcid', 'values' => $arraycontractid));
- $form->form_confirm($_SERVER["PHP_SELF"]."?id=".$object->id."&lineid=".GETPOST('rowid'),$langs->trans("MoveToAnotherContract"),$langs->trans("ConfirmMoveToAnotherContract"),"confirm_move",$formquestion);
+ $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&lineid=".GETPOST('rowid'),$langs->trans("MoveToAnotherContract"),$langs->trans("ConfirmMoveToAnotherContract"),"confirm_move",$formquestion);
print '<table class="notopnoleftnoright" width="100%"><tr '.$bc[$var].' height="6"><td></td></tr></table>';
}
@@ -1611,7 +1611,7 @@ else
$dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
$dateactend = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
$comment = GETPOST('comment');
- $form->form_confirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment),$langs->trans("ActivateService"),$langs->trans("ConfirmActivateService",dol_print_date($dateactstart,"%A %d %B %Y")),"confirm_active", '', 0, 1);
+ $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment),$langs->trans("ActivateService"),$langs->trans("ConfirmActivateService",dol_print_date($dateactstart,"%A %d %B %Y")),"confirm_active", '', 0, 1);
print '<table class="notopnoleftnoright" width="100%"><tr '.$bc[$var].' height="6"><td></td></tr></table>';
}
@@ -1623,7 +1623,7 @@ else
$dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
$dateactend = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
$comment = GETPOST('comment');
- $form->form_confirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment), $langs->trans("CloseService"), $langs->trans("ConfirmCloseService",dol_print_date($dateactend,"%A %d %B %Y")), "confirm_closeline", '', 0, 1);
+ $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment), $langs->trans("CloseService"), $langs->trans("ConfirmCloseService",dol_print_date($dateactend,"%A %d %B %Y")), "confirm_closeline", '', 0, 1);
print '<table class="notopnoleftnoright" width="100%"><tr '.$bc[$var].' height="6"><td></td></tr></table>';
}
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index eea23be7ae8b267bd2f929ac9385d8df0ced5bcc..6fa4e5c46a868bb4e032922f15624531ab06db6d 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -50,25 +50,6 @@ class Contrat extends CommonObject
*/
protected $table_ref_field = 'ref';
- /**
- * Id of the contract
- * @var int
- */
- var $id;
-
- /**
- * Reference of the contract
- * @var string
- */
- var $ref;
-
- /**
- * External reference of the contract.
- * Used by 3rd party services
- * @var string
- */
- var $ref_ext;
-
/**
* Supplier reference of the contract
* @var string
@@ -140,26 +121,12 @@ class Contrat extends CommonObject
var $commercial_signature_id;
var $commercial_suivi_id;
- /**
- * @var string Private note
- */
- var $note_private;
-
- /**
- * @var string Public note
- */
- var $note_public;
-
- var $modelpdf;
-
/**
* @deprecated Use fk_project instead
* @see fk_project
*/
var $fk_projet;
- public $fk_project;
-
var $extraparams=array();
/**
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 56cdbe90ca3eb2f2378aca60c794259e89ed6864..3a7b5667db5b80e54d855a0ec8b131d59e952310 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -64,7 +64,7 @@ $now = dol_now();
llxHeader();
-print_fiche_titre($langs->trans("ContractsArea"),'','title_commercial.png');
+print load_fiche_titre($langs->trans("ContractsArea"),'','title_commercial.png');
//print '<table border="0" width="100%" class="notopnoleftnoright">';
diff --git a/htdocs/contrat/tpl/linkedobjectblock.tpl.php b/htdocs/contrat/tpl/linkedobjectblock.tpl.php
index 4daf5deef02b5da410049406e2fc8e868ee7d7b6..412d07cb72658662e9d0a91410611ed0e205d5d6 100644
--- a/htdocs/contrat/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/contrat/tpl/linkedobjectblock.tpl.php
@@ -26,7 +26,7 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
$langs->load("contracts");
echo '<br>';
-print_titre($langs->trans('RelatedContracts'));
+print load_fiche_titre($langs->trans('RelatedContracts'));
?>
<table class="noborder allwidth">
<tr class="liste_titre">
diff --git a/htdocs/core/ajax/selectsearchbox.php b/htdocs/core/ajax/selectsearchbox.php
index c7a1c7f6d30061fdc7ba178f167cfadeb87af0d5..1783c4794b5eb632c94c7150496684cfbaaf0075 100644
--- a/htdocs/core/ajax/selectsearchbox.php
+++ b/htdocs/core/ajax/selectsearchbox.php
@@ -43,6 +43,6 @@ if ($conf->projet->enabled)
{
$arrayresult['searchintoproject']=$langs->trans("SearchIntoProject", $search_boxvalue);
}
-print dol_json_encode($arrayresult);
+print json_encode($arrayresult);
if (is_object($db)) $db->close();
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 2a7834473dc34e1543f95fe7d9cffb763b360a9e..fbef41687431c6d17441bb355bb6c7c95b8e664f 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -131,6 +131,7 @@ abstract class CommonObject
public $thirdparty;
/**
* @deprecated
+ * @var Societe A related customer
* @see thirdparty
*/
public $client;
@@ -283,27 +284,27 @@ abstract class CommonObject
public $note;
/**
- * @var float
+ * @var float Total amount before taxes
* @see update_price()
*/
public $total_ht;
/**
- * @var float
+ * @var float Total VAT amount
* @see update_price()
*/
public $total_tva;
/**
- * @var float
+ * @var float Total local tax 1 amount
* @see update_price()
*/
public $total_localtax1;
/**
- * @var float
+ * @var float Total local tax 2 amount
* @see update_price()
*/
public $total_localtax2;
/**
- * @var float
+ * @var float Total amount with taxes
* @see update_price()
*/
public $total_ttc;
@@ -2806,10 +2807,11 @@ abstract class CommonObject
// --------------------
/**
- * Show linked object block.
+ * Show linked object block.
*
- * @return int <0 if KO, >0 if OK
- * @deprecated 3.8 Use instead $form->shoLinkedObjectBlock($object)
+ * @return int <0 if KO, >0 if OK
+ * @deprecated 3.8 Use instead $form->showLinkedObjectBlock($object)
+ * @see Form::showLinkedObjectBlock
*/
function showLinkedObjectBlock()
{
diff --git a/htdocs/core/class/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php
index ef854a2452e51b93dce2feddb0d6ed9e73ab4529..5bcbab5934ab28f07460b6b831cea3f0f72fefa4 100644
--- a/htdocs/core/class/commonobjectline.class.php
+++ b/htdocs/core/class/commonobjectline.class.php
@@ -43,9 +43,6 @@ abstract class CommonObjectLine extends CommonObject
*/
public $rowid;
- //! Database handler
- public $db;
-
/**
* Product/service unit code ('km', 'm', 'p', ...)
* @var string
diff --git a/htdocs/core/class/commonorder.class.php b/htdocs/core/class/commonorder.class.php
index 5309b5524ee23f4499945accf4aa52700b73bcc2..74d14af081922035294e5b63338d9689630bf677 100644
--- a/htdocs/core/class/commonorder.class.php
+++ b/htdocs/core/class/commonorder.class.php
@@ -137,36 +137,6 @@ abstract class CommonOrderLine extends CommonObjectLine
public $localtax1_type;
public $localtax2_type;
- /**
- * Total amount before taxes
- * @var float
- */
- public $total_ht;
-
- /**
- * Total VAT amount
- * @var float
- */
- public $total_tva;
-
- /**
- * Total local tax 1 amount
- * @var float
- */
- public $total_localtax1;
-
- /**
- * Total local tax 2 amount
- * @var float
- */
- public $total_localtax2;
-
- /**
- * Total amount with taxes
- * @var float
- */
- public $total_ttc;
-
/**
* Liste d'options cumulables:
* Bit 0: 0 si TVA normal - 1 si TVA NPR
diff --git a/htdocs/core/class/cookie.class.php b/htdocs/core/class/cookie.class.php
index ba519fab36505d610c8afbd74f02bd7e7447fcf3..1d28861a44e697f3f1a94f75ec30ba952662b42a 100644
--- a/htdocs/core/class/cookie.class.php
+++ b/htdocs/core/class/cookie.class.php
@@ -43,9 +43,10 @@ class DolCookie
var $cookie;
/**
- * Constructor
+ * Constructor
*
- * @param string $key Personnal key
+ * @param string $key Personnal key
+ * @deprecated
*/
function __construct($key = '')
{
diff --git a/htdocs/core/class/fileupload.class.php b/htdocs/core/class/fileupload.class.php
index cdb7f66ac5ff3e8acebe5922f9ca0330f907d205..a38b034747b53420895cd8f9312b5eac68b5f320 100644
--- a/htdocs/core/class/fileupload.class.php
+++ b/htdocs/core/class/fileupload.class.php
@@ -125,7 +125,7 @@ class FileUpload
if (!empty($parent->socid)) {
$parent->fetch_thirdparty();
}
- $object->$parentObject = dol_clone($parent);
+ $object->$parentObject = clone $parent;
} else {
$object->fetch_thirdparty();
}
diff --git a/htdocs/core/class/fiscalyear.class.php b/htdocs/core/class/fiscalyear.class.php
index d20dbf2d4f39ad90e30ecf4fe20da9722c44571f..7d4dff8de44d168bf192a366b66a31de2e92d2da 100644
--- a/htdocs/core/class/fiscalyear.class.php
+++ b/htdocs/core/class/fiscalyear.class.php
@@ -34,7 +34,6 @@ class Fiscalyear extends CommonObject
public $fk_element = '';
protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
- var $id;
var $rowid;
var $label;
@@ -324,4 +323,4 @@ class Fiscalyear extends CommonObject
}
}
-}
\ No newline at end of file
+}
diff --git a/htdocs/core/class/genericobject.class.php b/htdocs/core/class/genericobject.class.php
index c198525a07bb9648fb6e384e7149663e8c2e0d20..32960664c17b3b0c7c29bfe357c2cc647e575a2c 100644
--- a/htdocs/core/class/genericobject.class.php
+++ b/htdocs/core/class/genericobject.class.php
@@ -30,8 +30,6 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
class GenericObject extends CommonObject
{
- var $db;
-
/**
* Constructor
*
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 3851a67f0cb232a508e5309a9b486796b7f93be6..40d68bec667b4c951fc76d514330e53adf78f308 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3237,7 +3237,7 @@ class Form
$formconfirm.= ($question ? '<div class="confirmmessage"'.img_help('','').' '.$question . '</div>': '');
$formconfirm.= '</div>'."\n";
- $formconfirm.= "\n<!-- begin ajax form_confirm page=".$page." -->\n";
+ $formconfirm.= "\n<!-- begin ajax formconfirm page=".$page." -->\n";
$formconfirm.= '<script type="text/javascript">'."\n";
$formconfirm.= 'jQuery(document).ready(function() {
$(function() {
@@ -3308,11 +3308,11 @@ class Form
});
});
</script>';
- $formconfirm.= "<!-- end ajax form_confirm -->\n";
+ $formconfirm.= "<!-- end ajax formconfirm -->\n";
}
else
{
- $formconfirm.= "\n<!-- begin form_confirm page=".$page." -->\n";
+ $formconfirm.= "\n<!-- begin formconfirm page=".$page." -->\n";
$formconfirm.= '<form method="POST" action="'.$page.'" class="notoptoleftroright">'."\n";
$formconfirm.= '<input type="hidden" name="action" value="'.$action.'">'."\n";
@@ -3345,7 +3345,7 @@ class Form
$formconfirm.= "</form>\n";
$formconfirm.= '<br>';
- $formconfirm.= "<!-- end form_confirm -->\n";
+ $formconfirm.= "<!-- end formconfirm -->\n";
}
return $formconfirm;
@@ -3581,7 +3581,7 @@ class Form
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
print '<tr><td>';
- print $this->select_users($selected,$htmlname,1,$exclude,0,$include);
+ print $this->select_dolusers($selected,$htmlname,1,$exclude,0,$include);
print '</td>';
print '<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
print '</tr></table></form>';
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 59a418d73a216a3a356e7d774245f2bd08469bd5..000a2a35c137a23216bb50e9d267218b938038cd 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -790,7 +790,7 @@ class FormFile
$param = (isset($object->id)?'&id='.$object->id:'').$param;
// Show list of existing files
- if (empty($useinecm)) print_titre($title?$title:$langs->trans("AttachedFiles"));
+ if (empty($useinecm)) print load_fiche_titre($title?$title:$langs->trans("AttachedFiles"));
if (empty($url)) $url=$_SERVER["PHP_SELF"];
print '<table width="100%" class="'.($useinecm?'nobordernopadding':'liste').'">';
print '<tr class="liste_titre">';
@@ -951,7 +951,7 @@ class FormFile
dol_syslog(get_class($this).'::list_of_autoecmfiles upload_dir='.$upload_dir.' modulepart='.$modulepart);
// Show list of documents
- if (empty($useinecm)) print_titre($langs->trans("AttachedFiles"));
+ if (empty($useinecm)) print load_fiche_titre($langs->trans("AttachedFiles"));
if (empty($url)) $url=$_SERVER["PHP_SELF"];
print '<table width="100%" class="nobordernopadding">';
print '<tr class="liste_titre">';
@@ -1083,7 +1083,9 @@ class FormFile
}
}
- if ($result > 0) { $found=1; $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]=dol_clone($object_instance); } // Save object into a cache
+ if ($result > 0) { // Save object into a cache
+ $found=1; $this->cache_objects[$modulepart.'_'.$id.'_'.$ref] = clone $object_instance;
+ }
if ($result == 0) { $found=1; $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]='notfound'; unset($filearray[$key]); }
}
@@ -1192,7 +1194,7 @@ class FormFile
$param .= (isset($object->id)?'&id=' . $object->id : '');
// Show list of associated links
- print_titre($langs->trans("LinkedFiles"));
+ print load_fiche_titre($langs->trans("LinkedFiles"));
print '<form action="' . $_SERVER['PHP_SELF'] . ($param?'?'.$param:'') . '" method="POST">';
diff --git a/htdocs/core/class/link.class.php b/htdocs/core/class/link.class.php
index 0cdc6a8c4a89603ef1fae0fbfec5206bd92e0a71..2dd348966027c211225698f3b04dbf82f46c5d87 100644
--- a/htdocs/core/class/link.class.php
+++ b/htdocs/core/class/link.class.php
@@ -31,7 +31,6 @@ class Link extends CommonObject
public $element = 'link';
public $table_element = 'links';
- public $id;
public $entity;
public $datea;
public $url;
diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index 2c21cb3c512f948d4ebf6811acd00c172925b8cb..cb370e31d96dd4bed5c2361aca04b8413b6d9c44 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -511,7 +511,7 @@ class Menubase
$sql.= " ORDER BY m.position, m.rowid";
//print $sql;
-//$tmp1=dol_microtime_float();
+//$tmp1=microtime(true);
//print '>>> 1 0<br>';
dol_syslog(get_class($this)."::menuLoad mymainmenu=".$mymainmenu." myleftmenu=".$myleftmenu." type_user=".$type_user." menu_handler=".$menu_handler." tabMenu size=".count($tabMenu)."", LOG_DEBUG);
$resql = $this->db->query($sql);
@@ -575,7 +575,7 @@ class Menubase
$title = $langs->trans($menu['titre']);
}
}
-//$tmp4=dol_microtime_float();
+//$tmp4=microtime(true);
//print '>>> 3 '.($tmp4 - $tmp3).'<br>';
// We complete tabMenu
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index c979f734b5e54376ca1d21a9702d7ded05b6fa83..a84c45487061b072375f7f31080ac736c51f72b8 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -479,7 +479,7 @@ function show_projects($conf,$langs,$db,$object,$backtopage='')
}
print "\n";
- print_fiche_titre($langs->trans("ProjectsDedicatedToThisThirdParty"),$buttoncreate,'');
+ print load_fiche_titre($langs->trans("ProjectsDedicatedToThisThirdParty"),$buttoncreate,'');
print "\n".'<table class="noborder" width=100%>';
$sql = "SELECT p.rowid as id, p.title, p.ref, p.public, p.dateo as do, p.datee as de, p.fk_statut as status";
@@ -602,7 +602,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
print "\n";
$title = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ContactsForCompany") : $langs->trans("ContactsAddressesForCompany"));
- print_fiche_titre($title,$buttoncreate,'');
+ print load_fiche_titre($title,$buttoncreate,'');
print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
print '<input type="hidden" name="socid" value="'.$object->id.'">';
@@ -816,7 +816,7 @@ function show_addresses($conf,$langs,$db,$object,$backtopage='')
}
print "\n";
- print_fiche_titre($langs->trans("AddressesForCompany"),$buttoncreate,'');
+ print load_fiche_titre($langs->trans("AddressesForCompany"),$buttoncreate,'');
print "\n".'<table class="noborder" width="100%">'."\n";
@@ -1394,7 +1394,7 @@ function show_subsidiaries($conf,$langs,$db,$object)
{
$socstatic = new Societe($db);
- print_titre($langs->trans("Subsidiaries"));
+ print load_fiche_titre($langs->trans("Subsidiaries"));
print "\n".'<table class="noborder" width="100%">'."\n";
print '<tr class="liste_titre"><td>'.$langs->trans("Company").'</td>';
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 0ae89d012747f1254e6669ddbb671c010298c766..f07ff99c72a96195a43e88a6f49ee29df1b7c7ad 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -397,7 +397,7 @@ function dol_clone($object)
{
dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);
- $myclone=clone($object);
+ $myclone = clone $object;
return $myclone;
}
@@ -2736,7 +2736,7 @@ function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $m
* @param string $title Title to show
* @return string Title to show
* @deprecated Use load_fiche_titre instead
- * @see print_fiche_titre, load_fiche_titre
+ * @see load_fiche_titre
*/
function print_titre($title)
{
@@ -4855,6 +4855,8 @@ function complete_head_from_modules($conf,$langs,$object,&$head,&$h,$type,$mode=
}
else if (count($values) == 5) // deprecated
{
+ dol_syslog('Passing 5 values in tabs module_parts is deprecated. Please update to 6 with permissions.', LOG_WARNING);
+
if ($values[0] != $type) continue;
if ($values[3]) $langs->load($values[3]);
if (preg_match('/SUBSTITUTION_([^_]+)/i',$values[2],$reg))
@@ -4938,7 +4940,7 @@ function printCommonFooter($zone='private')
print 'MAIN_OPTIMIZE_SPEED='.(isset($conf->global->MAIN_OPTIMIZE_SPEED)?$conf->global->MAIN_OPTIMIZE_SPEED:'off');
if ($micro_start_time)
{
- $micro_end_time=dol_microtime_float();
+ $micro_end_time = microtime(true);
print ' - Build time: '.ceil(1000*($micro_end_time-$micro_start_time)).' ms';
}
if (function_exists("memory_get_usage"))
diff --git a/htdocs/core/lib/json.lib.php b/htdocs/core/lib/json.lib.php
index 5a87e2537586c359f03b6e5c0bf4cba8923afcd8..6b868663aa703aafa1b3dd282a2650102e5e8dab 100644
--- a/htdocs/core/lib/json.lib.php
+++ b/htdocs/core/lib/json.lib.php
@@ -43,9 +43,12 @@ if (! function_exists('json_encode'))
* @param mixed $elements PHP Object to json encode
* @return string Json encoded string
* @deprecated PHP >= 5.3 supports native json_encode
+ * @see json_encode()
*/
function dol_json_encode($elements)
{
+ dol_syslog('dol_json_encode() is deprecated. Please update your code to use native json_encode().', LOG_WARNING);
+
$num=count($elements);
if (is_object($elements)) // Count number of properties for an object
{
@@ -221,9 +224,12 @@ if (! function_exists('json_decode'))
* @param bool $assoc False return an object, true return an array. Try to always use it with true !
* @return mixed Object or Array or false on error
* @deprecated PHP >= 5.3 supports native json_decode
+ * @see json_decode()
*/
function dol_json_decode($json, $assoc=false)
{
+ dol_syslog('dol_json_decode() is deprecated. Please update your code to use native json_decode().', LOG_WARNING);
+
$comment = false;
$out='';
diff --git a/htdocs/core/lib/salaries.lib.php b/htdocs/core/lib/salaries.lib.php
index 7c104b4da82c435286fa3a4273e7e6bfdf1ada96..6b25de4b656dbb4eeea5039f82c17cf2f5ca0401 100644
--- a/htdocs/core/lib/salaries.lib.php
+++ b/htdocs/core/lib/salaries.lib.php
@@ -51,12 +51,10 @@ function salaries_prepare_head($object) {
$head[$h][2] = 'documents';
$h++;
- /*
$head[$h][0] = DOL_URL_ROOT.'/compta/salaries/info.php?id='.$object->id;
$head[$h][1] = $langs->trans("Info");
$head[$h][2] = 'info';
$h++;
- */
complete_head_from_modules($conf,$langs,$object,$head,$h,'salaries', 'remove');
diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php
index 1c0c589870e1c53f6828dea1ea64d5a2dacf37ac..50e3b1e97bef0dfb2874fc9e1a33a69c65e75e37 100644
--- a/htdocs/core/lib/sendings.lib.php
+++ b/htdocs/core/lib/sendings.lib.php
@@ -184,8 +184,8 @@ function show_list_sending_receive($origin,$origin_id,$filter='')
if ($num)
{
- if ($filter) print_titre($langs->trans("OtherSendingsForSameOrder"));
- else print_titre($langs->trans("SendingsAndReceivingForSameOrder"));
+ if ($filter) print load_fiche_titre($langs->trans("OtherSendingsForSameOrder"));
+ else print load_fiche_titre($langs->trans("SendingsAndReceivingForSameOrder"));
print '<table class="liste" width="100%">';
print '<tr class="liste_titre">';
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index 866e01b49592b6655ee890550555094c5df4becf..5c428ca9f136678a13b89128a12ff22bffe5dea7 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -99,7 +99,7 @@ class MenuManager
if ($mode == 'jmobile')
{
- $this->topmenu=dol_clone($this->menu);
+ $this->topmenu = clone $this->menu;
unset($this->menu->liste);
}
}
@@ -205,7 +205,7 @@ class MenuManager
if ($mode == 'jmobile')
{
- $this->leftmenu=dol_clone($this->menu);
+ $this->leftmenu = clone $this->menu;
unset($this->menu->liste);
}
}
diff --git a/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php b/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php
index a7baec4364fbbcc9050f54bcccf11c6f237b8b80..dd6732d9742acc7c407c6f91abeaee690122d734 100644
--- a/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php
+++ b/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php
@@ -33,8 +33,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/cheque/pdf/modules_chequereceipts.
*/
class BordereauChequeBlochet extends ModeleChequeReceipts
{
- var $error='';
-
var $emetteur; // Objet societe qui emet
/**
diff --git a/htdocs/core/modules/modExpenseReport.class.php b/htdocs/core/modules/modExpenseReport.class.php
index 123f4fe4aa04a75a38c7659e55f21ec8d22a5d16..f71605145eac50d6e9e9bb67b516cb1c5f033bbd 100644
--- a/htdocs/core/modules/modExpenseReport.class.php
+++ b/htdocs/core/modules/modExpenseReport.class.php
@@ -75,9 +75,6 @@ class modExpenseReport extends DolibarrModules
$this->dirs = array();
$r=0;
- // Relative path to module style sheet if exists. Example: '/mymodule/css/mycss.css'.
- //$this->style_sheet = '/mymodule/mymodule.css.php';
-
// Config pages. Put here list of php page names stored in admmin directory used to setup module.
$this->config_page_url = array('expensereport.php');
@@ -345,4 +342,4 @@ class modExpenseReport extends DolibarrModules
return $this->_init($sql,$options);
}
-}
\ No newline at end of file
+}
diff --git a/htdocs/core/modules/modHoliday.class.php b/htdocs/core/modules/modHoliday.class.php
index b4517b4bfbea7668e8daf9c0f61c055f725fa6f7..8daba0040d739808aed1a87b50483c62934c557e 100644
--- a/htdocs/core/modules/modHoliday.class.php
+++ b/htdocs/core/modules/modHoliday.class.php
@@ -76,9 +76,6 @@ class modHoliday extends DolibarrModules
$this->dirs = array();
$r=0;
- // Relative path to module style sheet if exists. Example: '/mymodule/css/mycss.css'.
- //$this->style_sheet = '/mymodule/mymodule.css.php';
-
// Config pages. Put here list of php page names stored in admmin directory used to setup module.
// $this->config_page_url = array("holiday.php?leftmenu=setup@holiday");
diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php
index 217f431b96e1f48edaee7c41e8eaaec4ad00b22f..cb929daad3bcb744cf6680ccdabeaeb7e651f300 100644
--- a/htdocs/core/photos_resize.php
+++ b/htdocs/core/photos_resize.php
@@ -182,7 +182,7 @@ if ($action == 'confirm_crop')
llxHeader($head, $langs->trans("Image"), '', '', 0, 0, array('/includes/jquery/plugins/jcrop/js/jquery.Jcrop.min.js','/core/js/lib_photosresize.js'), array('/includes/jquery/plugins/jcrop/css/jquery.Jcrop.css'));
-print_fiche_titre($langs->trans("ImageEditor"));
+print load_fiche_titre($langs->trans("ImageEditor"));
$infoarray=dol_getImageSize($dir."/".urldecode($_GET["file"]));
$height=$infoarray['height'];
diff --git a/htdocs/core/tools.php b/htdocs/core/tools.php
index 1375ed5c455d29aeffd3f905a26da89f36a74942..51378c9246a797c6b8cd7122c768fed6940e8a51 100644
--- a/htdocs/core/tools.php
+++ b/htdocs/core/tools.php
@@ -43,7 +43,7 @@ llxHeader("",$langs->trans("Tools"),"");
$text=$langs->trans("Tools");
-print_fiche_titre($text);
+print load_fiche_titre($text);
// Show description of content
print $langs->trans("ToolsDesc").'<br><br>';
diff --git a/htdocs/core/tpl/document_actions_post_headers.tpl.php b/htdocs/core/tpl/document_actions_post_headers.tpl.php
index 84b869cd8138c389319fd959a723848489d2b7e7..59c4c86a77e73ee52480b87557e4be2bef126da5 100644
--- a/htdocs/core/tpl/document_actions_post_headers.tpl.php
+++ b/htdocs/core/tpl/document_actions_post_headers.tpl.php
@@ -28,7 +28,7 @@ if (empty($relativepathwithnofile)) $relativepathwithnofile='';
if ($action == 'delete')
{
$langs->load("companies"); // Need for string DeleteFile+ConfirmDeleteFiles
- $ret = $form->form_confirm(
+ $ret = $form->formconfirm(
$_SERVER["PHP_SELF"] . '?id=' . $object->id . '&urlfile=' . urlencode(GETPOST("urlfile")) . '&linkid=' . GETPOST('linkid', 'int') . (empty($param)?'':$param),
$langs->trans('DeleteFile'),
$langs->trans('ConfirmDeleteFile'),
diff --git a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
index 652a1ec8d6b440ab58741c2d690d6bf43cffa214..7a63a5cdeecbab3a8220e0b6a942a3920a46472c 100644
--- a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
@@ -89,7 +89,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
if (empty($object->oldcopy) || ! is_object($object->oldcopy))
{
dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);
- $object->oldcopy=dol_clone($object);
+ $object->oldcopy = clone $object;
}
$oldinfo=$object->oldcopy->_load_ldap_info();
@@ -126,7 +126,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
if (empty($object->oldcopy) || ! is_object($object->oldcopy))
{
dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);
- $object->oldcopy=dol_clone($object);
+ $object->oldcopy = clone $object;
}
$oldinfo=$object->oldcopy->_load_ldap_info();
@@ -287,7 +287,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
if (empty($object->oldcopy) || ! is_object($object->oldcopy))
{
dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);
- $object->oldcopy=dol_clone($object);
+ $object->oldcopy = clone $object;
}
$oldinfo=$object->oldcopy->_load_ldap_info();
@@ -364,7 +364,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
if (empty($object->oldcopy) || ! is_object($object->oldcopy))
{
dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);
- $object->oldcopy=dol_clone($object);
+ $object->oldcopy = clone $object;
}
$oldinfo=$object->oldcopy->_load_ldap_info();
@@ -493,7 +493,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
if (empty($object->oldcopy) || ! is_object($object->oldcopy))
{
dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);
- $object->oldcopy=dol_clone($object);
+ $object->oldcopy = clone $object;
}
$oldinfo=$object->oldcopy->_load_ldap_info();
diff --git a/htdocs/cron/admin/cron.php b/htdocs/cron/admin/cron.php
index 0c8e310d2ddbbe7eb05acfd0a4bda37c04428c00..6dc81bcc6a37f65c90af5a9d2f5e5bd2ca80460f 100644
--- a/htdocs/cron/admin/cron.php
+++ b/htdocs/cron/admin/cron.php
@@ -66,7 +66,7 @@ if (!empty($actionsave))
llxHeader();
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("CronSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("CronSetup"),$linkback,'title_setup');
// Configuration header
$head = cronadmin_prepare_head();
diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index f2c4a93e03064c76e1987725e507b75216cc0884..5e2766345de98d7502ec0b08a1361ff65c1c6a56 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -230,7 +230,7 @@ if ($action=='edit' || empty($action) || $action=='delete' || $action=='execute'
}
elseif ($action=='create')
{
- print_fiche_titre($langs->trans("CronTask"),'','title_setup');
+ print load_fiche_titre($langs->trans("CronTask"),'','title_setup');
}
if ($conf->use_javascript_ajax)
diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index 26ae969e4931b5bbc4c5438b62a4f0e6872195cf..742db0cb4619905b6f54d83f7bbe2c596fa92b35 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -30,15 +30,9 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
*/
class Cronjob extends CommonObject
{
- var $db; //!< To store db handler
- var $error; //!< To return error code (or message)
- var $errors=array(); //!< To return several error codes (or messages)
var $element='cronjob'; //!< Id that identify managed objects
var $table_element='cronjob'; //!< Name of table without prefix where object is stored
- var $id;
-
- var $ref; //Use for prevnext_ref
var $jobtype;
var $tms='';
var $datec='';
@@ -63,12 +57,8 @@ class Cronjob extends CommonObject
var $status;
var $fk_user_author;
var $fk_user_mod;
- var $note;
var $nbrun;
var $libname;
- var $lines;
-
-
/**
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index d6c0fbd2070e96ae3596d8a1176e14b725dada77..1f4e5126ed04d46b901f3877b24c1f4e544a4180 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -131,7 +131,7 @@ $pagetitle=$langs->trans("CronList");
llxHeader('',$pagetitle);
-print_fiche_titre($pagetitle,'','title_setup');
+print load_fiche_titre($pagetitle,'','title_setup');
print $langs->trans('CronInfo');
diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php
index 0385977c7dc42332037a76db4c6826d641525d4e..81ef5431d094de21a3e58b7a30d2cc209542e422 100644
--- a/htdocs/don/admin/donation.php
+++ b/htdocs/don/admin/donation.php
@@ -199,7 +199,7 @@ $form=new Form($db);
llxHeader('',$langs->trans("DonationsSetup"),'DonConfiguration');
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("DonationsSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("DonationsSetup"),$linkback,'title_setup');
$head = donation_admin_prepare_head();
@@ -208,7 +208,7 @@ dol_fiche_head($head, 'general', $langs->trans("Donations"), 0, 'payment');
/*
* Params
*/
-print_titre($langs->trans("Options"));
+print load_fiche_titre($langs->trans("Options"));
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
@@ -255,7 +255,7 @@ print '</form>';
if (preg_match('/fr/i',$conf->global->MAIN_INFO_SOCIETE_COUNTRY))
{
print '<br>';
- print_titre($langs->trans("FrenchOptions"));
+ print load_fiche_titre($langs->trans("FrenchOptions"));
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
@@ -308,7 +308,7 @@ if (preg_match('/fr/i',$conf->global->MAIN_INFO_SOCIETE_COUNTRY))
// Document templates
print '<br>';
-print_titre($langs->trans("DonationsModels"));
+print load_fiche_titre($langs->trans("DonationsModels"));
// Defini tableau def de modele
$type='donation';
diff --git a/htdocs/don/admin/donation_extrafields.php b/htdocs/don/admin/donation_extrafields.php
index 6acb7e5d90eca738b2b3597354018712722eb4ed..df9b2f527bb2ffd20326630df6a8a244f9c74bf9 100644
--- a/htdocs/don/admin/donation_extrafields.php
+++ b/htdocs/don/admin/donation_extrafields.php
@@ -62,7 +62,7 @@ $textobject=$langs->transnoentitiesnoconv("Donations");
llxHeader('',$langs->trans("DonationsSetup"));
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("DonationsSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("DonationsSetup"),$linkback,'title_setup');
$head = donation_admin_prepare_head();
@@ -92,7 +92,7 @@ if ($action != 'create' && $action != 'edit')
if ($action == 'create')
{
print "<br>";
- print_titre($langs->trans('NewAttribute'));
+ print load_fiche_titre($langs->trans('NewAttribute'));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
}
@@ -105,7 +105,7 @@ if ($action == 'create')
if ($action == 'edit' && ! empty($attrname))
{
print "<br>";
- print_titre($langs->trans("FieldEdition", $attrname));
+ print load_fiche_titre($langs->trans("FieldEdition", $attrname));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
}
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index b56171b8796e1fb7b978767f5f3bc624d931e630..6664550e5c87576811b5fab44e1e25776b8fbf0e 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -293,7 +293,7 @@ $formcompany = new FormCompany($db);
if ($action == 'create')
{
- print_fiche_titre($langs->trans("AddDonation"));
+ print load_fiche_titre($langs->trans("AddDonation"));
print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index 2b84f0d072763bc4c027c28b8fc5d626de4c7133..72ccc7a014770f85861d878bb6e6c8a2efe56464 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -39,29 +39,17 @@ class Don extends CommonObject
public $fk_element = 'fk_donation';
protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
- var $id;
- var $ref;
var $date;
var $amount;
- var $firstname;
- var $lastname;
var $societe;
var $address;
var $zip;
var $town;
- var $country_id;
- var $country_code;
- var $country;
var $email;
var $public;
var $fk_projet;
var $fk_typepayment;
var $num_payment;
- var $note_private;
- var $note_public;
- var $statut;
- var $modelpdf;
- var $projet;
/**
* @deprecated
diff --git a/htdocs/don/class/paymentdonation.class.php b/htdocs/don/class/paymentdonation.class.php
index 73cbbc3930194f3629124f4bc7c4286028d66a90..9655f454ed5e86f3841f6ff974b2136f915964c1 100644
--- a/htdocs/don/class/paymentdonation.class.php
+++ b/htdocs/don/class/paymentdonation.class.php
@@ -32,9 +32,7 @@ class PaymentDonation extends CommonObject
public $element='payment_donation'; //!< Id that identify managed objects
public $table_element='payment_donation'; //!< Name of table without prefix where object is stored
- var $id;
var $rowid;
- var $ref;
var $fk_donation;
var $datec='';
@@ -44,7 +42,6 @@ class PaymentDonation extends CommonObject
var $amounts=array(); // Array of amounts
var $typepayment;
var $num_payment;
- var $note;
var $fk_bank;
var $fk_user_creat;
var $fk_user_modif;
diff --git a/htdocs/don/index.php b/htdocs/don/index.php
index 7630ed8d3e7cf7c1150af3cd14b7052c3e8e2613..73c9e56d29c977015418287a7120bfb1ab56a9e3 100644
--- a/htdocs/don/index.php
+++ b/htdocs/don/index.php
@@ -76,7 +76,7 @@ if ($result)
dol_print_error($db);
}
-print_fiche_titre($langs->trans("DonationsArea"));
+print load_fiche_titre($langs->trans("DonationsArea"));
print '<table width="100%" class="notopnoleftnoright">';
diff --git a/htdocs/don/payment/payment.php b/htdocs/don/payment/payment.php
index c4ed9891be64f96b9b69ab82129a1ef64ead1e86..da33a92e75085d9f973b4894b10d0f6a707e3da0 100644
--- a/htdocs/don/payment/payment.php
+++ b/htdocs/don/payment/payment.php
@@ -162,7 +162,7 @@ if (GETPOST("action") == 'create')
$total = $don->amount;
- print_fiche_titre($langs->trans("DoPayment"));
+ print load_fiche_titre($langs->trans("DoPayment"));
if ($mesg)
{
diff --git a/htdocs/don/stats/index.php b/htdocs/don/stats/index.php
index baeda9b8a8248d7e591d5c76b2bc02e5097300ef..c5cd34caf5fb9b40d3b3824cbee0e4358c68bc5e 100644
--- a/htdocs/don/stats/index.php
+++ b/htdocs/don/stats/index.php
@@ -59,7 +59,7 @@ $form=new Form($db);
llxHeader();
-print_fiche_titre($langs->trans("StatisticsOfSendings"), $mesg);
+print load_fiche_titre($langs->trans("StatisticsOfSendings"), $mesg);
dol_mkdir($dir);
@@ -244,7 +244,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
print '</td></tr>';
// User
print '<tr><td align="left">'.$langs->trans("CreatedBy").'</td><td align="left">';
- print $form->select_users($userid,'userid',1);
+ print $form->select_dolusers($userid,'userid',1);
print '</td></tr>';
// Year
print '<tr><td align="left">'.$langs->trans("Year").'</td><td align="left">';
diff --git a/htdocs/ecm/docdir.php b/htdocs/ecm/docdir.php
index b32ba2446d47534eb0ac656e71939d08db43bd8e..9f298e42b32fbc6da0571654146387e72bba7d18 100644
--- a/htdocs/ecm/docdir.php
+++ b/htdocs/ecm/docdir.php
@@ -153,7 +153,7 @@ if ($action == 'create')
print '<input type="hidden" name="action" value="add">';
$title=$langs->trans("ECMNewSection");
- print_fiche_titre($title);
+ print load_fiche_titre($title);
dol_fiche_head();
@@ -193,7 +193,7 @@ if (empty($action) || $action == 'delete_section')
//***********************
// List
//***********************
- print_fiche_titre($langs->trans("ECMSectionOfDocuments"));
+ print load_fiche_titre($langs->trans("ECMSectionOfDocuments"));
print '<br>';
/*
diff --git a/htdocs/ecm/docother.php b/htdocs/ecm/docother.php
index d1fda6b793a7c8753405689dfb39fdd5e3ca1e2b..3efe07162289ec7aa6c030d5e8c3905c5fe82b6e 100644
--- a/htdocs/ecm/docother.php
+++ b/htdocs/ecm/docother.php
@@ -99,7 +99,7 @@ llxHeader();
$form=new Form($db);
-print_fiche_titre($langs->trans("ECMAutoOrg"));
+print load_fiche_titre($langs->trans("ECMAutoOrg"));
//$head = societe_prepare_head($societe);
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index a6dc5442aa7aef8cf5d7540407ea059c7174eedd..64a9c46f0de28ecccd53d612a581ea90a8248159 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -414,7 +414,7 @@ if (! empty($conf->global->ECM_AUTO_TREE_ENABLED))
if (! empty($conf->projet->enabled)) { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'project', 'test'=>$conf->projet->enabled, 'label'=>$langs->trans("Projects"), 'desc'=>$langs->trans("ECMDocsByProjects")); }
}
-print_fiche_titre($langs->trans("ECMArea").' - '.$langs->trans("ECMFileManager"));
+print load_fiche_titre($langs->trans("ECMArea").' - '.$langs->trans("ECMFileManager"));
/*
print '<div class="hideonsmartphone">';
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index 7626774b24c261c1fd404152f3028ddb2c1111c0..47239aa3acd741fe81ea196bb5192a7d3adbff85 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -414,7 +414,7 @@ if (! empty($conf->global->ECM_AUTO_TREE_ENABLED))
}
-print_fiche_titre($langs->trans("ECMArea").' - '.$langs->trans("ECMFileManager"));
+print load_fiche_titre($langs->trans("ECMArea").' - '.$langs->trans("ECMFileManager"));
$helptext1=''; $helptext2='';
$helptext1.=$langs->trans("ECMAreaDesc");
diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php
index 968318f5b85bd73d20bcb3f112c6354ea05dff1b..729543eff56c7645a8b2b2cf909879669440db62 100644
--- a/htdocs/ecm/search.php
+++ b/htdocs/ecm/search.php
@@ -116,7 +116,7 @@ if (! empty($conf->fournisseur->enabled)) { $rowspan++; $sectionauto[]=array('le
//***********************
// List
//***********************
-print_fiche_titre($langs->trans("ECMArea").' - '.$langs->trans("Search"));
+print load_fiche_titre($langs->trans("ECMArea").' - '.$langs->trans("Search"));
//print $langs->trans("ECMAreaDesc")."<br>";
//print $langs->trans("ECMAreaDesc2")."<br>";
@@ -133,7 +133,7 @@ print '<table class="border" width="100%"><tr><td width="40%" valign="top">';
// Left area
-//print_fiche_titre($langs->trans("ECMSectionsManual"));
+//print load_fiche_titre($langs->trans("ECMSectionsManual"));
print '<form method="post" action="'.DOL_URL_ROOT.'/ecm/search.php">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -147,7 +147,7 @@ print "<tr ".$bc[false].'><td colspan="2" align="center"><input type="submit" cl
print "</table></form>";
//print $langs->trans("ECMSectionManualDesc");
-//print_fiche_titre($langs->trans("ECMSectionAuto"));
+//print load_fiche_titre($langs->trans("ECMSectionAuto"));
print '<form method="post" action="'.DOL_URL_ROOT.'/ecm/search.php">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 1b871136235c5805ba3280867c938c3f149051e2..820be46461059937604f1064e2798efdc9305f27 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -469,7 +469,7 @@ $product_static = new Product($db);
if ($action == 'create2')
{
- print_fiche_titre($langs->trans("CreateASending")).'<br>';
+ print load_fiche_titre($langs->trans("CreateASending")).'<br>';
print $langs->trans("ShipmentCreationIsDoneFromOrder");
$action=''; $id=''; $ref='';
}
@@ -479,7 +479,7 @@ if ($action == 'create')
{
$expe = new Expedition($db);
- print_fiche_titre($langs->trans("CreateASending"));
+ print load_fiche_titre($langs->trans("CreateASending"));
if (! $origin)
{
setEventMessage($langs->trans("ErrorBadParameters"),'errors');
@@ -1606,7 +1606,7 @@ else if ($id || $ref)
print '<div class="clearboth"></div>';
print '<br>';
- print_fiche_titre($langs->trans('SendShippingByEMail'));
+ print load_fiche_titre($langs->trans('SendShippingByEMail'));
dol_fiche_head('');
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index edd8aa0cd39b34a6a9f7daafd6e7b30525e787f3..096208742deb80b4a2dd807299015fc6c1ae2e5a 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -45,24 +45,15 @@ class Expedition extends CommonObject
public $table_element="expedition";
protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
- var $id;
var $socid;
var $ref_customer;
- var $ref_ext;
var $ref_int;
var $brouillon;
var $entrepot_id;
- var $modelpdf;
- var $origin;
- var $origin_id;
var $lines=array();
- var $shipping_method_id;
var $tracking_number;
var $tracking_url;
- var $statut;
var $billed;
- var $note_public;
- var $note_private;
var $model_pdf;
var $trueWeight;
@@ -95,20 +86,8 @@ class Expedition extends CommonObject
var $date_creation;
var $date_valid;
- // For Invoicing
- var $total_ht; // Total net of tax
- var $total_ttc; // Total with tax
- var $total_tva; // Total VAT
- var $total_localtax1; // Total Local tax 1
- var $total_localtax2; // Total Local tax 2
-
var $listmeths; // List of carriers
- //Incorterms
- var $fk_incoterms;
- var $location_incoterms;
- var $libelle_incoterms; //Used into tooltip
-
/**
* Constructor
*
diff --git a/htdocs/expedition/class/expeditionbatch.class.php b/htdocs/expedition/class/expeditionbatch.class.php
index fd424fc4990e1eacb1055a107f1c16296eca9a7b..2011bd9c6f981290447f0dbc40599ec6764dc781 100644
--- a/htdocs/expedition/class/expeditionbatch.class.php
+++ b/htdocs/expedition/class/expeditionbatch.class.php
@@ -31,7 +31,6 @@ class ExpeditionLineBatch extends CommonObject
var $element='expeditionlignebatch'; //!< Id that identify managed objects
private static $_table_element='expeditiondet_batch'; //!< Name of table without prefix where object is stored
- var $id;
var $sellby;
var $eatby;
var $batch;
diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php
index dbfece1838162267df80d58460b53b2267132b98..c397605645d0fe11d914e944521f8105a69e7cdb 100644
--- a/htdocs/expedition/index.php
+++ b/htdocs/expedition/index.php
@@ -41,7 +41,7 @@ $shipment=new Expedition($db);
$helpurl='EN:Module_Shipments|FR:Module_Expéditions|ES:Módulo_Expediciones';
llxHeader('',$langs->trans("Shipment"),$helpurl);
-print_fiche_titre($langs->trans("SendingsArea"));
+print load_fiche_titre($langs->trans("SendingsArea"));
print '<div class="fichecenter"><div class="fichethirdleft">';
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 07b7cd70a13facecacc27de8fb477548040cf026..82bf1d01e6a637f46a2b2bc82dfa5e1a973448d8 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -656,7 +656,7 @@ if ($id > 0 || ! empty($ref))
{
if ($user->rights->expedition->creer)
{
- print_titre($langs->trans("NewSending"));
+ print load_fiche_titre($langs->trans("NewSending"));
print '<form method="GET" action="'.DOL_URL_ROOT.'/expedition/card.php">';
print '<input type="hidden" name="action" value="create">';
diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php
index ca35f97df9b3c1a2d55368bf7beea7b67680ec47..767553608695c366d750676e3286a4c3095aee59 100644
--- a/htdocs/expedition/stats/index.php
+++ b/htdocs/expedition/stats/index.php
@@ -58,7 +58,7 @@ $form=new Form($db);
llxHeader();
-print_fiche_titre($langs->trans("StatisticsOfSendings"), $mesg);
+print load_fiche_titre($langs->trans("StatisticsOfSendings"), $mesg);
dol_mkdir($dir);
@@ -243,7 +243,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
print '</td></tr>';
// User
print '<tr><td align="left">'.$langs->trans("CreatedBy").'</td><td align="left">';
- print $form->select_users($userid,'userid',1);
+ print $form->select_dolusers($userid,'userid',1);
print '</td></tr>';
// Year
print '<tr><td align="left">'.$langs->trans("Year").'</td><td align="left">';
diff --git a/htdocs/expedition/stats/month.php b/htdocs/expedition/stats/month.php
index f1cf51e3e16408769b6f98da8316fdf9ba287c71..b7d217217c241edf2c6bd02bfc08d4c222d3de64 100644
--- a/htdocs/expedition/stats/month.php
+++ b/htdocs/expedition/stats/month.php
@@ -39,7 +39,7 @@ $HEIGHT=DolGraph::getDefaultGraphSizeForStats('height');
$mesg = '';
-print_fiche_titre($langs->trans("StatisticsOfSendings").' '.$_GET["year"], $mesg);
+print load_fiche_titre($langs->trans("StatisticsOfSendings").' '.$_GET["year"], $mesg);
$stats = new ExpeditionStats($db);
$data = $stats->getNbExpeditionByMonth($_GET["year"]);
diff --git a/htdocs/expedition/tpl/linkedobjectblock.tpl.php b/htdocs/expedition/tpl/linkedobjectblock.tpl.php
index d4a9d1f9af299d3429534bfa5bd930f81dbf8f2d..4f4209576604302b988b255ca214de65abec7bf6 100644
--- a/htdocs/expedition/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/expedition/tpl/linkedobjectblock.tpl.php
@@ -29,7 +29,7 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
$langs->load("sendings");
echo '<br>';
-print_titre($langs->trans('RelatedShippings'));
+print load_fiche_titre($langs->trans('RelatedShippings'));
?>
<table class="noborder allwidth">
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 7220e869350c58ece984e67e38ff9d6ef9329e5c..3094bc1ccfd02f164afc5a2b586905b57d639716 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -1089,7 +1089,7 @@ if (! empty($conf->global->DEPLACEMENT_TO_CLEAN))
// Create
if ($action == 'create')
{
- print print_fiche_titre($langs->trans("NewTrip"));
+ print print load_fiche_titre($langs->trans("NewTrip"));
print '<form action="'.$_SERVER['PHP_SELF'].'" method="post" name="create">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -1178,7 +1178,7 @@ else
{
if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous))
{
- print_fiche_titre($langs->trans('TripCard'));
+ print load_fiche_titre($langs->trans('TripCard'));
print '<div class="tabBar">';
print $langs->trans('NotUserRightToView');
@@ -1321,56 +1321,56 @@ else
if ($action == 'save')
{
- $ret=$form->form_confirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("SaveTrip"),$langs->trans("ConfirmSaveTrip"),"confirm_validate","","",1);
+ $ret=$form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("SaveTrip"),$langs->trans("ConfirmSaveTrip"),"confirm_validate","","",1);
if ($ret == 'html') print '<br>';
}
if ($action == 'save_from_refuse')
{
- $ret=$form->form_confirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("SaveTrip"),$langs->trans("ConfirmSaveTrip"),"confirm_save_from_refuse","","",1);
+ $ret=$form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("SaveTrip"),$langs->trans("ConfirmSaveTrip"),"confirm_save_from_refuse","","",1);
if ($ret == 'html') print '<br>';
}
if ($action == 'delete')
{
- $ret=$form->form_confirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("DeleteTrip"),$langs->trans("ConfirmDeleteTrip"),"confirm_delete","","",1);
+ $ret=$form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("DeleteTrip"),$langs->trans("ConfirmDeleteTrip"),"confirm_delete","","",1);
if ($ret == 'html') print '<br>';
}
if ($action == 'validate')
{
- $ret=$form->form_confirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("ValideTrip"),$langs->trans("ConfirmValideTrip"),"confirm_approve","","",1);
+ $ret=$form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("ValideTrip"),$langs->trans("ConfirmValideTrip"),"confirm_approve","","",1);
if ($ret == 'html') print '<br>';
}
if ($action == 'paid')
{
- $ret=$form->form_confirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("PaidTrip"),$langs->trans("ConfirmPaidTrip"),"confirm_paid","","",1);
+ $ret=$form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("PaidTrip"),$langs->trans("ConfirmPaidTrip"),"confirm_paid","","",1);
if ($ret == 'html') print '<br>';
}
if ($action == 'cancel')
{
$array_input = array('text'=>$langs->trans("ConfirmCancelTrip"), array('type'=>"text",'label'=>$langs->trans("Comment"),'name'=>"detail_cancel",'size'=>"50",'value'=>""));
- $ret=$form->form_confirm($_SEVER["PHP_SELF"]."?id=".$id,$langs->trans("Cancel"),"","confirm_cancel",$array_input,"",1);
+ $ret=$form->formconfirm($_SEVER["PHP_SELF"]."?id=".$id,$langs->trans("Cancel"),"","confirm_cancel",$array_input,"",1);
if ($ret == 'html') print '<br>';
}
if ($action == 'brouillonner'):
- $ret=$form->form_confirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("BrouillonnerTrip"),$langs->trans("ConfirmBrouillonnerTrip"),"confirm_brouillonner","","",1);
+ $ret=$form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("BrouillonnerTrip"),$langs->trans("ConfirmBrouillonnerTrip"),"confirm_brouillonner","","",1);
if ($ret == 'html') print '<br>';
endif;
if ($action == 'refuse') // Deny
{
$array_input = array('text'=>$langs->trans("ConfirmRefuseTrip"), array('type'=>"text",'label'=>$langs->trans("Comment"),'name'=>"detail_refuse",'size'=>"50",'value'=>""));
- $ret=$form->form_confirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("Deny"),'',"confirm_refuse",$array_input,"yes",1);
+ $ret=$form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("Deny"),'',"confirm_refuse",$array_input,"yes",1);
if ($ret == 'html') print '<br>';
}
if ($action == 'delete_line')
{
- $ret=$form->form_confirm($_SERVER["PHP_SELF"]."?id=".$id."&rowid=".GETPOST('rowid'),$langs->trans("DeleteLine"),$langs->trans("ConfirmDeleteLine"),"confirm_delete_line",'','yes',1);
+ $ret=$form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id."&rowid=".GETPOST('rowid'),$langs->trans("DeleteLine"),$langs->trans("ConfirmDeleteLine"),"confirm_delete_line",'','yes',1);
if ($ret == 'html') print '<br>';
}
@@ -1772,7 +1772,7 @@ else
// Add a line
if (($object->fk_statut==0 || $object->fk_statut==99) && $action != 'editline')
{
- print_fiche_titre($langs->trans("AddLine"),'','');
+ print load_fiche_titre($langs->trans("AddLine"),'','');
print '<form method="post" action="'.$_SERVER['PHP_SELF'].'" name="addline">';
print '<input type="hidden" name="id" value="'.$object->id.'">';
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 78ca120516e2d0d624167a048da05b1a47ae21d7..920c6aa16d7911673db9433f49b87eecad93a111 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -29,21 +29,12 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
*/
class ExpenseReport extends CommonObject
{
- var $db;
- var $error;
var $element='expensereport';
var $table_element='expensereport';
var $table_element_line = 'expensereport_det';
var $fk_element = 'fk_expensereport';
- var $id;
- var $ref;
var $lignes=array();
- var $total_ht;
- var $total_tva;
- var $total_ttc;
- var $note_public;
- var $note_private;
var $date_debut;
var $date_fin;
diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php
index 4c9c5843a497e49e8d509d16d27038c33c5592f8..7cda584abbf393edfc8b4b4ee49ff27f588a4ea5 100644
--- a/htdocs/expensereport/class/paymentexpensereport.class.php
+++ b/htdocs/expensereport/class/paymentexpensereport.class.php
@@ -32,9 +32,7 @@ class PaymentExpenseReport extends CommonObject
public $element='payment_expensereport'; //!< Id that identify managed objects
public $table_element='payment_expensereport'; //!< Name of table without prefix where object is stored
- var $id;
var $rowid;
- var $ref;
var $fk_expensereport;
var $datec='';
@@ -44,7 +42,6 @@ class PaymentExpenseReport extends CommonObject
var $amounts=array(); // Array of amounts
var $fk_typepayment;
var $num_payment;
- var $note;
var $fk_bank;
var $fk_user_creat;
var $fk_user_modif;
diff --git a/htdocs/expensereport/export_csv.php b/htdocs/expensereport/export_csv.php
index 817d651c3e8f723bf908bf66b4d79177a2935421..3cf520c6739fc1e7d1c74f7632b3829083d50e1c 100644
--- a/htdocs/expensereport/export_csv.php
+++ b/htdocs/expensereport/export_csv.php
@@ -69,7 +69,7 @@ if($num < 1) {
llxHeader();
-print_fiche_titre($langs->trans("ExportTripCSV"));
+print load_fiche_titre($langs->trans("ExportTripCSV"));
print '<div class="tabBar">';
diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index f025079fca944eac70bd13897ec229a3fceaf9f0..ece9f9260aca8557d12aa0096f9e428220721fd8 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -100,7 +100,7 @@ if ($result)
}
-print_fiche_titre($langs->trans("ExpensesArea"));
+print load_fiche_titre($langs->trans("ExpensesArea"));
print '<div class="fichecenter"><div class="fichethirdleft">';
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 83961d4f2742b82cb872e0e3f83fcdd71e06dab4..54e372053adfe9cf6fc0c8486e29812e3c4155c2 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -214,7 +214,7 @@ if ($resql)
// User
if ($user->rights->expensereport->readall || $user->rights->expensereport->lire_tous){
print '<td class="liste_titre" align="left">';
- $html->select_users($search_user,"search_user",1,"",0,'');
+ $html->select_dolusers($search_user,"search_user",1,"",0,'');
print '</td>';
} else {
print '<td class="liste_titre"> </td>';
diff --git a/htdocs/expensereport/payment/payment.php b/htdocs/expensereport/payment/payment.php
index c65e42f709cb94952f4fd95c8302ac02a68563df..94f37389fc9b748d60b6c7bd7dcaf5e1fc3212c7 100644
--- a/htdocs/expensereport/payment/payment.php
+++ b/htdocs/expensereport/payment/payment.php
@@ -167,7 +167,7 @@ if (GETPOST("action") == 'create')
$total = $expensereport->total_ttc;
- print_fiche_titre($langs->trans("DoPayment"));
+ print load_fiche_titre($langs->trans("DoPayment"));
if ($mesg)
{
diff --git a/htdocs/expensereport/stats/index.php b/htdocs/expensereport/stats/index.php
index 402eb56e01bf7aef8a596cc3e569dddfc9aa67ea..bba5ceb1ee1df988a482b5dfa51756da62a6ccd6 100644
--- a/htdocs/expensereport/stats/index.php
+++ b/htdocs/expensereport/stats/index.php
@@ -65,7 +65,7 @@ llxHeader();
$title=$langs->trans("TripsAndExpensesStatistics");
$dir=$conf->expensereport->dir_temp;
-print_fiche_titre($title, $mesg);
+print load_fiche_titre($title, $mesg);
dol_mkdir($dir);
diff --git a/htdocs/expensereport/synchro_compta.php b/htdocs/expensereport/synchro_compta.php
index 90eb4bd46746d791bd01ee008f74dfdb309e136d..3e2a7c21d34488d5a6208999923ab373b4c57eae 100644
--- a/htdocs/expensereport/synchro_compta.php
+++ b/htdocs/expensereport/synchro_compta.php
@@ -100,7 +100,7 @@ $html = new Form($db);
$submit = isset($_POST['submit'])?true:false;
$idAccount=isset($_GET["account"])?$_GET["account"]:$_POST["account"];
-print_fiche_titre($langs->trans("TripSynch"));
+print load_fiche_titre($langs->trans("TripSynch"));
dol_fiche_head('');
@@ -108,13 +108,13 @@ dol_fiche_head('');
if ($_GET["action"] == 'ndfTOaccount'):
$idTrip = $_GET['idTrip'];
- $ret=$html->form_confirm($_SERVER["PHP_SELF"]."?idTrip=".$idTrip."&account=".$idAccount,$langs->trans("ndfToAccount"),$langs->trans("ConfirmNdfToAccount"),"confirm_ndf_to_account","","",1);
+ $ret=$html->formconfirm($_SERVER["PHP_SELF"]."?idTrip=".$idTrip."&account=".$idAccount,$langs->trans("ndfToAccount"),$langs->trans("ConfirmNdfToAccount"),"confirm_ndf_to_account","","",1);
if ($ret == 'html') print '<br />';
endif;
if ($_GET["action"] == 'accountTOndf'):
$idTrip = $_GET['idTrip'];
- $ret=$html->form_confirm($_SERVER["PHP_SELF"]."?idTrip=".$idTrip."&account=".$idAccount,$langs->trans("AccountToNdf"),$langs->trans("ConfirmAccountToNdf"),"confirm_account_to_ndf","","",1);
+ $ret=$html->formconfirm($_SERVER["PHP_SELF"]."?idTrip=".$idTrip."&account=".$idAccount,$langs->trans("AccountToNdf"),$langs->trans("ConfirmAccountToNdf"),"confirm_account_to_ndf","","",1);
if ($ret == 'html') print '<br />';
endif;
@@ -212,4 +212,4 @@ dol_fiche_end();
llxFooter();
-$db->close();
\ No newline at end of file
+$db->close();
diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index 5602829a908f804df07d420df229e81ff72d68f2..88e4ecc8596534615745b1ba28c2459b1a99e1cb 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -556,7 +556,7 @@ class Export
$filename.='.'.$objmodel->getDriverExtension();
$dirname=$conf->export->dir_temp.'/'.$user->id;
- $outputlangs=dol_clone($langs); // We clone to have an object we can modify (for example to change output charset by csv handler) without changing original value
+ $outputlangs = clone $langs; // We clone to have an object we can modify (for example to change output charset by csv handler) without changing original value
// Open file
dol_mkdir($dirname);
diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php
index bf002ccde96627411182738d37f7665f96015f27..8f9f7946e562ea2600320ae3a83c52a1e45a5288 100644
--- a/htdocs/exports/index.php
+++ b/htdocs/exports/index.php
@@ -44,7 +44,7 @@ $form=new Form($db);
llxHeader('',$langs->trans("ExportsArea"),'EN:Module_Exports_En|FR:Module_Exports|ES:Módulo_Exportaciones');
-print_fiche_titre($langs->trans("ExportsArea"));
+print load_fiche_titre($langs->trans("ExportsArea"));
print $langs->trans("FormatedExportDesc1").'<br>';
print $langs->trans("FormatedExportDesc2").' ';
diff --git a/htdocs/externalsite/admin/externalsite.php b/htdocs/externalsite/admin/externalsite.php
index 574d94c90b777d1b78e429bba71e4ed778fed432..90fb5aff9f0ff22b04e853f7576275b776f64904 100644
--- a/htdocs/externalsite/admin/externalsite.php
+++ b/htdocs/externalsite/admin/externalsite.php
@@ -76,7 +76,7 @@ if ($action == 'update')
llxHeader();
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("ExternalSiteSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("ExternalSiteSetup"),$linkback,'title_setup');
print '<br>';
print $langs->trans("Module100Desc")."<br>\n";
diff --git a/htdocs/fichinter/admin/fichinter_extrafields.php b/htdocs/fichinter/admin/fichinter_extrafields.php
index e14726e2f5fca130ad1122f6f1554fcbca84bc4d..955b66f0bebcb84d2be370178219a27816bb405c 100644
--- a/htdocs/fichinter/admin/fichinter_extrafields.php
+++ b/htdocs/fichinter/admin/fichinter_extrafields.php
@@ -67,7 +67,7 @@ $textobject=$langs->transnoentitiesnoconv("Interventions");
llxHeader();
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("InterventionsSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("InterventionsSetup"),$linkback,'title_setup');
$head=fichinter_admin_prepare_head();
@@ -96,7 +96,7 @@ if ($action != 'create' && $action != 'edit')
if ($action == 'create')
{
print "<br>";
- print_titre($langs->trans('NewAttribute'));
+ print load_fiche_titre($langs->trans('NewAttribute'));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
}
@@ -109,7 +109,7 @@ if ($action == 'create')
if ($action == 'edit' && ! empty($attrname))
{
print "<br>";
- print_titre($langs->trans("FieldEdition", $attrname));
+ print load_fiche_titre($langs->trans("FieldEdition", $attrname));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
}
diff --git a/htdocs/fichinter/admin/fichinterdet_extrafields.php b/htdocs/fichinter/admin/fichinterdet_extrafields.php
index 281b92750e8e1e74236858034e0a29e087dd5c5a..776229a4c2916e0a65740fc1bec5e3d74815c9b1 100644
--- a/htdocs/fichinter/admin/fichinterdet_extrafields.php
+++ b/htdocs/fichinter/admin/fichinterdet_extrafields.php
@@ -67,7 +67,7 @@ $textobject=$langs->transnoentitiesnoconv("Interventions");
llxHeader();
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("InterventionsSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("InterventionsSetup"),$linkback,'title_setup');
$head=fichinter_admin_prepare_head();
@@ -97,7 +97,7 @@ if ($action != 'create' && $action != 'edit')
if ($action == 'create')
{
print "<br>";
- print_titre($langs->trans('NewAttribute'));
+ print load_fiche_titre($langs->trans('NewAttribute'));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
}
@@ -110,7 +110,7 @@ if ($action == 'create')
if ($action == 'edit' && ! empty($attrname))
{
print "<br>";
- print_titre($langs->trans("FieldEdition", $attrname));
+ print load_fiche_titre($langs->trans("FieldEdition", $attrname));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
}
diff --git a/htdocs/fichinter/apercu.php b/htdocs/fichinter/apercu.php
index 0d4d3421538ea4cab1698d5ac919a401d69f5510..89efad03841b5cd0d32a6156f98e6edbc677f207 100644
--- a/htdocs/fichinter/apercu.php
+++ b/htdocs/fichinter/apercu.php
@@ -101,7 +101,7 @@ if ($id > 0 || ! empty($ref))
if (file_exists($file))
{
$encfile = urlencode($file);
- print_titre($langs->trans("Documents"));
+ print load_fiche_titre($langs->trans("Documents"));
print '<table class="border" width="100%">';
print "<tr ".$bc[$var]."><td>".$langs->trans("Intervention")." PDF</td>";
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 3cb613934b9d6f364efdc65b2f00210857de7b23..a247341cdec31c7f8df9aa30c5b02fdd4da323ed 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -960,7 +960,7 @@ if ($action == 'create')
$soc=new Societe($db);
- print_fiche_titre($langs->trans("AddIntervention"));
+ print load_fiche_titre($langs->trans("AddIntervention"));
dol_htmloutput_mesg($mesg);
@@ -1804,7 +1804,7 @@ else if ($id > 0 || ! empty($ref))
print '<div class="clearboth"></div>';
print '<br>';
- print_fiche_titre($langs->trans('SendInterventionByMail'));
+ print load_fiche_titre($langs->trans('SendInterventionByMail'));
dol_fiche_head('');
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index d0bcee286d0a127194809f4c05d98c1144361953..e63fb8c3da01f243ccebe63d4dda11072078224e 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -43,24 +43,16 @@ class Fichinter extends CommonObject
*/
protected $table_ref_field = 'ref';
- var $id;
-
var $socid; // Id client
- var $client; // Objet societe client (a charger par fetch_client)
var $author;
- var $ref;
var $datec;
var $datev;
var $datem;
var $duration;
var $statut; // 0=draft, 1=validated, 2=invoiced
var $description;
- var $note_private;
- var $note_public;
- var $fk_project;
var $fk_contrat;
- var $modelpdf;
var $extraparams=array();
var $lines = array();
diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php
index 6885dca361a260a7e8128ba87317424d3d15cfa6..81a2db9621c5a530d0daecb680e6deb423b09b80 100644
--- a/htdocs/fichinter/index.php
+++ b/htdocs/fichinter/index.php
@@ -55,7 +55,7 @@ $help_url="EN:ModuleFichinters|FR:Module_Fiche_Interventions|ES:Módulo_FichaInt
llxHeader("",$langs->trans("Interventions"),$help_url);
-print_fiche_titre($langs->trans("InterventionsArea"));
+print load_fiche_titre($langs->trans("InterventionsArea"));
//print '<table width="100%" class="notopnoleftnoright">';
//print '<tr><td valign="top" width="30%" class="notopnoleft">';
diff --git a/htdocs/fichinter/tpl/linkedobjectblock.tpl.php b/htdocs/fichinter/tpl/linkedobjectblock.tpl.php
index 81a82f06627ba489f657304ac17a84ef305eae2f..0dc4a66c0830152b2b0b8951237d8b4d515c7ba6 100644
--- a/htdocs/fichinter/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fichinter/tpl/linkedobjectblock.tpl.php
@@ -26,7 +26,7 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
$langs->load("interventions");
echo '<br>';
-print_titre($langs->trans('RelatedInterventions'));
+print load_fiche_titre($langs->trans('RelatedInterventions'));
?>
<table class="noborder allwidth">
diff --git a/htdocs/fourn/class/fournisseur.class.php b/htdocs/fourn/class/fournisseur.class.php
index 5fc0b3e43dd4b9dca61d4b74d6268a4b8b42dd38..c8d1ccb846a55a493d3f891f30852ca975bb1626 100644
--- a/htdocs/fourn/class/fournisseur.class.php
+++ b/htdocs/fourn/class/fournisseur.class.php
@@ -33,8 +33,6 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
*/
class Fournisseur extends Societe
{
- var $db;
-
var $next_prev_filter="te.fournisseur = 1"; // Used to add a filter in Form::showrefnav method
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 233c0510b3a19cebe334c1605f9fcdfdb73bebd1..7b028ec89a1548b1df46668fda95181aa0cc5e90 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -1137,8 +1137,8 @@ class CommandeFournisseur extends CommonOrder
$this->db->begin();
- // Load source object
- $objFrom = dol_clone($this);
+ // Load source object
+ $objFrom = clone $this;
$this->id=0;
$this->statut=0;
diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index dc66e5abf9aa7be3783c8c68e5ba19cd34b6c40c..98876ab25191cf6da8a91427cff5ba5682509077 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -36,21 +36,6 @@ class PaiementFourn extends Paiement
public $element='payment_supplier';
public $table_element='paiementfourn';
- var $id;
- var $ref;
- var $facid;
- var $datepaye;
- var $total;
- var $amount; // Total amount of payment
- var $amounts=array(); // Array of amounts
- var $author;
- var $paiementid; // Type de paiement. Stocke dans fk_paiement
- // de llx_paiement qui est lie aux types de
- //paiement de llx_c_paiement
- var $num_paiement; // Numero du CHQ, VIR, etc...
- var $bank_account; // Id compte bancaire du paiement
- var $bank_line; // Id de la ligne d'ecriture bancaire
- var $note;
var $statut; //Status of payment. 0 = unvalidated; 1 = validated
// fk_paiement dans llx_paiement est l'id du type de paiement (7 pour CHQ, ...)
// fk_paiement dans llx_paiement_facture est le rowid du paiement
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index bb01b5b8f6a2aac7ad66e73ff38fcc6d6419ac68..4667200fdfcd9c18b734a82da7b663c32353011a 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1408,7 +1408,7 @@ $productstatic = new Product($db);
$now=dol_now();
if ($action=='create')
{
- print_fiche_titre($langs->trans('NewOrder'));
+ print load_fiche_titre($langs->trans('NewOrder'));
dol_htmloutput_events();
@@ -2305,7 +2305,7 @@ elseif (! empty($object->id))
print '<div class="clearboth"></div>';
print '<br>';
- print_fiche_titre($langs->trans('SendOrderByMail'));
+ print load_fiche_titre($langs->trans('SendOrderByMail'));
dol_fiche_head('');
@@ -2795,7 +2795,7 @@ elseif (! empty($object->id))
print '<form name="commande" action="card.php?id='.$object->id.'&action=commande" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="commande">';
- print_fiche_titre($langs->trans("ToOrder"),'','');
+ print load_fiche_titre($langs->trans("ToOrder"),'','');
print '<table class="border" width="100%">';
//print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("ToOrder").'</td></tr>';
print '<tr><td>'.$langs->trans("OrderDate").'</td><td>';
@@ -2823,7 +2823,7 @@ elseif (! empty($object->id))
print '<form action="card.php?id='.$object->id.'" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="livraison">';
- print_fiche_titre($langs->trans("Receive"),'','');
+ print load_fiche_titre($langs->trans("Receive"),'','');
print '<table class="border" width="100%">';
//print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Receive").'</td></tr>';
print '<tr><td>'.$langs->trans("DeliveryDate").'</td><td>';
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index fd992dbeeb13eb8a757b4d8cbfcfeccc63487830..57ee36eb8a3e956a365bb44fb461e9d7b538b7f4 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -613,7 +613,7 @@ if ($id > 0 || ! empty($ref))
{
print "<br/>\n";
- print_titre($langs->trans("ReceivingForSameOrder"));
+ print load_fiche_titre($langs->trans("ReceivingForSameOrder"));
print '<table class="noborder" width="100%">';
diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php
index c877589851de79f7cf9c751a9c5a40916253e008..cb91a65b341764e3e593498bff23eb9b076d6cc1 100644
--- a/htdocs/fourn/commande/index.php
+++ b/htdocs/fourn/commande/index.php
@@ -48,7 +48,7 @@ $commandestatic = new CommandeFournisseur($db);
$userstatic=new User($db);
$formfile = new FormFile($db);
-print_fiche_titre($langs->trans("SuppliersOrdersArea"));
+print load_fiche_titre($langs->trans("SuppliersOrdersArea"));
print '<table class="notopnoleftnoright" width="100%">';
print '<tr valign="top"><td class="notopnoleft" width="30%">';
diff --git a/htdocs/fourn/commande/orderstoinvoice.php b/htdocs/fourn/commande/orderstoinvoice.php
index a1fa57f97f478df9715ee2ee42e2044877a168d1..6fa03cb047537f972aa159cb3180da0efac62bae 100644
--- a/htdocs/fourn/commande/orderstoinvoice.php
+++ b/htdocs/fourn/commande/orderstoinvoice.php
@@ -262,7 +262,7 @@ $companystatic = new Societe($db);
if ($action == 'create' && !$error) {
llxHeader();
- print_fiche_titre($langs->trans('NewBill'));
+ print load_fiche_titre($langs->trans('NewBill'));
$soc = new Societe($db);
if ($socid)
@@ -442,7 +442,7 @@ if (($action != 'create' && $action != 'add') && !$error) {
$title = $langs->trans('ListOfSupplierOrders');
$title .= ' - ' . $langs->trans('StatusOrderReceivedAllShort');
$num = $db->num_rows($resql);
- print_fiche_titre($title);
+ print load_fiche_titre($title);
$i = 0;
$period = $html->select_date($date_start, 'date_start', 0, 0, 1, '', 1, 0, 1) . ' - ' . $html->select_date($date_end, 'date_end', 0, 0, 1, '', 1, 0, 1);
$periodely = $html->select_date($date_starty, 'date_start_dely', 0, 0, 1, '', 1, 0, 1) . ' - ' . $html->select_date($date_endy, 'date_end_dely', 0, 0, 1, '', 1, 0, 1);
diff --git a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
index cfcb5567bb6bb8bb8e16c796f50323e94619fced..c72386e3728f29dc9c1d7c4c16d678d232269866 100644
--- a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
@@ -29,7 +29,7 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
$langs->load("orders");
echo '<br>';
-print_titre($langs->trans('RelatedSupplierOrders'));
+print load_fiche_titre($langs->trans('RelatedSupplierOrders'));
?>
<table class="noborder allwidth">
<tr class="liste_titre">
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 332c9b01621d0db76e472bb164b7e9e1a69c46e7..5a54cc84068fda50c825204c9dd65a262f1c5d3c 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1238,7 +1238,7 @@ if ($action == 'create')
$facturestatic = new FactureFournisseur($db);
$extralabels = $extrafields->fetch_name_optionals_label($facturestatic->table_element);
- print_fiche_titre($langs->trans('NewBill'));
+ print load_fiche_titre($langs->trans('NewBill'));
dol_htmloutput_events();
@@ -1590,7 +1590,7 @@ if ($action == 'create')
print '<br>';
$title=$langs->trans('ProductsAndServices');
- print_titre($title);
+ print load_fiche_titre($title);
print '<table class="noborder" width="100%">';
@@ -2310,7 +2310,7 @@ else
print '<div class="clearboth"></div>';
print '<br>';
- print_fiche_titre($langs->trans('SendBillByMail'));
+ print load_fiche_titre($langs->trans('SendBillByMail'));
dol_fiche_head('');
diff --git a/htdocs/fourn/facture/impayees.php b/htdocs/fourn/facture/impayees.php
index dbe235cdebc62e5d493e3cb67f3c6c2399d45c5c..ecb6b990a645cf7f09b0c4d72a7c34fb14472f4f 100644
--- a/htdocs/fourn/facture/impayees.php
+++ b/htdocs/fourn/facture/impayees.php
@@ -181,7 +181,7 @@ if ($user->rights->fournisseur->facture->lire)
$link='';
if (empty($option)) $link='<a href="'.$_SERVER["PHP_SELF"].'?option=late'.($socid?'&socid='.$socid:'').'">'.$langs->trans("ShowUnpaidLateOnly").'</a>';
elseif ($option == 'late') $link='<a href="'.$_SERVER["PHP_SELF"].'?'.($socid?'&socid='.$socid:'').'">'.$langs->trans("ShowUnpaidAll").'</a>';
- print_fiche_titre($titre,$link);
+ print load_fiche_titre($titre,$link);
print_barre_liste('','',$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',0); // We don't want pagination on this page
$i = 0;
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 758885cef58e3280ac0d8754ad3ae59f9a63f8af..b94eceb0c1d2cbd7c29da5c4c7ea131d0cfe6475 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -271,7 +271,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
$obj = $db->fetch_object($resql);
$total = $obj->total;
- print_fiche_titre($langs->trans('DoPayment'));
+ print load_fiche_titre($langs->trans('DoPayment'));
print '<form id="payment_form" name="addpaiement" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -438,7 +438,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
$text.='<br>'.$langs->trans("AllCompletelyPayedInvoiceWillBeClosed");
print '<input type="hidden" name="closepaidinvoices" value="'.GETPOST('closepaidinvoices').'">';
}
- $form->form_confirm($_SERVER['PHP_SELF'].'?facid='.$facture->id.'&socid='.$facture->socid.'&type='.$facture->type,$langs->trans('PayedSuppliersPayments'),$text,'confirm_paiement',$formquestion,$preselectedchoice);
+ $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$facture->id.'&socid='.$facture->socid.'&type='.$facture->type,$langs->trans('PayedSuppliersPayments'),$text,'confirm_paiement',$formquestion,$preselectedchoice);
}
print '</form>';
diff --git a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
index 8678d22384bce4834f52ace944072c4ab3bb640a..29357b49dc3ab73f08d908001d10d9bfc74a7290 100644
--- a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
@@ -30,7 +30,7 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
$langs->load("bills");
echo '<br>';
-print_titre($langs->trans("RelatedSupplierInvoices"));
+print load_fiche_titre($langs->trans("RelatedSupplierInvoices"));
?>
<table class="noborder allwidth">
diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php
index 29f12fed38f4f72f0273d6cdecd82fb3c89121fa..bc16806cdc23ddd94bb5d54612551a7d3bc14785 100644
--- a/htdocs/fourn/index.php
+++ b/htdocs/fourn/index.php
@@ -48,7 +48,7 @@ $companystatic=new Societe($db);
llxHeader("",$langs->trans("SuppliersArea"));
-print_fiche_titre($langs->trans("SuppliersArea"));
+print load_fiche_titre($langs->trans("SuppliersArea"));
//print '<table border="0" width="100%" class="notopnoleftnoright">';
diff --git a/htdocs/fourn/recap-fourn.php b/htdocs/fourn/recap-fourn.php
index c09f52b84074e96cab0adea492fcbe626782218b..eb976acb4a0ed9d77a00d36ccef0293f6bd297ea 100644
--- a/htdocs/fourn/recap-fourn.php
+++ b/htdocs/fourn/recap-fourn.php
@@ -86,7 +86,7 @@ if ($socid > 0)
if (! empty($conf->fournisseur->enabled) && $user->rights->facture->lire)
{
// Invoices list
- print_fiche_titre($langs->trans("SupplierPreview"));
+ print load_fiche_titre($langs->trans("SupplierPreview"));
print '<table class="noborder" width="100%">';
diff --git a/htdocs/ftp/admin/ftpclient.php b/htdocs/ftp/admin/ftpclient.php
index 2ba73f0ee2a699087964c72fbbcee7272641dab1..de3a470ba908c107bc4aaeb8b8bc18cc38f4be5a 100644
--- a/htdocs/ftp/admin/ftpclient.php
+++ b/htdocs/ftp/admin/ftpclient.php
@@ -138,7 +138,7 @@ $form=new Form($db);
llxHeader();
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("FTPClientSetup"), $linkback, 'title_setup');
+print load_fiche_titre($langs->trans("FTPClientSetup"), $linkback, 'title_setup');
print '<br>';
if (! function_exists('ftp_connect'))
diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php
index afcb32811a9dd8bb8efdbf8351e49eef63e29748..b26e7b96f86d4839fd860dbd62f5eba395d44c6e 100644
--- a/htdocs/ftp/index.php
+++ b/htdocs/ftp/index.php
@@ -396,7 +396,7 @@ $userstatic = new User($db);
// List
-print_fiche_titre($langs->trans("FTPArea"));
+print load_fiche_titre($langs->trans("FTPArea"));
print $langs->trans("FTPAreaDesc")."<br>";
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index ebda47dd196878d9049ec4fd182458397b820317..25d23594787f68c6de7a57c112b4281e31d74003 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -678,7 +678,7 @@ if (empty($id) || $action == 'add' || $action == 'request' || $action == 'create
else
{
// Formulaire de demande de congés payés
- print_fiche_titre($langs->trans('MenuAddCP'), '', 'title_hrm.png');
+ print load_fiche_titre($langs->trans('MenuAddCP'), '', 'title_hrm.png');
// Si il y a une erreur
if (GETPOST('error')) {
@@ -782,10 +782,10 @@ if (empty($id) || $action == 'add' || $action == 'request' || $action == 'create
print '<td>';
if (empty($user->rights->holiday->write_all))
{
- print $form->select_users($userid,'useridbis',0,'',1);
+ print $form->select_dolusers($userid,'useridbis',0,'',1);
print '<input type="hidden" name="userid" value="'.$userid.'">';
}
- else print $form->select_users(GETPOST('userid')?GETPOST('userid'):$user->id,'userid',0,'',0);
+ else print $form->select_dolusers(GETPOST('userid')?GETPOST('userid'):$user->id,'userid',0,'',0);
print '</td>';
print '</tr>';
@@ -896,7 +896,7 @@ else
$userRequest = new User($db);
$userRequest->fetch($cp->fk_user);
- //print_fiche_titre($langs->trans('TitreRequestCP'));
+ //print load_fiche_titre($langs->trans('TitreRequestCP'));
// Si il y a une erreur
if (GETPOST('error'))
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 3e68bb6bce5eef92d466657bc3b537131bc1e4c8..6bb253319e0dd38a085a439ad22550d8e0c90dfb 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -34,16 +34,11 @@ class Holiday extends CommonObject
public $element='holiday';
public $table_element='holiday';
- var $db;
- var $error;
- var $errors=array();
-
/**
* @deprecated
* @see id
*/
var $rowid;
- var $ref;
var $fk_user;
var $date_create='';
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index 3c5d9f40ab4664326e8b8d3848f4da0349d6576c..62ad088a5ef109026ec527f12bd2fc80e954e660 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -149,7 +149,7 @@ $userstatic=new User($db);
llxHeader(array(),$langs->trans('CPTitreMenu'));
-print_fiche_titre($langs->trans('MenuConfCP'), '', 'title_hrm.png');
+print load_fiche_titre($langs->trans('MenuConfCP'), '', 'title_hrm.png');
print '<div class="info">'.$langs->trans('LastUpdateCP').': '."\n";
if ($holiday->getConfCP('lastUpdate')) print '<strong>'.dol_print_date($db->jdate($holiday->getConfCP('lastUpdate')),'dayhour','tzuser').'</strong>';
@@ -173,7 +173,7 @@ if ($cp_events == 1)
print '<br><form method="POST" action="'.$_SERVER["PHP_SELF"].'">'."\n";
print '<input type="hidden" name="action" value="add_event" />';
- print_fiche_titre($langs->trans('DefineEventUserCP'),'','');
+ print load_fiche_titre($langs->trans('DefineEventUserCP'),'','');
print $langs->trans('MotifCP').' : ';
print $holiday->selectEventCP();
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 4e10fbf925c5014482ff77824cb0be639b0b8cab..ee4465a4aeee6690fd3714b51859f6e144ba8624 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -198,7 +198,7 @@ else
// Si erreur SQL
if ($holiday_payes == '-1')
{
- print_fiche_titre($langs->trans('CPTitreMenu'), '', 'title_hrm.png');
+ print load_fiche_titre($langs->trans('CPTitreMenu'), '', 'title_hrm.png');
dol_print_error($db, $langs->trans('Error').' '.$holiday->error);
exit();
diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php
index caf04e90bd1eda91ccb588ed7fa5a6b250b1636f..e1204429100f801e97f963110824968dee9e6a4c 100644
--- a/htdocs/holiday/month_report.php
+++ b/htdocs/holiday/month_report.php
@@ -71,7 +71,7 @@ $sql.= " ORDER BY u.lastname,cp.date_debut";
$result = $db->query($sql);
$num = $db->num_rows($result);
-print_fiche_titre($langs->trans('MenuReportMonth'), '', 'title_hrm.png');
+print load_fiche_titre($langs->trans('MenuReportMonth'), '', 'title_hrm.png');
// Get month of last update
$lastUpdate = $cp->getConfCP('lastUpdate', 0);
diff --git a/htdocs/imports/index.php b/htdocs/imports/index.php
index 360e713f9abab50c384f7d1d5d4b7364ffed1edb..98da958430899be5ab49cfdd15ebcba7acde3fba 100644
--- a/htdocs/imports/index.php
+++ b/htdocs/imports/index.php
@@ -41,7 +41,7 @@ $form=new Form($db);
llxHeader('',$langs->trans("ImportArea"),'EN:Module_Imports_En|FR:Module_Imports|ES:Módulo_Importaciones');
-print_fiche_titre($langs->trans("ImportArea"));
+print load_fiche_titre($langs->trans("ImportArea"));
print $langs->trans("FormatedImportDesc1").'<br>';
print $langs->trans("FormatedImportDesc2").'<br>';
diff --git a/htdocs/index.php b/htdocs/index.php
index 7462b05b3e7f7d4eb2d9df3ede6dfcc4e37ae4aa..ef87f437084dc9157a12da0dabf91bd9d9a0f125 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -71,7 +71,7 @@ if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $title=$langs->trans("HomeAr
llxHeader('',$title);
-print_fiche_titre($langs->trans("HomeArea"),'','title_home');
+print load_fiche_titre($langs->trans("HomeArea"),'','title_home');
if (! empty($conf->global->MAIN_MOTD))
{
diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
index c2a1d7eb5eced5b6de3d9197c070730a50bd6c5e..6375a9296dcba7c23638f0e32230ebb0b281a60d 100755
--- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
+++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
@@ -42,3 +42,6 @@ create table llx_overwrite_trans
transvalue text
)ENGINE=innodb;
+ALTER TABLE llx_payment_salary ADD COLUMN datec datetime after tms;
+ALTER TABLE llx_payment_salary CHANGE COLUMN fk_user_creat fk_user_author integer;
+
diff --git a/htdocs/install/mysql/tables/llx_payment_salary.sql b/htdocs/install/mysql/tables/llx_payment_salary.sql
index bce4da9904af264ecf748e8a30efd272fe3e613c..38364c6812ec9507b8b6bf07fe26a1eca3a6e5ab 100644
--- a/htdocs/install/mysql/tables/llx_payment_salary.sql
+++ b/htdocs/install/mysql/tables/llx_payment_salary.sql
@@ -20,6 +20,7 @@ create table llx_payment_salary
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
tms timestamp,
+ datec datetime, -- Create date
fk_user integer NOT NULL,
datep date, -- date de paiement
datev date, -- date de valeur (this field should not be here, only into bank tables)
@@ -33,6 +34,6 @@ create table llx_payment_salary
entity integer DEFAULT 1 NOT NULL, -- multi company id
note text,
fk_bank integer,
- fk_user_creat integer, -- utilisateur qui a cree l'info
+ fk_user_author integer, -- utilisateur qui a cree l'info
fk_user_modif integer -- utilisateur qui a modifié l'info
)ENGINE=innodb;
\ No newline at end of file
diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php
index 54e45080efbf8a68d822ef12ebd85b7290974d9e..ec4feeb6bf998672f4ab27723a583a3ae03d8a48 100644
--- a/htdocs/livraison/card.php
+++ b/htdocs/livraison/card.php
@@ -238,7 +238,7 @@ $formfile = new FormFile($db);
if ($action == 'create')
{
- print_fiche_titre($langs->trans("CreateADeliveryOrder"));
+ print load_fiche_titre($langs->trans("CreateADeliveryOrder"));
if ($mesg)
{
diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php
index c996c2a1bc55c5d018f0cf3ea51dd03e4f87129f..d8eb9a80e5d897df1ac0cd809f29b034f17c3761 100644
--- a/htdocs/livraison/class/livraison.class.php
+++ b/htdocs/livraison/class/livraison.class.php
@@ -43,32 +43,15 @@ class Livraison extends CommonObject
public $fk_element="fk_livraison";
public $table_element="livraison";
- var $id;
var $brouillon;
- var $origin;
- var $origin_id;
var $socid;
var $ref_customer;
- var $statut;
-
- /**
- * @deprecated
- * @see note_public, note_private
- */
- var $note;
- var $note_public;
- var $note_private;
var $date_delivery; // Date really received
var $date_creation;
var $date_valid;
var $model_pdf;
- //Incorterms
- var $fk_incoterms;
- var $location_incoterms;
- var $libelle_incoterms; //Used into tooltip
-
/**
* Constructor
*
diff --git a/htdocs/loan/calc.php b/htdocs/loan/calc.php
index 6c96f01420a43ec07c67d2934f862f62893cc86c..e73b5e0f2553e0130e2090ea3226a28d4603093c 100644
--- a/htdocs/loan/calc.php
+++ b/htdocs/loan/calc.php
@@ -121,7 +121,7 @@ if (! empty($errors)) {
llxHeader();
-print_fiche_titre($langs->trans("LoanCalc"));
+print load_fiche_titre($langs->trans("LoanCalc"));
print $langs->trans('LoanCalcDesc');
print '<form method="GET" name="information" action="'.$_SERVER['PHP_SELF'].'">';
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 0c8309e724405f6661cd4ffb079cf806658f5459..c5e60a1acedb23cb13f141552ea14ddacd89d2e2 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -183,7 +183,7 @@ if ($action == 'create')
//WYSIWYG Editor
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
- print_fiche_titre($langs->trans("NewLoan"));
+ print load_fiche_titre($langs->trans("NewLoan"));
$datec = dol_mktime(12, 0, 0, GETPOST('remonth','int'), GETPOST('reday','int'), GETPOST('reyear','int'));
diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php
index 24ca97b5225eb30ef06147598cc2c208cb1cfefb..66809b60720e9b78fad66fdff65e8a802f8fea74 100644
--- a/htdocs/loan/class/loan.class.php
+++ b/htdocs/loan/class/loan.class.php
@@ -33,17 +33,13 @@ class Loan extends CommonObject
public $table='loan';
public $table_element='loan';
- var $id;
var $rowid;
- var $ref;
var $datestart;
var $dateend;
var $label;
var $capital;
var $nbterm;
var $rate;
- var $note_private;
- var $note_public;
var $paid;
var $account_capital;
var $account_insurance;
diff --git a/htdocs/loan/class/paymentloan.class.php b/htdocs/loan/class/paymentloan.class.php
index 03517b91adf80d9af8c1ffc093d7a906a0b49d3e..09c3e0b4fbc172d5aeb39ccfb987a404547cfcea 100644
--- a/htdocs/loan/class/paymentloan.class.php
+++ b/htdocs/loan/class/paymentloan.class.php
@@ -33,9 +33,6 @@ class PaymentLoan extends CommonObject
public $element='payment_loan'; //!< Id that identify managed objects
public $table_element='payment_loan'; //!< Name of table without prefix where object is stored
- var $id;
- var $ref;
-
var $fk_loan;
var $datec='';
var $tms='';
@@ -46,8 +43,6 @@ class PaymentLoan extends CommonObject
var $amount_interest;
var $fk_typepayment;
var $num_payment;
- var $note_private;
- var $note_public;
var $fk_bank;
var $fk_user_creat;
var $fk_user_modif;
diff --git a/htdocs/loan/index.php b/htdocs/loan/index.php
index 87412dadcd2eefb422f0dfaa136d49bda8f6b3a7..31985251300aecc98fbe31339bec96f1406cf1d9 100644
--- a/htdocs/loan/index.php
+++ b/htdocs/loan/index.php
@@ -92,7 +92,7 @@ if ($resql)
$i = 0;
$var=true;
- print_fiche_titre($langs->trans("Loans"));
+ print load_fiche_titre($langs->trans("Loans"));
print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">'."\n";
print '<table class="noborder" width="100%">';
diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php
index a9e33fc54a206a47c68f346d34ffad20caea0fdb..e7416c1aa0d0d32f4afd980b6429764927ba3443 100644
--- a/htdocs/loan/payment/payment.php
+++ b/htdocs/loan/payment/payment.php
@@ -156,7 +156,7 @@ if ($_GET["action"] == 'create')
{
$total = $loan->capital;
- print_fiche_titre($langs->trans("DoPayment"));
+ print load_fiche_titre($langs->trans("DoPayment"));
print "<br>\n";
print '<form name="add_payment" action="'.$_SERVER['PHP_SELF'].'" method="post">';
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 74a75b234ea66994f999476046319d0019c129ec..71dc8df10e5a29f8a416f5bf6fc55edd2d09c0fe 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -35,7 +35,6 @@
//@ini_set('memory_limit', '64M'); // This may be useless if memory is hard limited by your PHP
// For optional tuning. Enabled if environment variable MAIN_SHOW_TUNING_INFO is defined.
-// A call first. Is the equivalent function dol_microtime_float not yet loaded.
$micro_start_time=0;
if (! empty($_SERVER['MAIN_SHOW_TUNING_INFO']))
{
diff --git a/htdocs/margin/admin/margin.php b/htdocs/margin/admin/margin.php
index 2ad51c4fb28d5641d22806eae7d1244bd0d3653b..0c561f99bc9584d56666c958d3a87c26709e661b 100644
--- a/htdocs/margin/admin/margin.php
+++ b/htdocs/margin/admin/margin.php
@@ -113,14 +113,14 @@ llxHeader('',$langs->trans("margesSetup"));
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("margesSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("margesSetup"),$linkback,'title_setup');
$head = marges_admin_prepare_head();
dol_fiche_head($head, 'parameters', $langs->trans("Margins"), 0, 'margin');
-print_fiche_titre($langs->trans("MemberMainOptions"),'','');
+print load_fiche_titre($langs->trans("MemberMainOptions"),'','');
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td width=300>'.$langs->trans("Description").'</td>';
diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index 32525114ee3c73e1df423b5569b63c1097b1d0c1..bad64c262dde1e8f37f72d47054e16927d37135e 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -80,7 +80,7 @@ $form = new Form($db);
llxHeader('',$langs->trans("Margins").' - '.$langs->trans("Agents"));
$text=$langs->trans("Margins");
-//print_fiche_titre($text);
+//print load_fiche_titre($text);
// Show tabs
$head=marges_prepare_head($user);
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index 79c241a9d7ecb9fa1b862d01299623bfeda676e8..93f3220d12cc6c22c70442937bdd06ccf6886246 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -66,7 +66,7 @@ $form = new Form($db);
llxHeader('',$langs->trans("Margins").' - '.$langs->trans("Clients"));
$text=$langs->trans("Margins");
-//print_fiche_titre($text);
+//print load_fiche_titre($text);
// Show tabs
$head=marges_prepare_head($user);
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index 07d4a75a5226083ecccde85c571f0b99528d6535..0993f59f63188a120f570eb9a9881764df5f7aa0 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -89,7 +89,7 @@ $form = new Form($db);
llxHeader('',$langs->trans("Margins").' - '.$langs->trans("Products"));
$text=$langs->trans("Margins");
-//print_fiche_titre($text);
+//print load_fiche_titre($text);
// Show tabs
$head=marges_prepare_head($user);
diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php
index 87373c571f8fbf0b73e3c3a2f3fdbd523a591faa..200659c856e35777db795d0a166483bd5b720ef8 100644
--- a/htdocs/opensurvey/card.php
+++ b/htdocs/opensurvey/card.php
@@ -361,7 +361,7 @@ print '<br>';
print '<form name="formulaire5" action="#" method="POST">'."\n";
-print_fiche_titre($langs->trans("CommentsOfVoters"),'','');
+print load_fiche_titre($langs->trans("CommentsOfVoters"),'','');
// Comment list
$comments = $object->getComments();
diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php
index 1ab2352395de884668abd80410c77c3fcf0098b6..c3be8fc4793700f64c2093534749b9d3555e6f8e 100644
--- a/htdocs/opensurvey/class/opensurveysondage.class.php
+++ b/htdocs/opensurvey/class/opensurveysondage.class.php
@@ -34,14 +34,9 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
*/
class Opensurveysondage extends CommonObject
{
- var $db; //!< To store db handler
- var $error; //!< To return error code (or message)
- var $errors=array(); //!< To return several error codes (or messages)
var $element='opensurvey_sondage'; //!< Id that identify managed objects
var $table_element='opensurvey_sondage'; //!< Name of table without prefix where object is stored
- var $id;
-
var $id_sondage;
/**
* @deprecated
diff --git a/htdocs/opensurvey/index.php b/htdocs/opensurvey/index.php
index 08c8f8d7d95426783762fffb485f73a915721941..93e913c1585c6825d7a8453de0463cfb184fd360 100644
--- a/htdocs/opensurvey/index.php
+++ b/htdocs/opensurvey/index.php
@@ -48,7 +48,7 @@ else dol_print_error($db,'');
-print_fiche_titre($langs->trans("OpenSurveyArea"));
+print load_fiche_titre($langs->trans("OpenSurveyArea"));
print '<div class="fichecenter"><div class="fichethirdleft">';
diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php
index cea060d75f41c43c1869a5b56814ab0169981098..4844d9f8e5941342197c1973da70914b036235ef 100644
--- a/htdocs/opensurvey/list.php
+++ b/htdocs/opensurvey/list.php
@@ -79,7 +79,7 @@ $fieldtosortuser=empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)?'firstname':
print '<div class="corps">'."\n";
-print_fiche_titre($langs->trans("OpenSurveyArea"));
+print load_fiche_titre($langs->trans("OpenSurveyArea"));
// List of surveys into database
diff --git a/htdocs/opensurvey/wizard/choix_autre.php b/htdocs/opensurvey/wizard/choix_autre.php
index 6b4cceaae0d2c69bbdafbc453ec561d5f848254a..9797762d6cbed3ca6703fffc20bc797bfc22b5eb 100644
--- a/htdocs/opensurvey/wizard/choix_autre.php
+++ b/htdocs/opensurvey/wizard/choix_autre.php
@@ -121,7 +121,7 @@ if (empty($_SESSION['titre']))
print '<form name="formulaire" action="#bas" method="POST">'."\n";
-print_fiche_titre($langs->trans("CreatePoll").' (2 / 2)');
+print load_fiche_titre($langs->trans("CreatePoll").' (2 / 2)');
print '<br>'. $langs->trans("PollOnChoice") .'<br><br>'."\n";
diff --git a/htdocs/opensurvey/wizard/choix_date.php b/htdocs/opensurvey/wizard/choix_date.php
index cc08434cd509fd5c121b0dfb7c830244470d0205..6a1efd3961748692dccb497d7d74066ac586fca8 100644
--- a/htdocs/opensurvey/wizard/choix_date.php
+++ b/htdocs/opensurvey/wizard/choix_date.php
@@ -330,7 +330,7 @@ else
//Debut du formulaire et bandeaux de tete
print '<form name="formulaire" action="" method="POST">'."\n";
-print_fiche_titre($langs->trans("CreatePoll").' (2 / 2)');
+print load_fiche_titre($langs->trans("CreatePoll").' (2 / 2)');
//affichage de l'aide pour les jours
print '<div class="bodydate">'."\n";
diff --git a/htdocs/opensurvey/wizard/create_survey.php b/htdocs/opensurvey/wizard/create_survey.php
index 5f14e6387f179112e86eb04eea18ce5159fa8fd2..22dddffbff5fc36d0b9e60880124794d3e007c65 100644
--- a/htdocs/opensurvey/wizard/create_survey.php
+++ b/htdocs/opensurvey/wizard/create_survey.php
@@ -131,7 +131,7 @@ $arrayofjs=array();
$arrayofcss=array('/opensurvey/css/style.css');
llxHeader('', $langs->trans("OpenSurvey"), '', "", 0, 0, $arrayofjs, $arrayofcss);
-print_fiche_titre($langs->trans("CreatePoll").' (1 / 2)');
+print load_fiche_titre($langs->trans("CreatePoll").' (1 / 2)');
//debut du formulaire
print '<form name="formulaire" action="" method="POST">'."\n";
diff --git a/htdocs/opensurvey/wizard/index.php b/htdocs/opensurvey/wizard/index.php
index 1f324a52a58e52f97d783df2935bc780958be5ec..68f75f3bce700152f2977d321aab5c58a9b0b497 100644
--- a/htdocs/opensurvey/wizard/index.php
+++ b/htdocs/opensurvey/wizard/index.php
@@ -41,7 +41,7 @@ $arrayofjs=array();
$arrayofcss=array('/opensurvey/css/style.css');
llxHeader('', $langs->trans("Survey"), '', "", 0, 0, $arrayofjs, $arrayofcss);
-print_fiche_titre($langs->trans("CreatePoll"));
+print load_fiche_titre($langs->trans("CreatePoll"));
print '<form name="formulaire" action="create_survey.php" method="POST">';
print '<div class="center">';
diff --git a/htdocs/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php
index 208559758804f23d74c507016a7fd2483c9d3c21..5a7301613c4410127a3d86b6d8efed3ae0fb16d8 100644
--- a/htdocs/paybox/admin/paybox.php
+++ b/htdocs/paybox/admin/paybox.php
@@ -91,7 +91,7 @@ if (empty($conf->global->PAYBOX_IBS_DEVISE)) $conf->global->PAYBOX_IBS_DEVISE=$I
llxHeader();
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("PayBoxSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("PayBoxSetup"),$linkback,'title_setup');
print $langs->trans("PayBoxDesc")."<br>\n";
diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php
index a0127cd85d91590ce888e533a1bf2c4797eee5a6..fd649b825bc21237d340fc0ce8c4539a69c5a08b 100644
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@@ -93,7 +93,7 @@ llxHeader('',$langs->trans("PaypalSetup"));
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("ModuleSetup").' PayPal',$linkback);
+print load_fiche_titre($langs->trans("ModuleSetup").' PayPal',$linkback);
print '<br>';
$head=paypaladmin_prepare_head();
diff --git a/htdocs/printing/admin/printing.php b/htdocs/printing/admin/printing.php
index d848b0befcee0b1046481fcce9b80a6f8e7ef960..cc97b7cc9f782e64fcb034cff8ce62a533824e69 100644
--- a/htdocs/printing/admin/printing.php
+++ b/htdocs/printing/admin/printing.php
@@ -107,7 +107,7 @@ $form = new Form($db);
llxHeader('',$langs->trans("PrintingSetup"));
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("PrintingSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("PrintingSetup"),$linkback,'title_setup');
$head=printingadmin_prepare_head($mode);
diff --git a/htdocs/printing/index.php b/htdocs/printing/index.php
index 48795fbab4c5852499bcf03b1886ac3eadf3cd94..1ff3859565c3fc61fecda6609f38bb1771d76365 100644
--- a/htdocs/printing/index.php
+++ b/htdocs/printing/index.php
@@ -27,7 +27,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/dolprintipp.class.php';
llxHeader("",$langs->trans("Printing"));
-print_fiche_titre($langs->trans("Printing"));
+print load_fiche_titre($langs->trans("Printing"));
// List Jobs from printing modules
$printer = new dolPrintIPP($db,$conf->global->PRINTIPP_HOST,$conf->global->PRINTIPP_PORT,$user->login,$conf->global->PRINTIPP_USER,$conf->global->PRINTIPP_PASSWORD);
diff --git a/htdocs/product/admin/dynamic_prices.php b/htdocs/product/admin/dynamic_prices.php
index f45ea9449c69710afbb4077a2ec4b1047fabd17c..79d7cdebfc2a6c3cc1e5e0a6197a15d85291f325 100644
--- a/htdocs/product/admin/dynamic_prices.php
+++ b/htdocs/product/admin/dynamic_prices.php
@@ -144,7 +144,7 @@ if (!empty($action) && empty($cancel)) {
//Header
llxHeader("","",$langs->trans("CardProduct".$product->type));
-print_fiche_titre($langs->trans("DynamicPriceConfiguration"));
+print load_fiche_titre($langs->trans("DynamicPriceConfiguration"));
$form = new Form($db);
//Global variables table
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index 949d180a5bab18ffeb04fcd6934dd76cf6da48cc..9c264f893b38fcf35eca7f9385778ac0ec2172e6 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -225,7 +225,7 @@ else if (empty($conf->service->enabled))
llxHeader('',$title);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($title,$linkback,'title_setup');
+print load_fiche_titre($title,$linkback,'title_setup');
$head = product_admin_prepare_head();
dol_fiche_head($head, 'general', $tab, 0, 'product');
@@ -237,7 +237,7 @@ $form=new Form($db);
*/
$dirproduct=array('/core/modules/product/');
-print_titre($langs->trans("ProductCodeChecker"));
+print load_fiche_titre($langs->trans("ProductCodeChecker"));
print '<table class="noborder" width="100%">'."\n";
print '<tr class="liste_titre">'."\n";
@@ -319,7 +319,7 @@ print '</table>';
print "<br>";
-print_titre($langs->trans("ProductOtherConf"));
+print load_fiche_titre($langs->trans("ProductOtherConf"));
diff --git a/htdocs/product/admin/product_extrafields.php b/htdocs/product/admin/product_extrafields.php
index f610b51fe8140abd95fabdac4c170b2e25c89194..3c7cc30b7a3120b7ed06caa8398d75f2f8bdada3 100644
--- a/htdocs/product/admin/product_extrafields.php
+++ b/htdocs/product/admin/product_extrafields.php
@@ -78,7 +78,7 @@ llxHeader('',$title);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($title,$linkback,'title_setup');
+print load_fiche_titre($title,$linkback,'title_setup');
$head = product_admin_prepare_head();
@@ -108,7 +108,7 @@ if ($action != 'create' && $action != 'edit')
if ($action == 'create')
{
print "<br>";
- print_titre($langs->trans('NewAttribute'));
+ print load_fiche_titre($langs->trans('NewAttribute'));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
}
@@ -121,7 +121,7 @@ if ($action == 'create')
if ($action == 'edit' && ! empty($attrname))
{
print "<br>";
- print_titre($langs->trans("FieldEdition", $attrname));
+ print load_fiche_titre($langs->trans("FieldEdition", $attrname));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
}
diff --git a/htdocs/product/admin/product_tools.php b/htdocs/product/admin/product_tools.php
index deaf53f0bd2221b1f93c5b0debad398f99b863e5..1f2820358e158245e8771b8f03b323adf08e45d4 100644
--- a/htdocs/product/admin/product_tools.php
+++ b/htdocs/product/admin/product_tools.php
@@ -246,7 +246,7 @@ $title = $langs->trans('ModulesSystemTools');
llxHeader('',$title);
-print_fiche_titre($title,'','title_setup');
+print load_fiche_titre($title,'','title_setup');
print $langs->trans("ProductVatMassChangeDesc").'<br><br>';
diff --git a/htdocs/product/canvas/product/tpl/card_create.tpl.php b/htdocs/product/canvas/product/tpl/card_create.tpl.php
index 3f5ebdcbc0b0091a0f4b4a12c1a95cf13e8adc8d..81ddb147fe3da1d1aaeab894d9405756fec604c4 100644
--- a/htdocs/product/canvas/product/tpl/card_create.tpl.php
+++ b/htdocs/product/canvas/product/tpl/card_create.tpl.php
@@ -22,7 +22,7 @@ $statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSe
<!-- BEGIN PHP TEMPLATE -->
-<?php print_fiche_titre($langs->trans("Product")); ?>
+<?php print load_fiche_titre($langs->trans("Product")); ?>
<?php dol_htmloutput_errors((is_numeric($object->error)?'':$object->error),$object->errors); ?>
diff --git a/htdocs/product/canvas/product/tpl/card_edit.tpl.php b/htdocs/product/canvas/product/tpl/card_edit.tpl.php
index 9b403c223162c082f9041ffb987dacd837263542..822cb03a6e021f608f85476ba6dd831add1c2b05 100644
--- a/htdocs/product/canvas/product/tpl/card_edit.tpl.php
+++ b/htdocs/product/canvas/product/tpl/card_edit.tpl.php
@@ -23,7 +23,7 @@ $statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSe
<!-- BEGIN PHP TEMPLATE -->
<?php
-print_fiche_titre($langs->trans("Product"));
+print load_fiche_titre($langs->trans("Product"));
dol_htmloutput_errors($object->error,$object->errors);
?>
diff --git a/htdocs/product/canvas/service/tpl/card_create.tpl.php b/htdocs/product/canvas/service/tpl/card_create.tpl.php
index c9bb423d0a2e9e32ebc98f843cb5ba93b34a6adb..9d526383a677b6a806540039e90edde4ff4d2764 100644
--- a/htdocs/product/canvas/service/tpl/card_create.tpl.php
+++ b/htdocs/product/canvas/service/tpl/card_create.tpl.php
@@ -23,7 +23,7 @@ $statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSe
<!-- BEGIN PHP TEMPLATE CREATE.TPL -->
-<?php print_fiche_titre($langs->trans("Service")); ?>
+<?php print load_fiche_titre($langs->trans("Service")); ?>
<?php dol_htmloutput_errors($this->control->tpl['error'],$this->control->tpl['errors']); ?>
diff --git a/htdocs/product/canvas/service/tpl/card_edit.tpl.php b/htdocs/product/canvas/service/tpl/card_edit.tpl.php
index 9f64bebd042477e18be176207dde2e460ab4f4d2..fd403e647c6474552ccaa42ebe6f6f50d5a502f6 100644
--- a/htdocs/product/canvas/service/tpl/card_edit.tpl.php
+++ b/htdocs/product/canvas/service/tpl/card_edit.tpl.php
@@ -23,7 +23,7 @@ $statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSe
<!-- BEGIN PHP TEMPLATE EDIT.TPL -->
<?php
-print_fiche_titre($langs->trans("Service"));
+print load_fiche_titre($langs->trans("Service"));
dol_htmloutput_errors($object->error,$object->errors);
?>
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 18e0153ed777ed2673a3473b79f55f770eac1e5b..c97eb46c406282304b5380d1fedccaad7bfc42e4 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -315,7 +315,7 @@ if (empty($reshook))
{
if ($object->id > 0)
{
- $object->oldcopy=dol_clone($object);
+ $object->oldcopy= clone $object;
$object->ref = $ref;
$object->label = GETPOST('label');
@@ -806,7 +806,7 @@ else
if ($type==1) $title=$langs->trans("NewService");
else $title=$langs->trans("NewProduct");
$linkback="";
- print_fiche_titre($title,$linkback,'title_products.png');
+ print load_fiche_titre($title,$linkback,'title_products.png');
dol_fiche_head('');
@@ -1060,7 +1060,7 @@ else
$type = $langs->trans('Product');
if ($object->isservice()) $type = $langs->trans('Service');
- //print_fiche_titre($langs->trans('Modify').' '.$type.' : '.(is_object($object->oldcopy)?$object->oldcopy->ref:$object->ref), "");
+ //print load_fiche_titre($langs->trans('Modify').' '.$type.' : '.(is_object($object->oldcopy)?$object->oldcopy->ref:$object->ref), "");
// Main official, simple, and not duplicated code
print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="POST">'."\n";
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 28e05ddd521121aae0c815d4f8d6821f0eac2ff9..35aff5e4cc543c820db8a0a5ec3649426904c9e9 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -55,10 +55,6 @@ class Product extends CommonObject
var $regeximgext='\.jpg|\.jpeg|\.bmp|\.gif|\.png|\.tiff';
- //! Identifiant unique
- var $id ;
- //! Ref
- var $ref;
/*
* @deprecated
* @see label
@@ -128,8 +124,6 @@ class Product extends CommonObject
var $status_batch;
var $customcode; // Customs code
- var $country_id; // Country origin id
- var $country_code; // Country origin code (US, FR, ...)
//! Unites de mesure
var $weight;
@@ -146,10 +140,6 @@ class Product extends CommonObject
//! barcode
var $barcode; // value
- var $barcode_type; // id
- var $barcode_type_code; // code (loaded by fetch_barcode). Example 'ean', 'isbn', ...
- var $barcode_type_label; // label (loaded by fetch_barcode)
- var $barcode_type_coder; // coder (loaded by fetch_barcode). Engine.
var $stats_propale=array();
var $stats_commande=array();
@@ -163,10 +153,6 @@ class Product extends CommonObject
var $imgWidth;
var $imgHeight;
- //! Canevas a utiliser si le produit n'est pas un produit generique
- var $canvas;
-
- var $import_key;
var $date_creation;
var $date_modification;
@@ -183,9 +169,6 @@ class Product extends CommonObject
var $oldcopy;
- //note not visible on orders and invoices
- var $note;
-
var $fk_price_expression;
/**
diff --git a/htdocs/product/class/productbatch.class.php b/htdocs/product/class/productbatch.class.php
index 8eac443c244f22b72ca8837a3867207a6d9ac17b..44d1025b3dbc8fedaaa061da446161c5763c2809 100644
--- a/htdocs/product/class/productbatch.class.php
+++ b/htdocs/product/class/productbatch.class.php
@@ -33,15 +33,12 @@ class Productbatch extends CommonObject
var $element='productbatch'; //!< Id that identify managed objects
private static $_table_element='product_batch'; //!< Name of table without prefix where object is stored
- var $id;
-
var $tms='';
var $fk_product_stock;
var $sellby='';
var $eatby='';
var $batch='';
var $qty;
- var $import_key;
public $warehouseid;
diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php
index 1bca4579070f48d9bf3ffc38219acb73d2fdee9e..8cf659c9b89f50c307d7548ae8f6265c89385037 100644
--- a/htdocs/product/class/productcustomerprice.class.php
+++ b/htdocs/product/class/productcustomerprice.class.php
@@ -28,12 +28,8 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
*/
class Productcustomerprice extends CommonObject
{
- var $db; // !< To store db handler
- var $error; // !< To return error code (or message)
- var $errors = array (); // !< To return several error codes (or messages)
var $element = 'product_customer_price'; // !< Id that identify managed objects
var $table_element = 'product_customer_price'; // !< Name of table without prefix where object is stored
- var $id;
var $entity;
var $datec = '';
var $tms = '';
@@ -49,7 +45,6 @@ class Productcustomerprice extends CommonObject
var $localtax1_tx;
var $localtax2_tx;
var $fk_user;
- var $import_key;
var $lines = array ();
/**
diff --git a/htdocs/product/class/propalmergepdfproduct.class.php b/htdocs/product/class/propalmergepdfproduct.class.php
index a0a50f9acbd32e76d5891430ef9d590d834c6f1c..865589692fbc8d267fd3b8207026a82092dfa77a 100644
--- a/htdocs/product/class/propalmergepdfproduct.class.php
+++ b/htdocs/product/class/propalmergepdfproduct.class.php
@@ -31,13 +31,8 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
*/
class Propalmergepdfproduct extends CommonObject
{
- var $db; //!< To store db handler
- var $error; //!< To return error code (or message)
- var $errors=array(); //!< To return several error codes (or messages)
var $element='propal_merge_pdf_product'; //!< Id that identify managed objects
var $table_element='propal_merge_pdf_product'; //!< Name of table without prefix where object is stored
-
- var $id;
var $fk_product;
var $file_name;
@@ -45,7 +40,6 @@ class Propalmergepdfproduct extends CommonObject
var $fk_user_mod;
var $datec='';
var $tms='';
- var $import_key;
var $lang;
var $lines=array();
diff --git a/htdocs/product/class/service.class.php b/htdocs/product/class/service.class.php
index 7ba5db47d1ca91d981b96298d7ee83349a8695d4..2cd785527a5bc1dc53642d2be303774420a6769e 100644
--- a/htdocs/product/class/service.class.php
+++ b/htdocs/product/class/service.class.php
@@ -29,9 +29,6 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
*/
class Service extends CommonObject
{
- var $db;
-
- var $id;
var $libelle;
var $price;
var $tms;
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index 96e4c955cd671d4177dbae25e5e040e593b45822..b813ad786aca970002512200f72eddea526cd6d0 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -260,7 +260,7 @@ if ($id > 0 || ! empty($ref))
//if (count($prodsfather) > 0)
//{
- print_fiche_titre($langs->trans("ProductParentList"),'','').'<br>';
+ print load_fiche_titre($langs->trans("ProductParentList"),'','').'<br>';
print '<table class="centpercent noborder">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans('ParentProduct').'</td>';
@@ -308,7 +308,7 @@ if ($id > 0 || ! empty($ref))
//if (count($prods_arbo) > 0)
//{
$atleastonenotdefined=0;
- print_fiche_titre($langs->trans("ProductAssociationList"),'','').'<br>';
+ print load_fiche_titre($langs->trans("ProductAssociationList"),'','').'<br>';
print '<form name="formComposedProduct" action="'.$_SERVER['PHP_SELF'].'" method="post">';
print '<input type="hidden" name="action" value="save_composed_product" />';
@@ -458,7 +458,7 @@ if ($id > 0 || ! empty($ref))
$rowspan=1;
if (! empty($conf->categorie->enabled)) $rowspan++;
- print_fiche_titre($langs->trans("ProductToAddSearch"),'','');
+ print load_fiche_titre($langs->trans("ProductToAddSearch"),'','');
print '<form action="'.DOL_URL_ROOT.'/product/composition/card.php?id='.$id.'" method="POST">';
print '<table class="border" width="100%"><tr><td>';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
diff --git a/htdocs/product/dynamic_price/editor.php b/htdocs/product/dynamic_price/editor.php
index e05ad53a27ed0eb7e72e5e27500dfb3b5f28167d..ba00d3be3bd410fab8f1e29759891cc9e4f298e1 100644
--- a/htdocs/product/dynamic_price/editor.php
+++ b/htdocs/product/dynamic_price/editor.php
@@ -163,7 +163,7 @@ if ($action == 'delete')
//Header
llxHeader("","",$langs->trans("CardProduct".$product->type));
-print_fiche_titre($langs->trans("PriceExpressionEditor"));
+print load_fiche_titre($langs->trans("PriceExpressionEditor"));
$form = new Form($db);
//Form/Table
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 866abd856b1d6b378d3c9b4612c7d613010abd7d..4d20f1f7302c550d7763f9881e42f3c6ab03252e 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -311,11 +311,11 @@ if ($id || $ref)
if ($rowid)
{
$product->fetch_product_fournisseur_price($rowid, 1); //Ignore the math expression when getting the price
- print_fiche_titre($langs->trans("ChangeSupplierPrice"));
+ print load_fiche_titre($langs->trans("ChangeSupplierPrice"));
}
else
{
- print_fiche_titre($langs->trans("AddSupplierPrice"));
+ print load_fiche_titre($langs->trans("AddSupplierPrice"));
}
print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$product->id.'" method="POST">';
@@ -399,7 +399,7 @@ if ($id || $ref)
// We don't have supplier, so we try to guess.
// For this we build a fictive supplier with same properties than user but using vat)
- $mysoc2=dol_clone($mysoc);
+ $mysoc2 = clone $mysoc;
$mysoc2->name='Fictive seller with same country';
$mysoc2->tva_assuj=1;
$default_vat=get_default_tva($mysoc2, $mysoc, $product->id, 0);
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index 1b8babd9a3673c374db668ea3dfa0e5d25eeb800..efa1bc33dcb6d99bf370324abe7c30a729ac245c 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -69,7 +69,7 @@ if ((isset($_GET["type"]) && $_GET["type"] == 1) || empty($conf->product->enable
llxHeader("",$langs->trans("ProductsAndServices"),$helpurl);
$linkback="";
-print_fiche_titre($transAreaType,$linkback,'title_products.png');
+print load_fiche_titre($transAreaType,$linkback,'title_products.png');
print '<div class="fichecenter"><div class="fichethirdleft">';
diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php
index 8f419aa36798077e4e21636406aec607672527e2..c8da665dd98ba7be78c1dacb21fc06a88e2741d3 100644
--- a/htdocs/product/popuprop.php
+++ b/htdocs/product/popuprop.php
@@ -75,7 +75,7 @@ else if ($type == '1')
llxHeader('','',$helpurl);
-print_fiche_titre($title, $mesg,'title_products.png');
+print load_fiche_titre($title, $mesg,'title_products.png');
$param = '';
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index b3b884cbd7e420e651829b1f13e091d230bd466d..9c1331f61ce15cbeef45214166f099b8751f396b 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -683,7 +683,7 @@ if (! $action || $action == 'delete' || $action == 'showlog_customer_price' || $
*/
if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights->service->creer))
{
- print_fiche_titre($langs->trans("NewPrice"), '');
+ print load_fiche_titre($langs->trans("NewPrice"), '');
if (empty($conf->global->PRODUIT_MULTIPRICES))
{
@@ -880,7 +880,7 @@ if ($result)
if ($num > 0)
{
- if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) print_fiche_titre($langs->trans("DefaultPrice"),'','');
+ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) print load_fiche_titre($langs->trans("DefaultPrice"),'','');
print '<table class="noborder" width="100%">';
@@ -1013,7 +1013,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
// Create mode
$maxpricesupplier = $object->min_recommended_price();
- print_fiche_titre($langs->trans('PriceByCustomer'));
+ print load_fiche_titre($langs->trans('PriceByCustomer'));
print '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="POST">';
print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
@@ -1092,7 +1092,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
// Edit mode
$maxpricesupplier = $object->min_recommended_price();
- print_fiche_titre($langs->trans('PriceByCustomer'));
+ print load_fiche_titre($langs->trans('PriceByCustomer'));
$result = $prodcustprice->fetch(GETPOST('lineid', 'int'));
if ($result < 0) {
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 22ed390bc8f0ebdfb66abaebd63ef8bddf7833de..9be03e9dee00b9ba145dcaf238b06bec64c370e1 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -174,7 +174,7 @@ llxHeader("",$langs->trans("WarehouseCard"),$help_url);
if ($action == 'create')
{
- print_fiche_titre($langs->trans("NewWarehouse"));
+ print load_fiche_titre($langs->trans("NewWarehouse"));
print "<form action=\"card.php\" method=\"post\">\n";
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 006be0e679365399c30844831c51f30612fa0d39..8d1a507ab26b89cd621c382e5b0afebbeb5e4aa0 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -35,7 +35,6 @@ class Entrepot extends CommonObject
public $element='stock';
public $table_element='entrepot';
- var $id;
var $libelle;
var $description;
//! Statut 1 pour ouvert, 0 pour ferme
@@ -46,10 +45,6 @@ class Entrepot extends CommonObject
var $zip;
var $town;
- var $country;
- var $country_id;
- var $country_code;
-
/**
* Constructor
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index a612b7137cd3b33d888a33807d6c467373d115d0..819f1afb67701995ff301f8f959367b9d0e8c7a2 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -30,9 +30,6 @@
*/
class MouvementStock extends CommonObject
{
- var $error;
- var $db;
-
var $product_id;
var $entrepot_id;
var $qty;
@@ -433,7 +430,7 @@ class MouvementStock extends CommonObject
// Create movement for each subproduct
foreach($pids as $key => $value)
{
- $tmpmove = dol_clone($this);
+ $tmpmove = clone $this;
$tmpmove->_create($user, $pids[$key], $entrepot_id, ($qty * $pqtys[$key]), $type, 0, $label, $inventorycode); // This will also call _createSubProduct making this recursive
unset($tmpmove);
}
diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php
index f5d2b9829b81349c2a3f2313f36de625dcc8d089..cfc9f4a7b7a56c3ed80ac92a55cecddca3d07a34 100644
--- a/htdocs/product/stock/index.php
+++ b/htdocs/product/stock/index.php
@@ -40,7 +40,7 @@ $result=restrictedArea($user,'stock');
$help_url='EN:Module_Stocks_En|FR:Module_Stock|ES:Módulo_Stocks';
llxHeader("",$langs->trans("Stocks"),$help_url);
-print_fiche_titre($langs->trans("StocksArea"));
+print load_fiche_titre($langs->trans("StocksArea"));
//print '<table border="0" width="100%" class="notopnoleftnoright">';
diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php
index 1749eb2d8c8d6ced2d93398ed3aeab7089bdd0a3..ba322ac9c61f2b00d9173a03aea0f46ee49f4c8e 100644
--- a/htdocs/product/stock/massstockmove.php
+++ b/htdocs/product/stock/massstockmove.php
@@ -325,7 +325,7 @@ $title = $langs->trans('MassMovement');
llxHeader('', $title);
-print_fiche_titre($langs->trans("MassStockMovement")).'<br><br>';
+print load_fiche_titre($langs->trans("MassStockMovement")).'<br><br>';
$titletoadd=$langs->trans("Select");
$titletoaddnoent=$langs->transnoentitiesnoconv("Select");
diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php
index 26a2aef8e129ea4fdc012f0d9414cfdfedfd0c6e..fda21a08084227a111967a431915bfcb670582d2 100644
--- a/htdocs/product/stock/mouvement.php
+++ b/htdocs/product/stock/mouvement.php
@@ -358,7 +358,7 @@ if ($resql)
/*
if ($action == "correction")
{
- print_titre($langs->trans("StockCorrection"));
+ print load_fiche_titre($langs->trans("StockCorrection"));
print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$id.'" method="post">'."\n";
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="correct_stock">';
@@ -399,7 +399,7 @@ if ($resql)
if ($action == "transfert")
{
- print_titre($langs->trans("Transfer"));
+ print load_fiche_titre($langs->trans("Transfer"));
print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$id.'" method="post">'."\n";
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="transfert_stock">';
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index eb010407ca3217badc5be42b804cf7d39064e249..1d92a9994b1931ec84dd37899dd7435e9b2888c4 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -617,7 +617,7 @@ if ($id > 0 || $ref)
/*
if ($_GET["action"] == "definir")
{
- print_titre($langs->trans("SetStock"));
+ print load_fiche_titre($langs->trans("SetStock"));
print "<form action=\"product.php?id=$product->id\" method=\"post\">\n";
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="create_stock">';
diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php
index 39f728263ad65aa08910015788aac22e03b0897c..be97ad37a331daa92873f4e911d76251ea4cc27f 100644
--- a/htdocs/projet/activity/index.php
+++ b/htdocs/projet/activity/index.php
@@ -56,7 +56,7 @@ if ($mine) $title=$langs->trans("MyActivities");
llxHeader("",$title);
-print_fiche_titre($title, '', 'title_project');
+print load_fiche_titre($title, '', 'title_project');
if ($mine) print $langs->trans("MyTasksDesc").'<br><br>';
else
@@ -393,7 +393,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
$num = $db->num_rows($resql);
$i = 0;
- //print_fiche_titre($langs->trans("TasksOnOpenedProject"),'','').'<br>';
+ //print load_fiche_titre($langs->trans("TasksOnOpenedProject"),'','').'<br>';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index 2b9097b83554dbad837e8c14200f9c989e4c019b..686e764978a5683c11fe7f7802686f83c0f8368b 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -314,7 +314,7 @@ llxHeader("",$langs->trans("ProjectsSetup"));
$form=new Form($db);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("ProjectsSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("ProjectsSetup"),$linkback,'title_setup');
$head=project_admin_prepare_head();
@@ -373,7 +373,7 @@ print '<br>';
* Projects Numbering model
*/
-print_titre($langs->trans("ProjectsNumberingModules"));
+print load_fiche_titre($langs->trans("ProjectsNumberingModules"));
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
@@ -477,7 +477,7 @@ print '</table><br>';
if (empty($conf->global->PROJECT_HIDE_TASKS))
{
// Task numbering module
- print_titre($langs->trans("TasksNumberingModules"));
+ print load_fiche_titre($langs->trans("TasksNumberingModules"));
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
@@ -583,7 +583,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
* Document templates generators
*/
-print_titre($langs->trans("ProjectsModelModule"));
+print load_fiche_titre($langs->trans("ProjectsModelModule"));
// Defini tableau def de modele
$type='project';
@@ -742,7 +742,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
* Modeles documents for Task
*/
- print_titre($langs->trans("TaskModelModule"));
+ print load_fiche_titre($langs->trans("TaskModelModule"));
// Defini tableau def de modele
$type='project_task';
@@ -894,7 +894,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
}
-print_titre($langs->trans("Other"));
+print load_fiche_titre($langs->trans("Other"));
// Other options
$form=new Form($db);
diff --git a/htdocs/projet/admin/project_extrafields.php b/htdocs/projet/admin/project_extrafields.php
index 7a18dc9230f55976f710147054ba0917c42f99dc..39786f5ad71d25bbccbf4cb54279160096c69b8f 100644
--- a/htdocs/projet/admin/project_extrafields.php
+++ b/htdocs/projet/admin/project_extrafields.php
@@ -65,7 +65,7 @@ $textobject=$langs->transnoentitiesnoconv("Project");
llxHeader("",$langs->trans("ProjectsSetup"));
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("ProjectsSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("ProjectsSetup"),$linkback,'title_setup');
$head = project_admin_prepare_head();
@@ -95,7 +95,7 @@ if ($action != 'create' && $action != 'edit')
if ($action == 'create')
{
print "<br>";
- print_titre($langs->trans('NewAttribute'));
+ print load_fiche_titre($langs->trans('NewAttribute'));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
}
@@ -108,7 +108,7 @@ if ($action == 'create')
if ($action == 'edit' && ! empty($attrname))
{
print "<br>";
- print_titre($langs->trans("FieldEdition", $attrname));
+ print load_fiche_titre($langs->trans("FieldEdition", $attrname));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
}
diff --git a/htdocs/projet/admin/project_task_extrafields.php b/htdocs/projet/admin/project_task_extrafields.php
index b64bcabab89300bc3b3db128cdfcd76b9f7f1477..e9dc8be64e1fc62ea9433f8c0f8b346543b21966 100644
--- a/htdocs/projet/admin/project_task_extrafields.php
+++ b/htdocs/projet/admin/project_task_extrafields.php
@@ -65,7 +65,7 @@ $textobject=$langs->transnoentitiesnoconv("Project");
llxHeader("",$langs->trans("ProjectsSetup"));
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("ProjectsSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("ProjectsSetup"),$linkback,'title_setup');
$head = project_admin_prepare_head();
@@ -94,7 +94,7 @@ if ($action != 'create' && $action != 'edit')
if ($action == 'create')
{
print "<br>";
- print_titre($langs->trans('NewAttribute'));
+ print load_fiche_titre($langs->trans('NewAttribute'));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
}
@@ -107,7 +107,7 @@ if ($action == 'create')
if ($action == 'edit' && ! empty($attrname))
{
print "<br>";
- print_titre($langs->trans("FieldEdition", $attrname));
+ print load_fiche_titre($langs->trans("FieldEdition", $attrname));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
}
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 249688399609de42b31600d685e351d227407c48..e886649383321939449046e00bac1ace065cdc3c 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -218,7 +218,7 @@ if (empty($reshook))
if (! $error)
{
- $object->oldcopy = dol_clone($object);
+ $object->oldcopy = clone $object;
$old_start_date = $object->date_start;
@@ -411,7 +411,7 @@ if ($action == 'create' && $user->rights->projet->creer)
$thirdparty=new Societe($db);
if ($socid > 0) $thirdparty->fetch($socid);
- print_fiche_titre($langs->trans("NewProject"), '', 'title_project');
+ print load_fiche_titre($langs->trans("NewProject"), '', 'title_project');
print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 094ae60c59e135dec6ce079a3fd93a2095d09939..3b0dd280eb6cb331553249bd7476d378c45d9c56 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -43,8 +43,6 @@ class Project extends CommonObject
*/
protected $table_ref_field = 'ref';
- var $id;
- var $ref;
var $description;
/**
* @var string
@@ -60,8 +58,6 @@ class Project extends CommonObject
var $user_author_id; //!< Id of project creator. Not defined if shared project.
var $user_close_id;
var $public; //!< Tell if this is a public or private project
- var $note_private;
- var $note_public;
var $budget_amount;
var $statuts_short;
diff --git a/htdocs/projet/class/projectstats.class.php b/htdocs/projet/class/projectstats.class.php
index 98e9c0ce3e0429ab2444feaff38b94ce1f7bd4d5..360e13429ad8c745b26aa7ef40b9e74f613794a9 100644
--- a/htdocs/projet/class/projectstats.class.php
+++ b/htdocs/projet/class/projectstats.class.php
@@ -24,7 +24,6 @@ include_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
*/
class ProjectStats extends Stats
{
- protected $db;
private $project;
public $userid;
public $socid;
@@ -371,7 +370,7 @@ class ProjectStats extends Stats
if ($foundintocache) // Cache file found and is not too old
{
dol_syslog(get_class($this) . '::' . __FUNCTION__ . " read data from cache file " . $newpathofdestfile . " " . $filedate . ".");
- $data = dol_json_decode(file_get_contents($newpathofdestfile), true);
+ $data = json_decode(file_get_contents($newpathofdestfile), true);
} else {
$year = $startyear;
while ( $year <= $endyear ) {
@@ -397,7 +396,7 @@ class ProjectStats extends Stats
if (! dol_is_dir($conf->user->dir_temp))
dol_mkdir($conf->user->dir_temp);
$fp = fopen($newpathofdestfile, 'w');
- fwrite($fp, dol_json_encode($data));
+ fwrite($fp, json_encode($data));
fclose($fp);
if (! empty($conf->global->MAIN_UMASK))
$newmask = $conf->global->MAIN_UMASK;
@@ -460,4 +459,4 @@ class ProjectStats extends Stats
// var_dump($res);print '<br>';
return $res;
}
-}
\ No newline at end of file
+}
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index a8dffb8c49474fe275b172a76707342262118666..c6c5f65f63d6248572cc32bfd611816e4be32fd8 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -34,11 +34,6 @@ class Task extends CommonObject
public $element='project_task'; //!< Id that identify managed objects
public $table_element='projet_task'; //!< Name of table without prefix where object is stored
- var $id;
-
- var $ref;
-
- var $fk_project;
var $fk_task_parent;
var $label;
var $description;
@@ -51,9 +46,6 @@ class Task extends CommonObject
var $priority;
var $fk_user_creat;
var $fk_user_valid;
- var $statut;
- var $note_private;
- var $note_public;
var $rang;
var $timespent_id;
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 5ef872e31859f9a0a877e37daa283dafe7f3acbf..796d215ea12f340e7a13b885bec32a64338a7ca4 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -530,7 +530,7 @@ foreach ($listofreferent as $key => $value)
$addform.='</form>';
}
- print_fiche_titre($langs->trans($title), $addform, '');
+ print load_fiche_titre($langs->trans($title), $addform, '');
print '<table class="noborder" width="100%">';
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index 2625b1f8503a10e5b1b3a1b5b75980f1d3be0d58..95e4ce98a5e87a1d881861b6b37793bf1a4d34fe 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -62,7 +62,7 @@ llxHeader("",$langs->trans("Projects"),"EN:Module_Projects|FR:Module_Projets|ES:
$text=$langs->trans("Projects");
if ($mine) $text=$langs->trans("MyProjects");
-print_fiche_titre($text,'','title_project.png');
+print load_fiche_titre($text,'','title_project.png');
// Show description of content
if ($mine) print $langs->trans("MyProjectsDesc").'<br><br>';
diff --git a/htdocs/projet/stats/index.php b/htdocs/projet/stats/index.php
index 5e81be3bf78dce5970af50201ff0d04f4060d665..42d367ce8331d00cb48413f2441a17418a5b1f27 100644
--- a/htdocs/projet/stats/index.php
+++ b/htdocs/projet/stats/index.php
@@ -60,7 +60,7 @@ llxHeader('', $langs->trans('Projects'));
$title=$langs->trans("ProjectsStatistics");
$dir=$conf->projet->dir_output.'/temp';
-print_fiche_titre($title,'','title_project.png');
+print load_fiche_titre($title,'','title_project.png');
dol_mkdir($dir);
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 018bf862bbac4d27d063ad429275fa35897636bc..3458b34b176ff22a6244808c5dee26e808497297 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -266,7 +266,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
{
if ($id > 0 || ! empty($ref)) print '<br>';
- print_fiche_titre($langs->trans("NewTask"), '', 'title_project');
+ print load_fiche_titre($langs->trans("NewTask"), '', 'title_project');
print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -305,7 +305,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
print '<tr><td>'.$langs->trans("AffectedTo").'</td><td>';
$contactsofproject=(! empty($object->id)?$object->getListContactId('internal'):'');
- $form->select_users($user->id,'userid',0,'',0,'',$contactsofproject);
+ $form->select_dolusers($user->id,'userid',0,'',0,'',$contactsofproject);
print '</td></tr>';
// Date start
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index 9a8aa5c56084c34c1906bbded21a8adaebb03b03..59dab34b33e414b20661ad2c2b942e46517a1cdb 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -176,7 +176,7 @@ if ($id > 0 || ! empty($ref))
$result=$projectstatic->fetch($object->fk_project);
if (! empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
- $object->project = dol_clone($projectstatic);
+ $object->project = clone $projectstatic;
$userWrite = $projectstatic->restrictedProjectArea($user,'write');
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index ee3b9288d3c988a0cfa46e65c889b3254256aab1..1afc949cfa0b509dbac4c4942b72de3c79129f8d 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -98,7 +98,7 @@ if ($id > 0 || ! empty($ref))
$projectstatic->fetch_thirdparty();
}
- $object->project = dol_clone($projectstatic);
+ $object->project = clone $projectstatic;
$upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($projectstatic->ref).'/'.dol_sanitizeFileName($object->ref);
}
diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php
index 5b479085f6136bf36bba2ce33e17bea708c93745..ba575be30ad9100d1d070c6920b055c5c775c36b 100644
--- a/htdocs/projet/tasks/note.php
+++ b/htdocs/projet/tasks/note.php
@@ -53,7 +53,7 @@ if ($id > 0 || ! empty($ref))
$projectstatic->fetch($object->fk_project);
if (! empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
- $object->project = dol_clone($projectstatic);
+ $object->project = clone $projectstatic;
}
else
{
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 8a3c3cc5d5b01bd2f1fd2343c6d2a2f2c35ddb35..a146d8805eaaf5d564782fecde0b203c0dba4710 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -205,7 +205,7 @@ if ($id > 0 || ! empty($ref))
$result=$projectstatic->fetch($object->fk_project);
if (! empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
- $object->project = dol_clone($projectstatic);
+ $object->project = clone $projectstatic;
$userWrite = $projectstatic->restrictedProjectArea($user,'write');
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index f5eab2587cfe31f33bf6440ae3ffb71fe7360839..db8682e095a50e30a3e203e9a67295f8b9f665d4 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -215,7 +215,7 @@ if ($id > 0 || ! empty($ref))
$result=$projectstatic->fetch($object->fk_project);
if (! empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
- $object->project = dol_clone($projectstatic);
+ $object->project = clone $projectstatic;
$userWrite = $projectstatic->restrictedProjectArea($user,'write');
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 2856fcb93a35d4ebb5c56f40b8e3340fecf4d303..8b6aad1673984ccca78139627b3360bc94039cb2 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -367,7 +367,7 @@ $extrafields->fetch_name_optionals_label('adherent'); // fetch optionals attr
llxHeaderVierge($langs->trans("NewSubscription"));
-print_titre($langs->trans("NewSubscription"));
+print load_fiche_titre($langs->trans("NewSubscription"));
if (! empty($conf->global->MEMBER_NEWFORM_TEXT)) print $langs->trans($conf->global->MEMBER_NEWFORM_TEXT)."<br>\n";
else print $langs->trans("NewSubscriptionDesc",$conf->global->MAIN_INFO_SOCIETE_MAIL)."<br>\n";
diff --git a/htdocs/public/members/public_card.php b/htdocs/public/members/public_card.php
index 8a98ea4c4c3e619ee50f7ac12ffdd9ec95799bd1..908ad220f72af6394d9fbf4d5ffd141333f13b3f 100644
--- a/htdocs/public/members/public_card.php
+++ b/htdocs/public/members/public_card.php
@@ -79,7 +79,7 @@ if ($id > 0)
if ($res < 0) { dol_print_error($db,$object->error); exit; }
$res=$object->fetch_optionals($object->id,$extralabels);
- print_fiche_titre($langs->trans("MemberCard"), '', '');
+ print load_fiche_titre($langs->trans("MemberCard"), '', '');
if (empty($object->public))
{
diff --git a/htdocs/resource/add.php b/htdocs/resource/add.php
index 6243a0d270cce0b1ee0cb5e913dec12516f6724f..3618230a374ff020735ac24cc975de3b5563d6c0 100644
--- a/htdocs/resource/add.php
+++ b/htdocs/resource/add.php
@@ -123,7 +123,7 @@ if (! $action)
{
$pagetitle=$langs->trans('AddResource');
llxHeader('',$pagetitle,'');
- print_fiche_titre($pagetitle,'','title_generic');
+ print load_fiche_titre($pagetitle,'','title_generic');
print '<form method="post" action="'.$_SERVER['PHP_SELF'].'" name="add_resource">';
print '<input type="hidden" name="action" value="confirm_add_resource" />';
diff --git a/htdocs/resource/class/resource.class.php b/htdocs/resource/class/resource.class.php
index 3c3f0ee6e49ed643e91d001d45dbe7abb1f0401f..0888134142973f1ba413b013b4d434d2576c2073 100644
--- a/htdocs/resource/class/resource.class.php
+++ b/htdocs/resource/class/resource.class.php
@@ -31,15 +31,9 @@ require_once DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php";
*/
class Resource extends CommonObject
{
- var $db; //!< To store db handler
- var $error; //!< To return error code (or message)
- var $errors=array(); //!< To return several error codes (or messages)
var $element='resource'; //!< Id that identify managed objects
var $table_element='resource'; //!< Name of table without prefix where object is stored
- var $id;
-
-
var $resource_id;
var $resource_type;
var $element_id;
@@ -50,7 +44,6 @@ class Resource extends CommonObject
var $type_label;
var $tms='';
-
/**
* Constructor
*
diff --git a/htdocs/resource/element_resource.php b/htdocs/resource/element_resource.php
index 782b117d1f878fb0686e7dcca5fcfacc41a8a885..5c2414d22a2ae1ec9f3a476c46fc86429fe5cd05 100644
--- a/htdocs/resource/element_resource.php
+++ b/htdocs/resource/element_resource.php
@@ -244,7 +244,7 @@ else
- //print_fiche_titre($langs->trans('ResourcesLinkedToElement'),'','');
+ //print load_fiche_titre($langs->trans('ResourcesLinkedToElement'),'','');
@@ -277,7 +277,7 @@ else
if ($mode != 'add' || $resource_obj != $resource_type)
{
- //print_titre($langs->trans(ucfirst($element_prop['element']).'Singular'));
+ //print load_fiche_titre($langs->trans(ucfirst($element_prop['element']).'Singular'));
// If we have a specific template we use it
if(file_exists(dol_buildpath($path.'/core/tpl/resource_'.$element_prop['element'].'_view.tpl.php')))
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index 29ae4a428031d03476495d203867008239c944db..a1d5e0e209c7930ffbc92c334e799bdc110c717c 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -89,7 +89,7 @@ llxHeader('',$pagetitle,'');
$form=new Form($db);
-print_fiche_titre($pagetitle,'','title_generic');
+print load_fiche_titre($pagetitle,'','title_generic');
// Confirmation suppression resource line
if ($action == 'delete_resource')
diff --git a/htdocs/societe/admin/contact_extrafields.php b/htdocs/societe/admin/contact_extrafields.php
index 3b11a6985d3d0e61c339c6f571047f3410fab09c..56bf58cf61d6268f2e6abb324c118beffd3eee2f 100644
--- a/htdocs/societe/admin/contact_extrafields.php
+++ b/htdocs/societe/admin/contact_extrafields.php
@@ -65,7 +65,7 @@ llxHeader('',$langs->trans("CompanySetup"),$help_url);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("CompanySetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("CompanySetup"),$linkback,'title_setup');
$head = societe_admin_prepare_head();
@@ -95,7 +95,7 @@ if ($action != 'create' && $action != 'edit')
if ($action == 'create')
{
print "<br>";
- print_titre($langs->trans('NewAttribute'));
+ print load_fiche_titre($langs->trans('NewAttribute'));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
}
@@ -108,7 +108,7 @@ if ($action == 'create')
if ($action == 'edit' && ! empty($attrname))
{
print "<br>";
- print_titre($langs->trans("FieldEdition", $attrname));
+ print load_fiche_titre($langs->trans("FieldEdition", $attrname));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
}
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index 5001ab04cf4d65439d84d0ad7127ff138a2f693b..10f5ab290450cd4a0ad6e06f97e78762f1596eff 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -288,7 +288,7 @@ $help_url='EN:Module Third Parties setup|FR:Paramétrage_du_module_Tiers|ES:Conf
llxHeader('',$langs->trans("CompanySetup"),$help_url);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("CompanySetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("CompanySetup"),$linkback,'title_setup');
$head = societe_admin_prepare_head();
@@ -299,7 +299,7 @@ $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['so
// Module to manage customer/supplier code
-print_titre($langs->trans("CompanyCodeChecker"));
+print load_fiche_titre($langs->trans("CompanyCodeChecker"));
print '<table class="noborder" width="100%">'."\n";
print '<tr class="liste_titre">'."\n";
@@ -381,7 +381,7 @@ print "<br>";
// Select accountancy code numbering module
-print_titre($langs->trans("AccountCodeManager"));
+print load_fiche_titre($langs->trans("AccountCodeManager"));
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
@@ -452,7 +452,7 @@ print "</table>\n";
* Document templates generators
*/
print '<br>';
-print_titre($langs->trans("ModelModules"));
+print load_fiche_titre($langs->trans("ModelModules"));
// Load array def with activated templates
$def = array();
@@ -598,7 +598,7 @@ print '</table>';
print '<br>';
//IDProf
-print_titre($langs->trans("CompanyIdProfChecker"));
+print load_fiche_titre($langs->trans("CompanyIdProfChecker"));
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
@@ -691,7 +691,7 @@ while ($i < $nbofloop)
print "</table><br>\n";
-print_titre($langs->trans("Other"));
+print load_fiche_titre($langs->trans("Other"));
// Autres options
$form=new Form($db);
diff --git a/htdocs/societe/admin/societe_extrafields.php b/htdocs/societe/admin/societe_extrafields.php
index ade27c4aefa9e679144302df737c78c850ecb8fa..89f44d53aa78ce1f971d28f59ca80ec9b32e0ce5 100644
--- a/htdocs/societe/admin/societe_extrafields.php
+++ b/htdocs/societe/admin/societe_extrafields.php
@@ -66,7 +66,7 @@ llxHeader('',$langs->trans("CompanySetup"),$help_url);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("CompanySetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("CompanySetup"),$linkback,'title_setup');
$head = societe_admin_prepare_head();
@@ -96,7 +96,7 @@ if ($action != 'create' && $action != 'edit')
if ($action == 'create')
{
print "<br>";
- print_titre($langs->trans('NewAttribute'));
+ print load_fiche_titre($langs->trans('NewAttribute'));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
}
@@ -109,7 +109,7 @@ if ($action == 'create')
if ($action == 'edit' && ! empty($attrname))
{
print "<br>";
- print_titre($langs->trans("FieldEdition", $attrname));
+ print load_fiche_titre($langs->trans("FieldEdition", $attrname));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
}
diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php
index b2b0f954a588a822f2d59a3a6787c0f994de5fcc..bffff8f3cbe045cc8a2a6dcec8e5a865321f449e 100644
--- a/htdocs/societe/canvas/actions_card_common.class.php
+++ b/htdocs/societe/canvas/actions_card_common.class.php
@@ -279,7 +279,7 @@ abstract class ActionsCardCommon
exit;
}
- $oldsoccanvas = dol_clone($this->object);
+ $oldsoccanvas = clone $this->object;
// To avoid setting code if third party is not concerned. But if it had values, we keep them.
if (empty($this->object->client) && empty($oldsoccanvas->code_client)) $this->object->code_client='';
diff --git a/htdocs/societe/canvas/company/actions_card_company.class.php b/htdocs/societe/canvas/company/actions_card_company.class.php
index b2c0f82f1e05557316db820e0e081aaa36051081..c7ed03080f6e40f5d1725054c624ec5c46ed77ba 100644
--- a/htdocs/societe/canvas/company/actions_card_company.class.php
+++ b/htdocs/societe/canvas/company/actions_card_company.class.php
@@ -29,11 +29,6 @@ include_once DOL_DOCUMENT_ROOT.'/societe/canvas/actions_card_common.class.php';
*/
class ActionsCardCompany extends ActionsCardCommon
{
- var $dirmodule;
- var $targetmodule;
- var $canvas;
- var $card;
-
/**
* Constructor
*
diff --git a/htdocs/societe/canvas/individual/actions_card_individual.class.php b/htdocs/societe/canvas/individual/actions_card_individual.class.php
index 19921b69d814b8e19d0158b2d4c44c4da03cf121..f38d0d034ef835a36c9d3610e6e96d12f304d690 100644
--- a/htdocs/societe/canvas/individual/actions_card_individual.class.php
+++ b/htdocs/societe/canvas/individual/actions_card_individual.class.php
@@ -28,11 +28,6 @@ include_once DOL_DOCUMENT_ROOT.'/societe/canvas/actions_card_common.class.php';
*/
class ActionsCardIndividual extends ActionsCardCommon
{
- var $dirmodule;
- var $targetmodule;
- var $canvas;
- var $card;
-
/**
* Constructor
*
diff --git a/htdocs/societe/checkvat/checkVatPopup.php b/htdocs/societe/checkvat/checkVatPopup.php
index 13d669789e7b2e5c2607e4f6da3f072933b67714..152cd5d9a3f3c5caa2962dc054fb77871f7b20d4 100644
--- a/htdocs/societe/checkvat/checkVatPopup.php
+++ b/htdocs/societe/checkvat/checkVatPopup.php
@@ -39,7 +39,7 @@ print '<body style="margin: 10px">';
print '<div>';
print '<div>';
-print_fiche_titre($langs->trans("VATIntraCheckableOnEUSite"),'','title_setup');
+print load_fiche_titre($langs->trans("VATIntraCheckableOnEUSite"),'','title_setup');
if (! $_REQUEST["vatNumber"])
diff --git a/htdocs/societe/class/address.class.php b/htdocs/societe/class/address.class.php
index db981834760d4077b6e1f5273efff898b91ece33..d8a1687cf9d99a22552402f7a8e6d58be5fa8871 100644
--- a/htdocs/societe/class/address.class.php
+++ b/htdocs/societe/class/address.class.php
@@ -54,9 +54,10 @@ class Address
public $lines;
/**
- * Constructor
+ * Constructor
*
- * @param DoliDB $db Database handler
+ * @param DoliDB $db Database handler
+ * @deprecated
*/
function __construct($db)
{
diff --git a/htdocs/societe/class/client.class.php b/htdocs/societe/class/client.class.php
index f3e7a8dcce981069bdba38e83849771a2de2ea37..b4ee6b86249bb7f540adfbdfceb270e4a9dc8653 100644
--- a/htdocs/societe/class/client.class.php
+++ b/htdocs/societe/class/client.class.php
@@ -29,8 +29,6 @@ include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
*/
class Client extends Societe
{
- var $db;
-
var $next_prev_filter="te.client in (1,2,3)"; // Used to add a filter in Form::showrefnav method
var $cacheprospectstatus=array();
diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index 336aab0ebbdd69a62c978c788f752c1e369f347d..35d03387fec3e2f3ca7e47627228ae84b5e9bfb4 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -32,21 +32,8 @@ require_once DOL_DOCUMENT_ROOT .'/compta/bank/class/account.class.php';
*/
class CompanyBankAccount extends Account
{
- var $rowid;
var $socid;
- var $label;
- var $bank;
- var $courant;
- var $clos;
- var $code_banque;
- var $code_guichet;
- var $number;
- var $cle_rib;
- var $bic;
- var $iban;
- var $proprio;
- var $owner_address;
var $default_rib;
var $frstrecur;
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 30b696bb8ef70ca2aac55e5890427f0b61b9448a..6e705749ba0a0d6db7fb1a4bb5ad08f74d718617 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -51,8 +51,6 @@ class Societe extends CommonObject
*/
protected $ismultientitymanaged = 1;
- public $id;
- public $name;
public $entity;
/**
@@ -63,9 +61,6 @@ class Societe extends CommonObject
*/
public $nom;
- var $firstname;
- var $lastname;
-
/**
* Alias names (commercial, trademark or alias names)
* @var string
@@ -73,7 +68,6 @@ class Societe extends CommonObject
public $name_alias;
public $particulier;
- public $civility_id;
public $address;
public $zip;
public $town;
@@ -113,9 +107,6 @@ class Societe extends CommonObject
* @see country
*/
var $pays;
- var $country_id;
- var $country_code;
- var $country;
/**
* Phone number
@@ -149,26 +140,6 @@ class Societe extends CommonObject
* @var string
*/
var $barcode;
- /**
- * ID of bardode type
- * @var int
- */
- var $barcode_type;
- /**
- * code (loaded by fetch_barcode)
- * @var string
- */
- var $barcode_type_code;
- /**
- * label (loaded by fetch_barcode)
- * @var string
- */
- var $barcode_type_label;
- /**
- * coder (loaded by fetch_barcode)
- * @var string
- */
- var $barcode_type_coder;
// 6 professional id (usage depends on country)
@@ -233,8 +204,6 @@ class Societe extends CommonObject
var $forme_juridique;
var $remise_percent;
- var $mode_reglement_id;
- var $cond_reglement_id;
var $mode_reglement_supplier_id;
var $cond_reglement_supplier_id;
var $fk_prospectlevel;
diff --git a/htdocs/societe/commerciaux.php b/htdocs/societe/commerciaux.php
index 498257ea49610c78de8af26a242cc03696380c60..05679cef5bb22c738dce0bdab98041e751e350f1 100644
--- a/htdocs/societe/commerciaux.php
+++ b/htdocs/societe/commerciaux.php
@@ -234,7 +234,7 @@ if ($_GET["socid"])
$num = $db->num_rows($resql);
$i = 0;
- print_titre($title);
+ print load_fiche_titre($title);
// Lignes des titres
print '<table class="noborder" width="100%">';
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index d8723ceabcfc349f81fdfc517f35ffb88aa7c2c1..c8da9ae9f89ccc343f3bd0aa7989e2de123e5ce5 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -48,7 +48,7 @@ $helpurl='EN:Module_Third_Parties|FR:Module_Tiers|ES:Módulo_Terceros';
llxHeader("",$langs->trans("ThirdParties"),$helpurl);
$linkback='';
-print_fiche_titre($transAreaType,$linkback,'title_companies.png');
+print load_fiche_titre($transAreaType,$linkback,'title_companies.png');
//print '<table border="0" width="100%" class="notopnoleftnoright">';
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index 2855e82b07690952b2bc9516917dfea6acf688f9..483c156907a065fd00a648c8a42cfeed5a7f7453 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -194,7 +194,7 @@ if ($result > 0)
print "\n";
// Add notification form
- print_fiche_titre($langs->trans("AddNewNotification"),'','');
+ print load_fiche_titre($langs->trans("AddNewNotification"),'','');
print '<form action="'.$_SERVER["PHP_SELF"].'?socid='.$socid.'" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -252,7 +252,7 @@ if ($result > 0)
print '<br>';
// List of active notifications
- print_fiche_titre($langs->trans("ListOfActiveNotifications"),'','');
+ print load_fiche_titre($langs->trans("ListOfActiveNotifications"),'','');
$var=true;
// Line with titles
@@ -383,7 +383,7 @@ if ($result > 0)
// List of notifications done
- print_fiche_titre($langs->trans("ListOfNotificationsDone"),'','');
+ print load_fiche_titre($langs->trans("ListOfNotificationsDone"),'','');
$var=true;
// Line with titles
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index f138853031712042464673a94492c326873e920b..20805502c11444d181ebe0a4ee035ce892d0d8d9 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -236,7 +236,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
// Create mode
- print_fiche_titre($langs->trans('PriceByCustomer'));
+ print load_fiche_titre($langs->trans('PriceByCustomer'));
print '<form action="' . $_SERVER["PHP_SELF"] . '?socid=' . $soc->id . '" method="POST">';
print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
@@ -309,7 +309,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
// Edit mode
- print_fiche_titre($langs->trans('PriceByCustomer'));
+ print load_fiche_titre($langs->trans('PriceByCustomer'));
$result = $prodcustprice->fetch(GETPOST('lineid', 'int'));
if ($result < 0) {
diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php
index 57ca545a05301dcebd3bb32a356f6b9fe5250ab1..ee4259f2e8179465d180093a1f334031563fede7 100644
--- a/htdocs/societe/rib.php
+++ b/htdocs/societe/rib.php
@@ -237,7 +237,7 @@ if ($socid && $action != 'edit' && $action != "create")
print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$soc->id."&ribid=".($ribid?$ribid:$id), $langs->trans("DeleteARib"), $langs->trans("ConfirmDeleteRib", $account->getRibLabel()), "confirm_delete", '', 0, 1);
}
- print_titre($langs->trans("DefaultRIB"));
+ print load_fiche_titre($langs->trans("DefaultRIB"));
print '<table class="border" width="100%">';
@@ -357,7 +357,7 @@ if ($socid && $action != 'edit' && $action != "create")
* List of bank accounts
*/
- print_titre($langs->trans("AllRIB"));
+ print load_fiche_titre($langs->trans("AllRIB"));
$rib_list = $soc->get_all_rib();
$var = false;
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 637110d4a88e8f947cd171898d36640dfd2af30a..8cebfb3f470b8cd8ef6e0c412e945e045660c7cc 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -232,7 +232,7 @@ if (empty($reshook))
if ($action == 'update')
{
$ret=$object->fetch($socid);
- $object->oldcopy=dol_clone($object);
+ $object->oldcopy = clone $object;
}
else $object->canvas=$canvas;
@@ -879,7 +879,7 @@ else
/* Show create form */
$linkback="";
- print_fiche_titre($langs->trans("NewThirdParty"),$linkback,'title_companies.png');
+ print load_fiche_titre($langs->trans("NewThirdParty"),$linkback,'title_companies.png');
if (! empty($conf->use_javascript_ajax))
{
@@ -1213,7 +1213,7 @@ else
print '<tr>';
print '<td>'.fieldLabel('AllocateCommercial','commercial_id').'</td>';
print '<td colspan="3" class="maxwidthonsmartphone">';
- $form->select_users((! empty($object->commercial_id)?$object->commercial_id:$user->id),'commercial_id',1); // Add current user by default
+ $form->select_dolusers((! empty($object->commercial_id)?$object->commercial_id:$user->id),'commercial_id',1); // Add current user by default
print '</td></tr>';
}
@@ -1284,7 +1284,7 @@ else
* Edition
*/
- //print_fiche_titre($langs->trans("EditCompany"));
+ //print load_fiche_titre($langs->trans("EditCompany"));
if ($socid)
{
@@ -1329,7 +1329,7 @@ else
$prefixSupplierIsUsed = $modCodeFournisseur->verif_prefixIsUsed();
}
- $object->oldcopy=dol_clone($object);
+ $object->oldcopy = clone $object;
if (GETPOST('name'))
{
@@ -2409,7 +2409,7 @@ else
$modelmail='thirdparty';
print '<br>';
- print_titre($langs->trans($titreform));
+ print load_fiche_titre($langs->trans($titreform));
// Define output language
$outputlangs = $langs;
diff --git a/htdocs/user/admin/group_extrafields.php b/htdocs/user/admin/group_extrafields.php
index a4c417fe9964dae6a5a37cbc1fef46b2a4fcb60c..aeb3f194daf48d5361faa9a086a0befc1ae3a320 100644
--- a/htdocs/user/admin/group_extrafields.php
+++ b/htdocs/user/admin/group_extrafields.php
@@ -66,7 +66,7 @@ llxHeader('',$langs->trans("UsersSetup"),$help_url);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("UsersSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("UsersSetup"),$linkback,'title_setup');
$head = user_admin_prepare_head();
@@ -96,7 +96,7 @@ if ($action != 'create' && $action != 'edit')
if ($action == 'create')
{
print "<br>";
- print_titre($langs->trans('NewAttribute'));
+ print load_fiche_titre($langs->trans('NewAttribute'));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
}
@@ -109,7 +109,7 @@ if ($action == 'create')
if ($action == 'edit' && ! empty($attrname))
{
print "<br>";
- print_titre($langs->trans("FieldEdition", $attrname));
+ print load_fiche_titre($langs->trans("FieldEdition", $attrname));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
}
diff --git a/htdocs/user/admin/user_extrafields.php b/htdocs/user/admin/user_extrafields.php
index 3ab04f6ef89442bb26b49d88810247909e33f0f7..8ebdcca905688b8e781b13c1f8e18007925c16cd 100644
--- a/htdocs/user/admin/user_extrafields.php
+++ b/htdocs/user/admin/user_extrafields.php
@@ -65,7 +65,7 @@ llxHeader('',$langs->trans("UsersSetup"),$help_url);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("UsersSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("UsersSetup"),$linkback,'title_setup');
$head = user_admin_prepare_head();
@@ -95,7 +95,7 @@ if ($action != 'create' && $action != 'edit')
if ($action == 'create')
{
print "<br>";
- print_titre($langs->trans('NewAttribute'));
+ print load_fiche_titre($langs->trans('NewAttribute'));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
}
@@ -108,7 +108,7 @@ if ($action == 'create')
if ($action == 'edit' && ! empty($attrname))
{
print "<br>";
- print_titre($langs->trans("FieldEdition", $attrname));
+ print load_fiche_titre($langs->trans("FieldEdition", $attrname));
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
}
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 5724101ec1b776d6352efc56948dc091010efeec..67692fafa66f7bb63787abb64afcb78b960ad7b1 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -278,7 +278,7 @@ if (($action == 'addgroup' || $action == 'removegroup') && $caneditfield)
{
$editgroup = new UserGroup($db);
$editgroup->fetch($group);
- $editgroup->oldcopy=clone($editgroup);
+ $editgroup->oldcopy=clone $editgroup;
$object->fetch($id);
if ($action == 'addgroup') $object->SetInGroup($group,($conf->multicompany->transverse_mode?GETPOST("entity"):$editgroup->entity));
@@ -340,7 +340,7 @@ if ($action == 'update' && ! $_POST["cancel"])
{
$db->begin();
- $object->oldcopy=clone($object);
+ $object->oldcopy = clone $object;
$object->lastname = GETPOST("lastname",'alpha');
$object->firstname = GETPOST("firstname",'alpha');
@@ -508,7 +508,7 @@ if ($action == 'update' && ! $_POST["cancel"])
{
$object->fetch($id);
- $object->oldcopy=clone($object);
+ $object->oldcopy = clone $object;
$ret=$object->setPassword($user,$_POST["password"]);
if ($ret < 0)
@@ -627,7 +627,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
/* */
/* ************************************************************************** */
- print_fiche_titre($langs->trans("NewUser"));
+ print load_fiche_titre($langs->trans("NewUser"));
print $langs->trans("CreateInternalUserDesc")."<br>\n";
print "<br>";
@@ -1614,7 +1614,7 @@ else
if ($canreadgroup)
{
- print_fiche_titre($langs->trans("ListOfGroupsForUser"),'','');
+ print load_fiche_titre($langs->trans("ListOfGroupsForUser"),'','');
// On selectionne les groupes auquel fait parti le user
$exclude = array();
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 34c3084e12d98638483427f441108776f55d442b..31d56f0ad4beac6d6a4c5eaabc1c9702ac073c48 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -44,14 +44,9 @@ class User extends CommonObject
protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
var $id=0;
- var $ref;
- var $ref_ext;
var $ldap_sid;
var $search_sid;
- var $lastname;
- var $firstname;
var $gender;
- var $note;
var $email;
var $skype;
var $job;
@@ -1409,7 +1404,7 @@ class User extends CommonObject
// Mise a jour
if (! $changelater)
{
- if (! is_object($this->oldcopy)) $this->oldcopy=dol_clone($this);
+ if (! is_object($this->oldcopy)) $this->oldcopy = clone $this;
$this->db->begin();
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index 687c2077760c3d0ad58fbd89931d389645796b8d..50237b0ef61cd7948ca38305611f746fe4733f85 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -38,16 +38,13 @@ class UserGroup extends CommonObject
public $table_element='usergroup';
protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
- var $id; // Group id
var $entity; // Entity of group
/**
* @deprecated
* @see name
*/
var $nom; // Name of group
- var $name; // Name of group
var $globalgroup; // Global group
- var $note; // Note on group
var $datec; // Creation date of group
var $datem; // Modification date of group
var $members=array(); // Array of users
diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index 3de421e4f4f12bb08e62b06363403dc32c33a97d..4edb037d8d66f7527f583c33907cae48dd70fb3a 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -142,7 +142,7 @@ if ($action == 'adduser' || $action =='removeuser')
if ($userid)
{
$object->fetch($id);
- $object->oldcopy=dol_clone($object);
+ $object->oldcopy = clone $object;
$edituser = new User($db);
$edituser->fetch($userid);
@@ -176,7 +176,7 @@ if ($action == 'update')
$object->fetch($id);
- $object->oldcopy=dol_clone($object);
+ $object->oldcopy = clone $object;
$object->name = trim($_POST["group"]);
$object->nom = $object->name; // For backward compatibility
@@ -222,7 +222,7 @@ $fuserstatic = new User($db);
if ($action == 'create')
{
- print_fiche_titre($langs->trans("NewGroup"));
+ print load_fiche_titre($langs->trans("NewGroup"));
print dol_set_focus('#nom');
@@ -374,7 +374,7 @@ else
* Liste des utilisateurs dans le groupe
*/
- print_fiche_titre($langs->trans("ListOfUsersInGroup"),'','');
+ print load_fiche_titre($langs->trans("ListOfUsersInGroup"),'','');
// On selectionne les users qui ne sont pas deja dans le groupe
$exclude = array();
diff --git a/htdocs/user/group/index.php b/htdocs/user/group/index.php
index 7496d7bc816438d8f37b2dc3bbc9e7f7aca1df81..b45615455d8285fe7796d619c0fd0efd572380f3 100644
--- a/htdocs/user/group/index.php
+++ b/htdocs/user/group/index.php
@@ -55,7 +55,7 @@ if (! $sortorder) $sortorder="ASC";
llxHeader();
-print_fiche_titre($langs->trans("ListOfGroups"));
+print load_fiche_titre($langs->trans("ListOfGroups"));
$sql = "SELECT g.rowid, g.nom as name, g.entity, g.datec, COUNT(DISTINCT ugu.fk_user) as nb";
$sql.= " FROM ".MAIN_DB_PREFIX."usergroup as g";
diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php
index f53775b9b3e0ad4eeba85091bd44af3a5926ea1d..ed7122fe164e9cd384e45bb41639ca60d086e5fe 100644
--- a/htdocs/user/group/ldap.php
+++ b/htdocs/user/group/ldap.php
@@ -155,7 +155,7 @@ if ($conf->global->LDAP_SYNCHRO_ACTIVE == 'dolibarr2ldap') print "<br>\n";
// Affichage attributs LDAP
-print_titre($langs->trans("LDAPInformationsForThisGroup"));
+print load_fiche_titre($langs->trans("LDAPInformationsForThisGroup"));
print '<table width="100%" class="noborder">';
diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php
index ccaf6687da910fc84265ca0faeeb5ea9aefaba63..23356c0888956b60ed789d1310a0a3ca90cf638a 100644
--- a/htdocs/user/hierarchy.php
+++ b/htdocs/user/hierarchy.php
@@ -65,7 +65,7 @@ $arrayofcss=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css')
llxHeader('',$langs->trans("ListOfUsers"). ' ('.$langs->trans("HierarchicView").')','','',0,0,$arrayofjs,$arrayofcss);
-print_fiche_titre($langs->trans("ListOfUsers"). ' ('.$langs->trans("HierarchicView").')', '<form action="'.DOL_URL_ROOT.'/user/index.php'.(($search_statut != '' && $search_statut >= 0) ?'?search_statut='.$search_statut:'').'" method="POST"><input type="submit" class="button" style="width:120px" name="viewcal" value="'.dol_escape_htmltag($langs->trans("ViewList")).'"></form>');
+print load_fiche_titre($langs->trans("ListOfUsers"). ' ('.$langs->trans("HierarchicView").')', '<form action="'.DOL_URL_ROOT.'/user/index.php'.(($search_statut != '' && $search_statut >= 0) ?'?search_statut='.$search_statut:'').'" method="POST"><input type="submit" class="button" style="width:120px" name="viewcal" value="'.dol_escape_htmltag($langs->trans("ViewList")).'"></form>');
diff --git a/htdocs/user/home.php b/htdocs/user/home.php
index ba3b3c155862c436cede00548da370f7a349a7bf..22b6d54adda21175d1c9d56c5aa73bc5f55d2b15 100644
--- a/htdocs/user/home.php
+++ b/htdocs/user/home.php
@@ -53,7 +53,7 @@ $fuserstatic = new User($db);
llxHeader();
-print_fiche_titre($langs->trans("MenuUsersAndGroups"));
+print load_fiche_titre($langs->trans("MenuUsersAndGroups"));
//print '<table border="0" width="100%" class="notopnoleftnoright">';
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 9c8060e72755dd64460ea8afd0bcc469f8d7a071..f2e53987ed842b54f218aae87903bcf3b5d82b79 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -84,7 +84,7 @@ llxHeader('',$langs->trans("ListOfUsers"));
$buttonviewhierarchy='<form action="'.DOL_URL_ROOT.'/user/hierarchy.php'.(($search_statut != '' && $search_statut >= 0) ? '?search_statut='.$search_statut : '').'" method="POST"><input type="submit" class="button" style="width:120px" name="viewcal" value="'.dol_escape_htmltag($langs->trans("HierarchicView")).'"></form>';
-print_fiche_titre($langs->trans("ListOfUsers"), $buttonviewhierarchy);
+print load_fiche_titre($langs->trans("ListOfUsers"), $buttonviewhierarchy);
$sql = "SELECT u.rowid, u.lastname, u.firstname, u.admin, u.fk_soc, u.login, u.email, u.gender,";
$sql.= " u.datec,";
diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php
index 2d1ac2f7464c54e2e5061ffdafdaf9dc3db02499..0ee41812c29a0267c439ba2ae6e268d0439bacaf 100644
--- a/htdocs/user/ldap.php
+++ b/htdocs/user/ldap.php
@@ -168,7 +168,7 @@ if ($conf->global->LDAP_SYNCHRO_ACTIVE == 'dolibarr2ldap') print "<br>\n";
// Affichage attributs LDAP
-print_titre($langs->trans("LDAPInformationsForThisUser"));
+print load_fiche_titre($langs->trans("LDAPInformationsForThisUser"));
print '<table width="100%" class="noborder">';
diff --git a/htdocs/webservices/admin/webservices.php b/htdocs/webservices/admin/webservices.php
index 3f97eda6574be6055658b286b3f9b95855f28b86..97b19ab8ff747952812b127a9dd1fbe0e011ba8a 100644
--- a/htdocs/webservices/admin/webservices.php
+++ b/htdocs/webservices/admin/webservices.php
@@ -63,7 +63,7 @@ if ($actionsave)
llxHeader();
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("WebServicesSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("WebServicesSetup"),$linkback,'title_setup');
print $langs->trans("WebServicesDesc")."<br>\n";
print "<br>\n";
diff --git a/test/phpunit/AdherentTest.php b/test/phpunit/AdherentTest.php
index 3a19b195b7c802c5271263614461b2e6a2af80d7..42b4ff7cf7fd5ebc4ef7ce56899f7421ef251d65 100644
--- a/test/phpunit/AdherentTest.php
+++ b/test/phpunit/AdherentTest.php
@@ -266,7 +266,7 @@ class AdherentTest extends PHPUnit_Framework_TestCase
$result=$localobject->update_note($localobject->note,'_private');
print __METHOD__." id=".$localobject->id." result=".$result."\n";
$this->assertLessThan($result, 0);
- $result=$localobject->update_note_public($localobject->note,'_public');
+ $result=$localobject->update_note($localobject->note,'_public');
print __METHOD__." id=".$localobject->id." result=".$result."\n";
$this->assertLessThan($result, 0);
diff --git a/test/phpunit/ContactTest.php b/test/phpunit/ContactTest.php
index b638cdc776bfe430120d34d8005f10c25f75be0e..d9532417fc2d913418a51308bcc6a5d4a283159e 100755
--- a/test/phpunit/ContactTest.php
+++ b/test/phpunit/ContactTest.php
@@ -189,7 +189,7 @@ class ContactTest extends PHPUnit_Framework_TestCase
$langs=$this->savlangs;
$db=$this->savdb;
- $localobject->oldcopy=dol_clone($localobject);
+ $localobject->oldcopy = clone $localobject;
$localobject->note_private='New private note after update';
$localobject->note_public='New public note after update';
@@ -211,14 +211,14 @@ class ContactTest extends PHPUnit_Framework_TestCase
$result=$localobject->update($localobject->id,$user);
print __METHOD__." id=".$localobject->id." result=".$result."\n";
$this->assertLessThan($result, 0, 'Contact::update error');
-
- $result=$localobject->update_note($localobject->note_private,'_private');
- print __METHOD__." id=".$localobject->id." result=".$result."\n";
- $this->assertLessThan($result, 0, 'Contact::update_note error');
-
- $result=$localobject->update_note_public($localobject->note_public);
+
+ $result=$localobject->update_note($localobject->note_private,'_private');
+ print __METHOD__." id=".$localobject->id." result=".$result."\n";
+ $this->assertLessThan($result, 0, 'Contact::update_note (private) error');
+
+ $result=$localobject->update_note($localobject->note_public, '_public');
print __METHOD__." id=".$localobject->id." result=".$result."\n";
- $this->assertLessThan($result, 0, 'Contact::update_note_public error');
+ $this->assertLessThan($result, 0, 'Contact::update_note (public) error');
$newobject=new Contact($this->savdb);
$result=$newobject->fetch($localobject->id);
diff --git a/test/phpunit/HolidayTest.php b/test/phpunit/HolidayTest.php
index 36556fd92819799eb212928aaa2be42e749c2b19..a04646a8a142065caa41f51f4d044e86d2a55339 100644
--- a/test/phpunit/HolidayTest.php
+++ b/test/phpunit/HolidayTest.php
@@ -183,7 +183,7 @@ class HolidayTest extends PHPUnit_Framework_TestCase
$langs=$this->savlangs;
$db=$this->savdb;
- $localobject->oldcopy=dol_clone($localobject);
+ $localobject->oldcopy = clone $localobject;
$localobject->note_private='New private note after update';
$localobject->note_public='New public note after update';
@@ -208,11 +208,11 @@ class HolidayTest extends PHPUnit_Framework_TestCase
$result=$localobject->update_note($localobject->note_private,'_private');
print __METHOD__." id=".$localobject->id." result=".$result."\n";
- $this->assertLessThan($result, 0, 'Holiday::update_note error');
-
- $result=$localobject->update_note_public($localobject->note_public);
- print __METHOD__." id=".$localobject->id." result=".$result."\n";
- $this->assertLessThan($result, 0, 'Holiday::update_note_public error');
+ $this->assertLessThan($result, 0, 'Holiday::update_note (private) error');
+
+ $result=$localobject->update_note($localobject->note_public, '_public');
+ print __METHOD__." id=".$localobject->id." result=".$result."\n";
+ $this->assertLessThan($result, 0, 'Holiday::update_note (public) error');
$newobject=new Holiday($this->savdb);
diff --git a/test/phpunit/SocieteTest.php b/test/phpunit/SocieteTest.php
index 8bcfb2473651d282ef56b335c07cef2b7728f2ef..24b868b743e51a076b835e7d6823ca389e3ef0ed 100755
--- a/test/phpunit/SocieteTest.php
+++ b/test/phpunit/SocieteTest.php
@@ -211,13 +211,13 @@ class SocieteTest extends PHPUnit_Framework_TestCase
print __METHOD__." id=".$localobject->id." result=".$result."\n";
$this->assertLessThan($result, 0);
- $result=$localobject->update_note($localobject->note_private,'_private');
- print __METHOD__." id=".$localobject->id." result=".$result."\n";
- $this->assertLessThan($result, 0, 'Holiday::update_note_private error');
+ $result=$localobject->update_note($localobject->note_private,'_private');
+ print __METHOD__." id=".$localobject->id." result=".$result."\n";
+ $this->assertLessThan($result, 0, 'Holiday::update_note (private) error');
- $result=$localobject->update_note_public($localobject->note_public);
- print __METHOD__." id=".$localobject->id." result=".$result."\n";
- $this->assertLessThan($result, 0, 'Holiday::update_note_public error');
+ $result=$localobject->update_note($localobject->note_public, '_public');
+ print __METHOD__." id=".$localobject->id." result=".$result."\n";
+ $this->assertLessThan($result, 0, 'Holiday::update_note (public) error');
$newobject=new Societe($this->savdb);
$result=$newobject->fetch($localobject->id);