';
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 8eef2b06b8b..1e4b969644c 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -636,8 +636,8 @@ if ($action == 'create')
if ($backtopage) print '';
if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) print '';
- 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 9d793e16ba0..2b347036a58 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 f445c7f3596..6b3384b92dd 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -414,7 +414,7 @@ else // If javascript off
$link.='';
}
-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 5f8ce1563de..41270d7996e 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 963847aee18..eb3c51b1760 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 "
\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 "
\n";
if ($socid)
diff --git a/htdocs/comm/admin/askpricesupplier_extrafields.php b/htdocs/comm/admin/askpricesupplier_extrafields.php
index 4342549c46a..0fb0554203f 100644
--- a/htdocs/comm/admin/askpricesupplier_extrafields.php
+++ b/htdocs/comm/admin/askpricesupplier_extrafields.php
@@ -60,7 +60,7 @@ llxHeader('',$langs->trans("AskPriceSupplierSetup"));
$linkback=''.$langs->trans("BackToModuleList").'';
-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 "
";
- 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 "
";
- 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 e419b6a3168..09c215d1f3d 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=''.$langs->trans("BackToModuleList").'';
-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 "
";
- 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 "
";
- 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 bd0ce34329d..9c55c606e81 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=''.$langs->trans("BackToModuleList").'';
-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 "
";
- 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 "
";
- 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 58ab3adf109..97d4763ace3 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=''.$langs->trans("BackToModuleList").'';
-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 "
";
- 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 "
";
- 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 22732c1a19d..5b8bd88a920 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 '
';
$title = $langs->trans('ProductsAndServices');
- print_titre($title);
+ print load_fiche_titre($title);
print '';
@@ -1500,7 +1502,7 @@ if ($action == 'create')
// Margin Infos
if (! empty($conf->margin->enabled)) {
print '| ';
- $object->displayMarginInfos();
+ $formmargin->displayMarginInfos($object);
print ' | ';
}
print '';
@@ -1770,7 +1772,7 @@ if ($action == 'create')
print '';
print '
';
- 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 bee62cb384d..971b53a3534 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 681a889ed25..6936defda49 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 '';
diff --git a/htdocs/comm/askpricesupplier/tpl/linkedobjectblock.tpl.php b/htdocs/comm/askpricesupplier/tpl/linkedobjectblock.tpl.php
index 48d916c6a5c..bf16d01fa1e 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 ' ';
-print_titre($langs->trans('RelatedAskPriceSupplier'));
+print load_fiche_titre($langs->trans('RelatedAskPriceSupplier'));
?>
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 7dc359b4568..6aee0fe939c 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 '';
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index b7d4f909fa7..fde56efb25e 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -673,7 +673,7 @@ if ($action == 'create')
print ' ';
print ' ';
- 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 ' ';
// Print mail content
- print_fiche_titre($langs->trans("EMail"),'','');
+ print load_fiche_titre($langs->trans("EMail"),'','');
print ' ';
// Subject
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 99c73dc4837..cd3ff7b00ee 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 '';
print '';
diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php
index 1df5a7ad18f..f3866f80b96 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 5c6ae896e42..59753ee1904 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 '';
//print '';
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 24b7ab16d69..e8f374c3b8d 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 '
';
$title = $langs->trans('ProductsAndServices');
- print_titre($title);
+ print load_fiche_titre($title);
print '';
@@ -1986,7 +1988,7 @@ if ($action == 'create')
// Margin Infos
if (! empty($conf->margin->enabled)) {
print '| ';
- $object->displayMarginInfos();
+ $formmargin->displayMarginInfos($object);
print ' | ';
}
print '';
@@ -2287,7 +2289,7 @@ if ($action == 'create')
print '';
print '
';
- 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 421b2506e73..2645f39968b 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 8fc50f853c6..1bcbec9723d 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 '';
//print '';
diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php
index 9a2a712e339..e99c7122a10 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 66cde8692ce..6f53fd37a95 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 '
';
-print_titre($langs->trans('RelatedCommercialProposals'));
+print load_fiche_titre($langs->trans('RelatedCommercialProposals'));
?>
diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php
index f5f600ddd08..fba2fe9d1cd 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 '';
//print '| ';
diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php
index 6d0d1dedb2a..ea9e1382d40 100644
--- a/htdocs/comm/remise.php
+++ b/htdocs/comm/remise.php
@@ -124,7 +124,7 @@ if ($socid > 0)
print ' | ';
print '
';
- print_fiche_titre($langs->trans("NewRelativeDiscount"),'','');
+ print load_fiche_titre($langs->trans("NewRelativeDiscount"),'','');
print '';
diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index 471232ef708..957f109268a 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -264,7 +264,7 @@ if ($socid > 0)
print ' ';
print '
';
- print_fiche_titre($langs->trans("NewGlobalDiscount"),'','');
+ print load_fiche_titre($langs->trans("NewGlobalDiscount"),'','');
print '';
print '| '.$langs->trans("AmountHT").' | ';
print '';
@@ -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 '';
print '';
print '| '.$langs->trans("Date").' | '; // 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 '';
print '';
print '| '.$langs->trans("Date").' | '; // Need 120+ for format with AM/PM
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 83b86ee5525..d5f3427b77c 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 '';
@@ -2084,7 +2086,7 @@ if ($action == 'create' && $user->rights->commande->creer)
// Margin Infos
if (! empty($conf->margin->enabled)) {
print '| ';
- $object->displayMarginInfos();
+ $formmargin->displayMarginInfos($object);
print ' | ';
} else
print ' | ';
@@ -2376,7 +2378,7 @@ if ($action == 'create' && $user->rights->commande->creer)
print '';
print '
';
- 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 32fe2d52726..a50e18fe0d4 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 5baa7b7c30f..d6432a257ba 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 '';
//print '';
diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php
index 2896a6e22c6..136ac6c1b89 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 ea781a4828f..c4d48d8f72e 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 a661013802d..bf399c250d9 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 '
';
-print_titre($langs->trans('RelatedCustomerOrders'));
+print load_fiche_titre($langs->trans('RelatedCustomerOrders'));
?>
diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php
index 10e9674ec8d..deed3b1b97a 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 '';
print '';
diff --git a/htdocs/compta/bank/bilan.php b/htdocs/compta/bank/bilan.php
index edfc84c23cc..7e44778b9bd 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 '
';
print '';
diff --git a/htdocs/compta/bank/budget.php b/htdocs/compta/bank/budget.php
index f22ce342bf0..c35dec41e7d 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 '';
print "";
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index c6c34d87129..063fee8ca78 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 00755959ab9..1d9da7f9f59 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 ' | | | | |