';
// Show label of parameter
print '| ';
- if (empty($strictw3c)) {
- print '';
- }
print '';
print '';
print '';
print '';
+
+ $picto = 'generic';
+ $tmparray = explode(':', $obj->type);
+ if (!empty($tmparray[1])) {
+ $picto = preg_replace('/_send$/', '', $tmparray[1]);
+ }
+ print img_picto('', $picto, 'class="pictofixedwidth"');
+
if (!empty($tableau[$key]['tooltip'])) {
print $form->textwithpicto($label ? $label : $langs->trans('Desc'.$const), $tableau[$key]['tooltip']);
} else {
@@ -1896,8 +1903,8 @@ function form_constantes($tableau, $strictw3c = 2, $helptext = '', $text = 'Valu
print ' | ';
}
- // Submit
- if (empty($strictw3c)) {
+ // Submit button
+ if (empty($strictw3c)) { // deprecated. must be always true.
print '';
print '';
print " | ";
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 58039138fe2..6c034e9baa7 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4861,8 +4861,8 @@ function getPictoForType($key, $morecss = '')
'select' => 'list',
'sellist' => 'list',
'radio' => 'check-circle',
- 'checkbox' => 'check-square',
- 'chkbxlst' => 'check-square',
+ 'checkbox' => 'list',
+ 'chkbxlst' => 'list',
'link' => 'link',
'icon' => "question",
'point' => "country",
@@ -4932,6 +4932,12 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0, $srco
$pictowithouttext = str_replace('object_', '', $pictowithouttext);
$pictowithouttext = str_replace('_nocolor', '', $pictowithouttext);
+ // Fix some values of $pictowithouttext
+ $pictoconvertkey = array('facture' => 'bill', 'shipping' => 'shipment', 'fichinter' => 'intervention', 'agenda' => 'calendar', 'invoice_supplier' => 'supplier_invoice', 'order_supplier' => 'supplier_order');
+ if (in_array($pictowithouttext, array_keys($pictoconvertkey))) {
+ $pictowithouttext = $pictoconvertkey[$pictowithouttext];
+ }
+
if (strpos($pictowithouttext, 'fontawesome_') === 0 || strpos($pictowithouttext, 'fa-') === 0) {
// This is a font awesome image 'fontawesome_xxx' or 'fa-xxx'
$pictowithouttext = str_replace('fontawesome_', '', $pictowithouttext);
@@ -13854,7 +13860,7 @@ function show_actions_messaging($conf, $langs, $db, $filterobj, $objcon = null,
$sql .= " AND r.element_type = '".$db->escape($objcon->table_element)."' AND r.fk_element = ".((int) $objcon->id);
}
- if (is_object($filterobj) && get_class($filterobj) == 'Societe') {
+ if ((is_object($filterobj) && get_class($filterobj) == 'Societe') || (is_object($filterobj) && get_class($filterobj) == 'Contact')) {
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid";
} elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') {
$sql .= " INNER JOIN ".MAIN_DB_PREFIX."element_resources as er";
@@ -13911,6 +13917,11 @@ function show_actions_messaging($conf, $langs, $db, $filterobj, $objcon = null,
if ($filterobj->id) {
$sql .= " AND a.fk_element = ".((int) $filterobj->id);
}
+ } elseif (is_object($filterobj) && get_class($filterobj) == 'Contact' && $filterobj->id) {
+ $sql .= " AND a.fk_contact = sp.rowid";
+ if ($filterobj->id) {
+ $sql .= " AND a.fk_contact = ".((int) $filterobj->id);
+ }
}
} else {
$sql .= " AND u.rowid = ". ((int) $filterobj->id);
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 8c5ceb8656b..dd5d927662b 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -1157,7 +1157,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
* Output a task line into a pertime input mode
*
* @param string $inc Line number (start to 0, then increased by recursive call)
- * @param string $parent Id of parent task to show (0 to show all)
+ * @param int $parent Id of parent task to show (0 to show all)
* @param User|null $fuser Restrict list to user if defined
* @param Task[] $lines Array of lines
* @param int $level Level (start to 0, then increased/decrease by recursive call)
@@ -1378,7 +1378,7 @@ function projectLinesPerAction(&$inc, $parent, $fuser, $lines, &$level, &$projec
* Output a task line into a pertime input mode
*
* @param string $inc Line number (start to 0, then increased by recursive call)
- * @param string $parent Id of parent task to show (0 to show all)
+ * @param int $parent Id of parent task to show (0 to show all)
* @param User|null $fuser Restrict list to user if defined
* @param Task[] $lines Array of lines
* @param int $level Level (start to 0, then increased/decrease by recursive call)
@@ -1777,7 +1777,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
* @param string $inc Line output identificator (start to 0, then increased by recursive call)
* @param int $firstdaytoshow First day to show
* @param User|null $fuser Restrict list to user if defined
- * @param string $parent Id of parent task to show (0 to show all)
+ * @param int $parent Id of parent task to show (0 to show all)
* @param Task[] $lines Array of lines (list of tasks but we will show only if we have a specific role on task)
* @param int $level Level (start to 0, then increased/decrease by recursive call)
* @param string $projectsrole Array of roles user has on project
@@ -2177,7 +2177,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
* @param string $inc Line output identificator (start to 0, then increased by recursive call)
* @param int $firstdaytoshow First day to show
* @param User|null $fuser Restrict list to user if defined
- * @param string $parent Id of parent task to show (0 to show all)
+ * @param int $parent Id of parent task to show (0 to show all)
* @param Task[] $lines Array of lines (list of tasks but we will show only if we have a specific role on task)
* @param int $level Level (start to 0, then increased/decrease by recursive call)
* @param string $projectsrole Array of roles user has on project
diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
index 94a7f990810..254442a8df4 100644
--- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
@@ -223,7 +223,8 @@ if (in_array($type, array_keys($typewecanchangeinto))) {
}
print $formadmin->selectTypeOfFields('type', GETPOST('type', 'alpha') ? GETPOST('type', 'alpha') : $type, $typewecanchangeinto);
} else {
- print getPictoForType($type).$type2label[$type];
+ print getPictoForType($type);
+ print $type2label[$type];
print '';
}
?>
diff --git a/htdocs/delivery/card.php b/htdocs/delivery/card.php
index 24c47fd1f51..9f989484963 100644
--- a/htdocs/delivery/card.php
+++ b/htdocs/delivery/card.php
@@ -65,6 +65,10 @@ $id = GETPOSTINT('id');
if ($user->socid) {
$socid = $user->socid;
}
+
+// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
+$hookmanager->initHooks(array('deliverycard', 'globalcard'));
+
$result = restrictedArea($user, 'expedition', $id, 'delivery', 'delivery');
$object = new Delivery($db);
@@ -79,9 +83,6 @@ $extrafields->fetch_name_optionals_label($object->table_element_line);
// Load object. Make an object->fetch
include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'
-// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
-$hookmanager->initHooks(array('deliverycard', 'globalcard'));
-
$error = 0;
diff --git a/htdocs/delivery/class/delivery.class.php b/htdocs/delivery/class/delivery.class.php
index 8de7839fabd..e2ce2b4bfc1 100644
--- a/htdocs/delivery/class/delivery.class.php
+++ b/htdocs/delivery/class/delivery.class.php
@@ -267,9 +267,9 @@ class Delivery extends CommonObject
/**
* Create a line
*
- * @param string $origin_id Id of order
+ * @param int $origin_id Id of order
* @param string $qty Quantity
- * @param string $fk_product Id of predefined product
+ * @param int $fk_product Id of predefined product
* @param string $description Description
* @param array $array_options Array options
* @return int Return integer <0 if KO, >0 if OK
@@ -278,12 +278,11 @@ class Delivery extends CommonObject
{
// phpcs:enable
$error = 0;
- $idprod = $fk_product;
$sql = "INSERT INTO ".MAIN_DB_PREFIX."deliverydet (fk_delivery, fk_origin_line,";
$sql .= " fk_product, description, qty)";
$sql .= " VALUES (".$this->id.",".((int) $origin_id).",";
- $sql .= " ".($idprod > 0 ? ((int) $idprod) : "null").",";
+ $sql .= " ".($fk_product > 0 ? ((int) $fk_product) : "null").",";
$sql .= " ".($description ? "'".$this->db->escape($description)."'" : "null").",";
$sql .= (price2num($qty, 'MS')).")";
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index 4e25d22675b..40e88635b75 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -82,6 +82,9 @@ $error = 0;
if ($user->socid) {
$socid = $user->socid;
}
+// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
+$hookmanager->initHooks(array('ecmindexcard', 'globalcard'));
+
$result = restrictedArea($user, 'ecm', 0);
$permissiontoread = $user->hasRight('ecm', 'read');
@@ -90,9 +93,6 @@ $permissiontocreatedir = $user->hasRight('ecm', 'setup');
$permissiontodelete = $user->hasRight('ecm', 'upload');
$permissiontodeletedir = $user->hasRight('ecm', 'setup');
-// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
-$hookmanager->initHooks(array('ecmindexcard', 'globalcard'));
-
/*
* Actions
*/
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index 7a33cd6de59..881fe61dae4 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -87,16 +87,16 @@ $error = 0;
if ($user->socid) {
$socid = $user->socid;
}
-$result = restrictedArea($user, 'ecm', 0);
+// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
+$hookmanager->initHooks(array('ecmautocard', 'globalcard'));
+
+$result = restrictedArea($user, 'ecm', 0);
/*
* Actions
*/
-// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
-$hookmanager->initHooks(array('ecmautocard', 'globalcard'));
-
// Purge search criteria
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
$search_doc_ref = '';
diff --git a/htdocs/ecm/index_medias.php b/htdocs/ecm/index_medias.php
index 250837be6ad..bf5ca78cd16 100644
--- a/htdocs/ecm/index_medias.php
+++ b/htdocs/ecm/index_medias.php
@@ -92,6 +92,10 @@ $error = 0;
if ($user->socid) {
$socid = $user->socid;
}
+
+// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
+$hookmanager->initHooks(array('ecmmediascard', 'globalcard'));
+
$result = restrictedArea($user, 'ecm', 0);
$permissiontouploadfile = ($user->hasRight('ecm', 'setup') || $user->hasRight('mailing', 'creer') || $user->hasRight('website', 'write'));
@@ -104,9 +108,6 @@ $websitekey = '';
$permissiontoadd = $permissiontouploadfile; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles
-// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
-$hookmanager->initHooks(array('ecmmediascard', 'globalcard'));
-
/*
* Actions
*/
diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php
index 85640453e84..9575a417508 100644
--- a/htdocs/expedition/contact.php
+++ b/htdocs/expedition/contact.php
@@ -69,8 +69,8 @@ if ($id > 0 || !empty($ref)) {
if ($user->socid) {
$socid = $user->socid;
}
-$result = restrictedArea($user, 'expedition', $object->id, '');
$hookmanager->initHooks(array('shipmentcontactcard', 'globalcard'));
+$result = restrictedArea($user, 'expedition', $object->id, '');
/*
* Actions
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 1c4d6a56d48..eee296c0f35 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -55,12 +55,6 @@ $mode = GETPOST('mode', 'alpha');
$childids = $user->getAllChildIds(1);
-// Security check
-$socid = GETPOSTINT('socid');
-if ($user->socid) {
- $socid = $user->socid;
-}
-$result = restrictedArea($user, 'expensereport', '', '');
$id = GETPOSTINT('id');
// If we are on the view of a specific user
if ($id > 0) {
@@ -137,9 +131,16 @@ if ($search_user == '') {
$search_user = -1;
}
+// Security check
+$socid = GETPOSTINT('socid');
+if ($user->socid) {
+ $socid = $user->socid;
+}
+$hookmanager->initHooks(array('expensereportlist'));
+$result = restrictedArea($user, 'expensereport', '', '');
+
// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
$object = new ExpenseReport($db);
-$hookmanager->initHooks(array('expensereportlist'));
$extrafields = new ExtraFields($db);
// fetch optionals attributes and labels
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 7bf13bee5dc..c86f2735a66 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -66,6 +66,10 @@ $id = (GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id'));
if ($user->socid) {
$id = $user->socid;
}
+
+// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
+$hookmanager->initHooks(array('thirdpartysupplier', 'globalcard'));
+
$result = restrictedArea($user, 'societe&fournisseur', $id, '&societe', '', 'rowid');
$object = new Fournisseur($db);
@@ -74,8 +78,7 @@ $extrafields = new ExtraFields($db);
// fetch optionals attributes and labels
$extrafields->fetch_name_optionals_label($object->table_element);
-// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
-$hookmanager->initHooks(array('thirdpartysupplier', 'globalcard'));
+
// Security check
$result = restrictedArea($user, 'societe', $id, '&societe', '', 'fk_soc', 'rowid', 0);
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index e403acb9cca..c0fe3d11dc8 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -176,12 +176,12 @@ class FactureFournisseur extends CommonInvoice
public $date_echeance;
/**
- * @var double $amount
+ * @var float
* @deprecated See $total_ttc, $total_ht, $total_tva
*/
public $amount = 0;
/**
- * @var double $remise
+ * @var float
* @deprecated
*/
public $remise = 0;
@@ -315,6 +315,11 @@ class FactureFournisseur extends CommonInvoice
);
+ /**
+ * @var int Id User modifying
+ */
+ public $fk_user_valid;
+
/**
* Standard invoice
*/
@@ -418,6 +423,12 @@ class FactureFournisseur extends CommonInvoice
$this->db->begin();
+ // Defaults
+ $originaldatewhen = 0;
+ $nextdatewhen = 0;
+ $previousdaynextdatewhen = 0;
+ $_facrec = null;
+
// Create invoice from a template recurring invoice
if ($this->fac_rec > 0) {
$this->fk_fac_rec_source = $this->fac_rec;
@@ -433,10 +444,6 @@ class FactureFournisseur extends CommonInvoice
$nextdatewhen = dol_time_plus_duree($originaldatewhen, $_facrec->frequency, $_facrec->unit_frequency);
$previousdaynextdatewhen = dol_time_plus_duree($nextdatewhen, -1, 'd');
$this->socid = $_facrec->socid;
- } else {
- $originaldatewhen = 0;
- $nextdatewhen = 0;
- $previousdaynextdatewhen = 0;
}
$this->entity = $_facrec->entity; // Invoice created in same entity than template
@@ -506,8 +513,8 @@ class FactureFournisseur extends CommonInvoice
if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && isset($this->thirdparty->default_lang)) {
$newlang = $this->thirdparty->default_lang; // for proposal, order, invoice, ...
}
- if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && isset($this->default_lang)) {
- $newlang = $this->default_lang; // for thirdparty
+ if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && property_exists($this, 'default_lang') && isset($this->default_lang)) { // @phan-suppress-current-line PhanUndeclaredProperty
+ $newlang = $this->default_lang; // for thirdparty @phan-suppress-current-line PhanUndeclaredProperty
}
if (!empty($newlang)) {
$outputlangs = new Translate("", $conf);
@@ -747,7 +754,8 @@ class FactureFournisseur extends CommonInvoice
$localtax1_tx = $_facrec->lines[$i]->localtax1_tx;
$localtax2_tx = $_facrec->lines[$i]->localtax2_tx;
- $fk_product_fournisseur_price = empty($_facrec->lines[$i]->fk_product_fournisseur_price) ? null : $_facrec->lines[$i]->fk_product_fournisseur_price;
+ // $fk_product_fournisseur_price not used and does not exist on line
+ // $fk_product_fournisseur_price = empty($_facrec->lines[$i]->fk_product_fournisseur_price) ? null : $_facrec->lines[$i]->fk_product_fournisseur_price;
$buyprice = empty($_facrec->lines[$i]->buyprice) ? 0 : $_facrec->lines[$i]->buyprice;
// If buyprice not defined from template invoice, we try to guess the best value
@@ -1204,7 +1212,7 @@ class FactureFournisseur extends CommonInvoice
$this->author = (int) $this->author;
}
if (isset($this->fk_user_valid)) {
- $this->fk_user_valid = trim($this->fk_user_valid);
+ $this->fk_user_valid = (int) $this->fk_user_valid;
}
if (isset($this->fk_facture_source)) {
$this->fk_facture_source = (int) $this->fk_facture_source;
@@ -2056,13 +2064,13 @@ class FactureFournisseur extends CommonInvoice
* already have the right value (the caller has to manage the multilanguage).
*
* @param string $desc Description of the line
- * @param double $pu Unit price (HT or TTC according to price_base_type, > 0 even for credit note)
- * @param double $txtva Force Vat rate to use, -1 for auto.
- * @param double $txlocaltax1 LocalTax1 Rate
- * @param double $txlocaltax2 LocalTax2 Rate
- * @param double $qty Quantity
+ * @param float $pu Unit price (HT or TTC according to price_base_type, > 0 even for credit note)
+ * @param float $txtva Force Vat rate to use, -1 for auto.
+ * @param float $txlocaltax1 LocalTax1 Rate
+ * @param float $txlocaltax2 LocalTax2 Rate
+ * @param float $qty Quantity
* @param int $fk_product Product/Service ID predefined
- * @param double $remise_percent Percentage discount of the line
+ * @param float $remise_percent Percentage discount of the line
* @param int $date_start Service start date
* @param int $date_end Service expiry date
* @param int $fk_code_ventilation Accounting breakdown code
@@ -2071,10 +2079,10 @@ class FactureFournisseur extends CommonInvoice
* @param int $type Type of line (0=product, 1=service)
* @param int $rang Position of line
* @param int $notrigger Disable triggers
- * @param array $array_options extrafields array
+ * @param array $array_options extrafields array
* @param int|null $fk_unit Code of the unit to use. Null to use the default one
* @param int $origin_id id origin document
- * @param double $pu_devise Amount in currency
+ * @param float $pu_devise Amount in currency
* @param string $ref_supplier Supplier ref
* @param int $special_code Special code
* @param int $fk_parent_line Parent line id
@@ -2320,29 +2328,29 @@ class FactureFournisseur extends CommonInvoice
}
/**
- * Update a line detail into database
+ * Update a line detail in the database
*
- * @param int $id Id of line invoice
- * @param string $desc Description of line
- * @param double $pu Prix unitaire (HT ou TTC selon price_base_type)
- * @param double $vatrate VAT Rate (Can be '8.5', '8.5 (ABC)')
- * @param double $txlocaltax1 LocalTax1 Rate
- * @param double $txlocaltax2 LocalTax2 Rate
- * @param double $qty Quantity
- * @param int $idproduct Id produit
- * @param string $price_base_type HT or TTC
- * @param int $info_bits Miscellaneous information of line
- * @param int $type Type of line (0=product, 1=service)
- * @param double $remise_percent Percentage discount of the line
- * @param int $notrigger Disable triggers
- * @param int|string $date_start Date start of service
- * @param int|string $date_end Date end of service
- * @param array $array_options extrafields array
- * @param int|null $fk_unit Code of the unit to use. Null to use the default one
- * @param double $pu_devise Amount in currency
- * @param string $ref_supplier Supplier ref
- * @param int $rang Line rank
- * @return int<-1,1> Return integer <0 if KO, >0 if OK
+ * @param int $id Id of line invoice
+ * @param string $desc Description of line
+ * @param float $pu Prix unitaire (HT ou TTC selon price_base_type)
+ * @param float $vatrate VAT Rate (Can be '8.5', '8.5 (ABC)')
+ * @param float $txlocaltax1 LocalTax1 Rate
+ * @param float $txlocaltax2 LocalTax2 Rate
+ * @param float $qty Quantity
+ * @param int $idproduct Id produit
+ * @param string $price_base_type HT or TTC
+ * @param int $info_bits Miscellaneous information of line
+ * @param int $type Type of line (0=product, 1=service)
+ * @param float $remise_percent Percentage discount of the line
+ * @param int $notrigger Disable triggers
+ * @param int|string $date_start Date start of service
+ * @param int|string $date_end Date end of service
+ * @param array $array_options extrafields array
+ * @param ?int $fk_unit Code of the unit to use. Null to use the default one
+ * @param float $pu_devise Amount in currency
+ * @param string $ref_supplier Supplier ref
+ * @param int $rang Line rank
+ * @return int<-1,1> Return integer <0 if KO, >0 if OK
*/
public function updateline($id, $desc, $pu, $vatrate, $txlocaltax1 = 0, $txlocaltax2 = 0, $qty = 1, $idproduct = 0, $price_base_type = 'HT', $info_bits = 0, $type = 0, $remise_percent = 0, $notrigger = 0, $date_start = '', $date_end = '', $array_options = [], $fk_unit = null, $pu_devise = 0, $ref_supplier = '', $rang = 0)
{
@@ -3765,7 +3773,8 @@ class SupplierInvoiceLine extends CommonObjectLine
public $oldline;
/**
- * @deprecated
+ * @var string
+ * @deprecated See $product_ref
* @see $product_ref
*/
public $ref;
@@ -3830,7 +3839,13 @@ class SupplierInvoiceLine extends CommonObjectLine
*/
public $description;
+ /**
+ * @var int|string
+ */
public $date_start;
+ /**
+ * @var int|string
+ */
public $date_end;
/**
diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php
index 2821e48f771..1491fb1269f 100644
--- a/htdocs/fourn/commande/contact.php
+++ b/htdocs/fourn/commande/contact.php
@@ -46,8 +46,8 @@ $action = GETPOST('action', 'aZ09');
if ($user->socid) {
$socid = $user->socid;
}
-$result = restrictedArea($user, 'fournisseur', $id, 'commande_fournisseur', 'commande');
$hookmanager->initHooks(array('ordersuppliercardcontact', 'ordersuppliercontactcard', 'globalcard'));
+$result = restrictedArea($user, 'fournisseur', $id, 'commande_fournisseur', 'commande');
$object = new CommandeFournisseur($db);
diff --git a/htdocs/fourn/commande/info.php b/htdocs/fourn/commande/info.php
index 57ca5558c7f..bb5126b63af 100644
--- a/htdocs/fourn/commande/info.php
+++ b/htdocs/fourn/commande/info.php
@@ -76,15 +76,15 @@ $socid = 0;
if ($user->socid) {
$socid = $user->socid;
}
+// Init Hooks
+$hookmanager->initHooks(array('ordersuppliercardinfo'));
+
$result = restrictedArea($user, 'fournisseur', $id, 'commande_fournisseur', 'commande');
if (!$user->hasRight("fournisseur", "commande", "lire")) {
accessforbidden();
}
-// Init Hooks
-$hookmanager->initHooks(array('ordersuppliercardinfo'));
-
$usercancreate = ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer"));
$permissiontoadd = $usercancreate; // Used by the include of actions_addupdatedelete.inc.php
diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index c896656c791..8abbf086867 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -47,8 +47,8 @@ $action = GETPOST('action', 'aZ09');
if ($user->socid) {
$socid = $user->socid;
}
-$result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
$hookmanager->initHooks(array('invoicesuppliercardcontact','invoicesuppliercontactcard', 'globalcard'));
+$result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
$object = new FactureFournisseur($db);
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index 5f31ab179cd..843c9f41211 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -51,8 +51,8 @@ $ref = GETPOST('ref', 'alpha');
if ($user->socid) {
$socid = $user->socid;
}
-$result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
$hookmanager->initHooks(array('invoicesuppliercarddocument'));
+$result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
// Get parameters
$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
diff --git a/htdocs/fourn/facture/info.php b/htdocs/fourn/facture/info.php
index 46671b03d4c..afade92390a 100644
--- a/htdocs/fourn/facture/info.php
+++ b/htdocs/fourn/facture/info.php
@@ -44,8 +44,8 @@ $ref = GETPOST("ref", 'alpha');
if ($user->socid) {
$socid = $user->socid;
}
-$result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
$hookmanager->initHooks(array('invoicesuppliercardinfo'));
+$result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
$object = new FactureFournisseur($db);
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index 1ce43edf5ac..0e7bbc1bfee 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -38,6 +38,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/import.lib.php';
// Load translation files required by the page
$langs->loadLangs(array('exports', 'compta', 'errors', 'projects', 'admin'));
+// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
+$hookmanager->initHooks(array('imports'));
+
// Security check
$result = restrictedArea($user, 'import');
@@ -147,11 +150,6 @@ $enclosure = (GETPOST('enclosure', 'nohtml') ? GETPOST('enclosure', 'nohtml')
$charset = GETPOST('charset', 'aZ09');
$separator_used = str_replace('\t', "\t", $separator);
-
-// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
-$hookmanager->initHooks(array('imports'));
-
-
$objimport = new Import($db);
$objimport->load_arrays($user, ($step == 1 ? '' : $datatoimport));
diff --git a/htdocs/install/mysql/tables/llx_contrat.sql b/htdocs/install/mysql/tables/llx_contrat.sql
index 6269cdbc8d0..15837f25125 100644
--- a/htdocs/install/mysql/tables/llx_contrat.sql
+++ b/htdocs/install/mysql/tables/llx_contrat.sql
@@ -30,12 +30,14 @@ create table llx_contrat
datec datetime, -- creation date
date_contrat datetime,
statut smallint DEFAULT 0, -- not used. deprecated
- fin_validite datetime,
- date_cloture datetime,
+
+ fin_validite datetime, -- not used
+ date_cloture datetime, -- not used
+
fk_soc integer NOT NULL,
fk_projet integer,
- fk_commercial_signature integer, -- obsolete
- fk_commercial_suivi integer, -- obsolete
+ fk_commercial_signature integer, -- obsolete
+ fk_commercial_suivi integer, -- obsolete
fk_user_author integer NOT NULL default 0,
fk_user_modif integer,
fk_user_cloture integer,
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 242fc0d79a4..bd7939331c9 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -454,13 +454,13 @@ ExtrafieldPriceWithCurrency=Price with currency
ExtrafieldMail = Email
ExtrafieldUrl = Url
ExtrafieldIP = IP
-ExtrafieldSelect = Select list
-ExtrafieldSelectList = Select from table
+ExtrafieldSelect=Select list
+ExtrafieldSelectList=Select from table
ExtrafieldSeparator=Separator (not a field)
ExtrafieldPassword=Password
-ExtrafieldRadio=Radio buttons (one choice only)
-ExtrafieldCheckBox=Checkboxes
-ExtrafieldCheckBoxFromList=Checkboxes from table
+ExtrafieldRadio=Radio buttons (1 choice only)
+ExtrafieldCheckBox=Select list (n choices)
+ExtrafieldCheckBoxFromList=Select from table (n choices)
ExtrafieldLink=Link to an object
ExtrafieldPointGeo=Geometric Point
ExtrafieldMultiPointGeo=Geometric Multi Point
@@ -475,7 +475,7 @@ ExtrafieldParamHelpselect=List of values must be lines with format key,value (wh
ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')
for example:
1,value1
2,value2
3,value3
...
ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')
for example:
1,value1
2,value2
3,value3
...
ExtrafieldParamHelpsellist=List of values comes from a table
Syntax: table_name:label_field:id_field::filtersql
Example: c_typent:libelle:id::filtersql
- id_field is necessarily a primary int key
- filtersql is a condition. It must use the USF syntax. Example: (active:=:1) to display only active value
You can also use $ID$ in filter which is the current id of current object
If you want to filter on extrafields use syntax extra.fieldcode=... (where fieldcode is the code of extrafield)
In order to have the list depending on another complementary attribute list:
c_typent:libelle:id:options_parent_list_code|parent_column:filter
In order to have the list depending on another list:
c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table
Syntax: table_name:label_field:id_field::filtersql
Example: c_typent:libelle:id::filtersql
filter can be a simple test (eg active=1) to display only active value
You can also use $ID$ in filter witch is the current id of current object
To do a SELECT in filter use $SEL$
if you want to filter on extrafields use syntax extra.fieldcode=... (where field code is the code of extrafield)
In order to have the list depending on another complementary attribute list:
c_typent:libelle:id:options_parent_list_code|parent_column:filter
In order to have the list depending on another list:
c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpchkbxlst=List of values comes from a table
Syntax: table_name:label_field:id_field::filtersql
Example: c_typent:libelle:id::filtersql
filter can be a simple test (eg active=1 to display only active value)
You can also use $ID$ in filter witch is the current id of current object
To do a SELECT in filter use $SEL$
if you want to filter on extrafields use syntax extra.fieldcode=... (where field code is the code of extrafield)
In order to have the list depending on another complementary attribute list:
c_typent:libelle:id:options_parent_list_code|parent_column:filter
In order to have the list depending on another list:
c_typent:libelle:id:parent_list_code|parent_column:filter
ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath
Syntax: ObjectName:Classpath
ExtrafieldParamHelpSeparator=Keep empty for a simple separator
Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)
Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
LibraryToBuildPDF=Library used for PDF generation
@@ -1457,7 +1457,7 @@ HRMSetup=HRM module setup
CompanySetup=Companies module setup
CompanyCodeChecker=Options for automatic generation of customer/vendor codes
AccountCodeManager=Options for automatic generation of customer/vendor accounting codes
-NotificationsDesc=Email notifications can be sent automatically for some Dolibarr events.
Recipients of notifications can be defined:
+NotificationsDesc=Email notifications can be sent automatically on certain events.
Recipients of notifications can be defined:
NotificationsDescUser=* per user (on the tab "Notifications" of a user)
NotificationsDescContact=* per third-party contacts (on the tab "Notifications" of a third party)
NotificationsDescGlobal=* or by setting global email addresses (on the setup page of the module).
@@ -1993,10 +1993,10 @@ ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
ExpenseReportNumberingModules=Expense reports numbering module
NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-TemplatesForNotifications=Templates for notifications
+TemplatesForNotifications=Emails templates for notifications
ListOfNotificationsPerUser=List of automatic notifications per user*
ListOfNotificationsPerUserOrContact=List of possible automatic notifications (on business event) available per user* or per contact**
-ListOfFixedNotifications=List of automatic fixed notifications
+ListOfFixedNotifications=Global recipients emails for automatic email notifications
GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
GoOntoContactCardToAddMore=Go to the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
Threshold=Threshold
@@ -2279,6 +2279,7 @@ NotAPublicIp=Not a public IP
MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
EmailTemplate=Template for email
+EmailTemplateHelp=You can create emails templates from menu %s - %s
EMailsWillHaveMessageID=Emails will have a 'Message-ID' header matching this syntax
PDF_SHOW_PROJECT=Show project on document
ShowProjectLabel=Project Label
@@ -2549,6 +2550,6 @@ ConfirmDeleteSocialNetwork= Are you sure want to delete this record ?
AnOwnerMustBeSetIfEmailTemplateIsPrivate=An owner must be set if the email template is set as private
ContactsDefaultRoles=For third parties of the "individual" type, a contact can be created simultaneously. Define here the roles that will be systematically assigned to this contact.
MenuDict=Dictionary
-AddMoreParams=Add more parameters for connection (cookies, tokens, ...)
Exemple: token : value token
+AddMoreParams=Add more parameters for connection (cookies, tokens, ...)
Example: token : value token
ParamName=Name of parameter
-ParamValue=Value of parameter
\ No newline at end of file
+ParamValue=Value of parameter
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index ef4457e9177..fc5c392d5a7 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -58,12 +58,11 @@ $socid = GETPOSTINT('socid');
if ($user->socid) {
$socid = $user->socid;
}
+$hookmanager->initHooks(array('loancard', 'globalcard'));
$result = restrictedArea($user, 'loan', $id, '', '');
$object = new Loan($db);
-$hookmanager->initHooks(array('loancard', 'globalcard'));
-
$error = 0;
diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index c484f01495e..cc1e061623f 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -78,12 +78,13 @@ if (!empty($enddatemonth)) {
$enddate = dol_mktime(23, 59, 59, $enddatemonth, $enddateday, $enddateyear);
}
+$hookmanager->initHooks(array('marginagentlist'));
+
// Security check
$result = restrictedArea($user, 'margins');
// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
$object = new User($db);
-$hookmanager->initHooks(array('marginagentlist'));
/*
* Actions
diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index 8d5cdd75ab6..4c8062adbbb 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -61,14 +61,14 @@ if (!$sortfield) {
$sortfield = "f.datef";
}
+$hookmanager->initHooks(array('tabproductmarginlist'));
+
$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
if (!$user->hasRight('margins', 'liretous')) {
accessforbidden();
}
-$hookmanager->initHooks(array('tabproductmarginlist'));
-
$search_invoice_date_start = '';
$search_invoice_date_end = '';
if (GETPOSTINT('search_invoice_date_start_month')) {
@@ -96,8 +96,8 @@ if (empty($search_invoice_date_start) && empty($search_invoice_date_end) && !GET
$search_invoice_date_start = strtotime($fiscalYear->date_start);
$search_invoice_date_end = strtotime($fiscalYear->date_end);
} else {
- $month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1);
- $year_start = dol_print_date(dol_now(), '%Y');
+ $month_start = getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1);
+ $year_start = (int) dol_print_date(dol_now(), '%Y');
if (dol_print_date(dol_now(), '%m') < $month_start) {
$year_start--; // If current month is lower that starting fiscal month, we start last year
}
diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php
index 5efcde97c71..f0fb30079af 100644
--- a/htdocs/margin/tabs/thirdpartyMargins.php
+++ b/htdocs/margin/tabs/thirdpartyMargins.php
@@ -105,8 +105,8 @@ if (empty($search_invoice_date_start) && empty($search_invoice_date_end) && !GET
$search_invoice_date_start = strtotime($fiscalYear->date_start);
$search_invoice_date_end = strtotime($fiscalYear->date_end);
} else {
- $month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1);
- $year_start = dol_print_date(dol_now(), '%Y');
+ $month_start = getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1);
+ $year_start = (int) dol_print_date(dol_now(), '%Y');
if (dol_print_date(dol_now(), '%m') < $month_start) {
$year_start--; // If current month is lower that starting fiscal month, we start last year
}
diff --git a/htdocs/modulebuilder/template/mymoduleindex.php b/htdocs/modulebuilder/template/mymoduleindex.php
index 91781a7d148..c6ebcdbb8e3 100644
--- a/htdocs/modulebuilder/template/mymoduleindex.php
+++ b/htdocs/modulebuilder/template/mymoduleindex.php
@@ -76,6 +76,9 @@ if (isset($user->socid) && $user->socid > 0) {
$socid = $user->socid;
}
+// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array
+//$hookmanager->initHooks(array($object->element.'index'));
+
// Security check (enable the most restrictive one)
//if ($user->socid > 0) accessforbidden();
//if ($user->socid > 0) $socid = $user->socid;
diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php
index 40e30036df0..82adfeae524 100644
--- a/htdocs/product/ajax/products.php
+++ b/htdocs/product/ajax/products.php
@@ -59,6 +59,7 @@ $finished = GETPOSTINT('finished');
$alsoproductwithnosupplierprice = GETPOSTINT('alsoproductwithnosupplierprice');
$warehouseStatus = GETPOST('warehousestatus', 'alpha');
$hidepriceinlabel = GETPOSTINT('hidepriceinlabel');
+$warehouseId = GETPOST('warehouseid', 'int');
// Security check
restrictedArea($user, 'produit|service|commande|propal|facture', 0, 'product&product');
@@ -308,7 +309,7 @@ if ($action == 'fetch' && !empty($id)) {
}
if (empty($mode) || $mode == 1) { // mode=1: customer
- $arrayresult = $form->select_produits_list("", $htmlname, $type, 0, $price_level, $searchkey, $status, $finished, $outjson, $socid, '1', 0, '', $hidepriceinlabel, $warehouseStatus, $status_purchase);
+ $arrayresult = $form->select_produits_list("", $htmlname, $type, 0, $price_level, $searchkey, $status, $finished, $outjson, $socid, '1', 0, '', $hidepriceinlabel, $warehouseStatus, $status_purchase, $warehouseId);
} elseif ($mode == 2) { // mode=2: supplier
$arrayresult = $form->select_produits_fournisseurs_list($socid, "", $htmlname, $type, "", $searchkey, $status, $outjson, 0, $alsoproductwithnosupplierprice);
}
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index ac95b0a8e33..458bda8d606 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -187,6 +187,9 @@ if (!empty($canvas)) {
$fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : ''));
$fieldtype = (!empty($id) ? 'rowid' : 'ref');
+// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
+$hookmanager->initHooks(array('productcard', 'globalcard'));
+
if ($object->id > 0) {
if ($object->type == $object::TYPE_PRODUCT) {
restrictedArea($user, 'produit', $object->id, 'product&product', '', '');
@@ -198,9 +201,6 @@ if ($object->id > 0) {
restrictedArea($user, 'produit|service', 0, 'product&product', '', '', $fieldtype);
}
-// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
-$hookmanager->initHooks(array('productcard', 'globalcard'));
-
// Permissions
$usercanread = (($object->type == Product::TYPE_PRODUCT && $user->hasRight('produit', 'read')) || ($object->type == Product::TYPE_SERVICE && $user->hasRight('service', 'lire')));
$usercancreate = (($object->type == Product::TYPE_PRODUCT && $user->hasRight('produit', 'creer')) || ($object->type == Product::TYPE_SERVICE && $user->hasRight('service', 'creer')));
diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php
index 2fc3e789ac5..a56f734d006 100644
--- a/htdocs/product/inventory/card.php
+++ b/htdocs/product/inventory/card.php
@@ -42,6 +42,8 @@ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'in
$backtopage = GETPOST('backtopage', 'alpha');
$include_sub_warehouse = !empty(GETPOST('include_sub_warehouse')) ? GETPOST('include_sub_warehouse') : 0;
+$hookmanager->initHooks(array('inventorycard', 'globalcard')); // Note that conf->hooks_modules contains array
+
if (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {
$result = restrictedArea($user, 'stock', $id);
} else {
@@ -55,7 +57,6 @@ $extrafields = new ExtraFields($db);
$includedocgeneration = false;
$diroutputmassaction = null;
// $diroutputmassaction = $conf->stock->dir_output.'/temp/massgeneration/'.$user->id;
-$hookmanager->initHooks(array('inventorycard', 'globalcard')); // Note that conf->hooks_modules contains array
// Fetch optionals attributes and labels
$extrafields->fetch_name_optionals_label($object->table_element);
diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index 9f4660815fb..af420a87464 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -59,6 +59,7 @@ $lineid = GETPOSTINT('lineid');
$batch = GETPOST('batch', 'alphanohtml');
$totalExpectedValuation = 0;
$totalRealValuation = 0;
+$hookmanager->initHooks(array('inventorycard')); // Note that conf->hooks_modules contains array
if (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {
$result = restrictedArea($user, 'stock', $id);
} else {
@@ -69,7 +70,7 @@ if (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {
$object = new Inventory($db);
$extrafields = new ExtraFields($db);
$diroutputmassaction = $conf->stock->dir_output.'/temp/massgeneration/'.$user->id;
-$hookmanager->initHooks(array('inventorycard')); // Note that conf->hooks_modules contains array
+
// Fetch optionals attributes and labels
$extrafields->fetch_name_optionals_label($object->table_element);
diff --git a/htdocs/product/note.php b/htdocs/product/note.php
index b718f9894ec..f5e431fc313 100644
--- a/htdocs/product/note.php
+++ b/htdocs/product/note.php
@@ -52,6 +52,8 @@ if ($id > 0 || !empty($ref)) {
$permissionnote = ($user->hasRight('produit', 'creer') || $user->hasRight('service', 'creer')); // Used by the include of actions_setnotes.inc.php
+$hookmanager->initHooks(array('productnote'));
+
if ($object->id > 0) {
if ($object->type == $object::TYPE_PRODUCT) {
restrictedArea($user, 'product', $object->id, 'product&product', '', '');
@@ -63,10 +65,6 @@ if ($object->id > 0) {
restrictedArea($user, 'product|service', $fieldvalue, 'product&product', '', '', $fieldtype);
}
-
-$hookmanager->initHooks(array('productnote'));
-
-
/*
* Actions
*/
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index ba148724206..62af7f3dd3b 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -42,14 +42,16 @@ $ref = GETPOST('ref', 'alpha');
$fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : ''));
$fieldtype = (!empty($ref) ? 'ref' : 'rowid');
$socid = '';
+
if (!empty($user->socid)) {
$socid = $user->socid;
}
-$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
$hookmanager->initHooks(array('productstatspropal'));
+$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
+
// Load variable for pagination
$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
$sortfield = GETPOST('sortfield', 'aZ09comma');
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index b89e5f16929..c69ed74ff58 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -72,13 +72,13 @@ if (!$sortorder) {
$sortorder = "DESC";
}
+// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
+$hookmanager->initHooks(array('warehousecard', 'stocklist', 'globalcard'));
+
// Security check
//$result=restrictedArea($user,'stock', $id, 'entrepot&stock');
$result = restrictedArea($user, 'stock');
-// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
-$hookmanager->initHooks(array('warehousecard', 'stocklist', 'globalcard'));
-
$object = new Entrepot($db);
$extrafields = new ExtraFields($db);
diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php
index a72e8ed14e4..7833d7b42bd 100644
--- a/htdocs/product/stock/massstockmove.php
+++ b/htdocs/product/stock/massstockmove.php
@@ -691,19 +691,18 @@ if (getDolGlobalInt('PRODUIT_LIMIT_SIZE') <= 0) {
} else {
$limit = getDolGlobalString('PRODUIT_LIMIT_SIZE');
}
-
print img_picto($langs->trans("Product"), 'product', 'class="paddingright"');
-print $form->select_produits($id_product, 'productid', $filtertype, $limit, 0, -1, 2, '', 1, array(), 0, '1', 0, 'minwidth200imp maxwidth300', 1, '', null, 1);
+print $form->select_produits((isset($id_product)?$id_product:0), 'productid', $filtertype, $limit, 0, -1, 2, '', 1, array(), 0, '1', 0, 'minwidth200imp maxwidth300', 1, '', null, 1);
print '';
// Batch number
if (isModEnabled('productbatch')) {
print '';
print img_picto($langs->trans("LotSerial"), 'lot', 'class="paddingright"');
- print '';
+ print '';
print ' | ';
}
// Qty
-print ' | ';
+print ' | ';
// Button to add line
print ' | ';
diff --git a/htdocs/product/stock/movement_card.php b/htdocs/product/stock/movement_card.php
index df89401e1c8..a1c8906f6aa 100644
--- a/htdocs/product/stock/movement_card.php
+++ b/htdocs/product/stock/movement_card.php
@@ -50,9 +50,6 @@ if (isModEnabled('productbatch')) {
$langs->load("productbatch");
}
-// Security check
-$result = restrictedArea($user, 'stock');
-
$id = GETPOSTINT('id');
$ref = GETPOST('ref', 'alpha');
$msid = GETPOSTINT('msid');
@@ -92,9 +89,13 @@ if (!$sortorder) {
$pdluoid = GETPOSTINT('pdluoid');
+$hookmanager->initHooks(array('movementlist'));
+
+// Security check
+$result = restrictedArea($user, 'stock');
+
// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
$object = new MouvementStock($db);
-$hookmanager->initHooks(array('movementlist'));
$extrafields = new ExtraFields($db);
$formfile = new FormFile($db);
diff --git a/htdocs/product/stock/productlot_document.php b/htdocs/product/stock/productlot_document.php
index e594d612f73..30924bcde8f 100644
--- a/htdocs/product/stock/productlot_document.php
+++ b/htdocs/product/stock/productlot_document.php
@@ -54,11 +54,12 @@ $fieldtype = 'rowid';
if ($user->socid) {
$socid = $user->socid;
}
-$result = restrictedArea($user, 'produit|service');
// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
$hookmanager->initHooks(array('productlotdocuments'));
+$result = restrictedArea($user, 'produit|service');
+
// Get parameters
$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
$sortfield = GETPOST('sortfield', 'aZ09comma');
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index cf358161eb4..e895b6d792b 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -45,11 +45,12 @@ $langs->loadLangs(array('products', 'stocks', 'orders'));
if ($user->socid) {
$socid = $user->socid;
}
-$result = restrictedArea($user, 'produit|service');
// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
$hookmanager->initHooks(array('stockreplenishlist'));
+$result = restrictedArea($user, 'produit|service');
+
//checks if a product has been ordered
$action = GETPOST('action', 'aZ09');
diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php
index ca9529267b4..0eb8369a4ef 100644
--- a/htdocs/product/traduction.php
+++ b/htdocs/product/traduction.php
@@ -53,6 +53,9 @@ if ($id > 0 || !empty($ref)) {
$object->fetch($id, $ref);
}
+// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
+$hookmanager->initHooks(array('producttranslationcard', 'globalcard'));
+
if ($object->id > 0) {
if ($object->type == $object::TYPE_PRODUCT) {
restrictedArea($user, 'produit', $object->id, 'product&product', '', '');
@@ -64,10 +67,6 @@ if ($object->id > 0) {
restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
}
-// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
-$hookmanager->initHooks(array('producttranslationcard', 'globalcard'));
-
-
/*
* Actions
*/
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 365a01d97fc..04267bb5d14 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -635,9 +635,11 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
if ($filefound && !empty($classname)) {
$result = dol_include_once($reldir."core/modules/project/".$modele.'.php');
- $modProject = new $classname();
+ if (class_exists($classname)) {
+ $modProject = new $classname();
- $defaultref = $modProject->getNextValue($thirdparty, $object);
+ $defaultref = $modProject->getNextValue($thirdparty, $object);
+ }
}
if (is_numeric($defaultref) && $defaultref <= 0) {
diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index 1a1c14ac052..773e7fad1a1 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -61,11 +61,12 @@ if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($obj
// Security check
$socid = 0;
-//if ($user->socid > 0) $socid = $user->socid; // For external user, no check is done on company because readability is managed by public status of project and assignment.
-$result = restrictedArea($user, 'projet', $id, 'projet&project');
$hookmanager->initHooks(array('projectcontactcard', 'globalcard'));
+//if ($user->socid > 0) $socid = $user->socid; // For external user, no check is done on company because readability is managed by public status of project and assignment.
+$result = restrictedArea($user, 'projet', $id, 'projet&project');
+
/*
* Actions
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 2b983efa0aa..24459f7dcbd 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -187,11 +187,12 @@ if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($obj
// Security check
$socid = $object->socid;
-//if ($user->socid > 0) $socid = $user->socid; // For external user, no check is done on company because readability is managed by public status of project and assignment.
-$result = restrictedArea($user, 'projet', $object->id, 'projet&project');
$hookmanager->initHooks(array('projectOverview'));
+//if ($user->socid > 0) $socid = $user->socid; // For external user, no check is done on company because readability is managed by public status of project and assignment.
+$result = restrictedArea($user, 'projet', $object->id, 'projet&project');
+
/*
* View
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 86e7771c855..fc11ddad28e 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -139,14 +139,15 @@ if (!$sortorder) {
// Security check
$socid = 0;
+
+// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
+$hookmanager->initHooks(array('projecttaskscard', 'globalcard'));
+
//if ($user->socid > 0) $socid = $user->socid; // For external user, no check is done on company because readability is managed by public status of project and assignment.
$result = restrictedArea($user, 'projet', $id, 'projet&project');
$diroutputmassaction = $conf->project->dir_output.'/tasks/temp/massgeneration/'.$user->id;
-// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
-$hookmanager->initHooks(array('projecttaskscard', 'globalcard'));
-
$progress = GETPOSTINT('progress');
$budget_amount = GETPOSTFLOAT('budget_amount');
$billable = (GETPOST('billable', 'aZ') == 'yes'? 1 : 0);
diff --git a/htdocs/public/project/new.php b/htdocs/public/project/new.php
index 8cd5ba18d6a..e95341d683b 100644
--- a/htdocs/public/project/new.php
+++ b/htdocs/public/project/new.php
@@ -276,9 +276,11 @@ if (empty($reshook) && $action == 'add') {
if ($filefound && !empty($classname)) {
$result = dol_include_once($reldir."core/modules/project/".$modele.'.php');
- $modProject = new $classname();
+ if (class_exists($classname)) {
+ $modProject = new $classname();
- $defaultref = $modProject->getNextValue($thirdparty, $object);
+ $defaultref = $modProject->getNextValue($thirdparty, $object);
+ }
}
if (is_numeric($defaultref) && $defaultref <= 0) {
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 457b21e046c..a6e19e93dba 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -308,6 +308,7 @@ if (empty($reshook)) {
// avec info diverses + qte a livrer
if ($object->origin == "supplierorder") {
+ $object->origin = 'order_supplier';
$classname = 'CommandeFournisseur';
} else {
$classname = ucfirst($object->origin);
@@ -438,6 +439,30 @@ if (empty($reshook)) {
if ($ret <= 0) {
setEventMessages($object->error, $object->errors, 'errors');
$error++;
+ } else {
+ // Define output language
+ if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
+ $object->fetch_thirdparty();
+ $outputlangs = $langs;
+ $newlang = '';
+ if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+ $newlang = GETPOST('lang_id', 'aZ09');
+ }
+ if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang)) {
+ $newlang = $object->thirdparty->default_lang;
+ }
+ if (!empty($newlang)) {
+ $outputlangs = new Translate("", $conf);
+ $outputlangs->setDefaultLang($newlang);
+ }
+ $model = $object->model_pdf;
+ $ret = $object->fetch($object->id); // Reload to get new records
+
+ $result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+ if ($result < 0) {
+ dol_print_error($db, $result);
+ }
+ }
}
}
} else {
diff --git a/htdocs/recruitment/class/api_recruitments.class.php b/htdocs/recruitment/class/api_recruitments.class.php
index 4d509928372..bfa82e27155 100644
--- a/htdocs/recruitment/class/api_recruitments.class.php
+++ b/htdocs/recruitment/class/api_recruitments.class.php
@@ -123,7 +123,6 @@ class Recruitments extends DolibarrApi
return $this->_cleanObjectDatas($this->candidature);
}
-
/**
* List jobpositions
*
@@ -135,13 +134,14 @@ class Recruitments extends DolibarrApi
* @param int $page Page number
* @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
* @param string $properties Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
+ * @param bool $pagination_data If this parameter is set to true the response will include pagination data. Default value is false. Page starts from 0*
* @return array Array of order objects
*
* @throws RestException
*
* @url GET /jobposition/
*/
- public function indexJobPosition($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '', $properties = '')
+ public function indexJobPosition($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '', $properties = '', $pagination_data = false)
{
$obj_ret = array();
$tmpobject = new RecruitmentJobPosition($this->db);
@@ -186,6 +186,9 @@ class Recruitments extends DolibarrApi
}
}
+ //this query will return total orders with the filters given
+ $sqlTotals = str_replace('SELECT t.rowid', 'SELECT count(t.rowid) as total', $sql);
+
$sql .= $this->db->order($sortfield, $sortorder);
if ($limit) {
if ($page < 0) {
@@ -212,6 +215,23 @@ class Recruitments extends DolibarrApi
throw new RestException(503, 'Error when retrieving jobposition list: '.$this->db->lasterror());
}
+ //if $pagination_data is true the response will contain element data with all values and element pagination with pagination data(total,page,limit)
+ if ($pagination_data) {
+ $totalsResult = $this->db->query($sqlTotals);
+ $total = $this->db->fetch_object($totalsResult)->total;
+
+ $tmp = $obj_ret;
+ $obj_ret = [];
+
+ $obj_ret['data'] = $tmp;
+ $obj_ret['pagination'] = [
+ 'total' => (int) $total,
+ 'page' => $page, //count starts from 0
+ 'page_count' => ceil((int) $total / $limit),
+ 'limit' => $limit
+ ];
+ }
+
return $obj_ret;
}
@@ -225,13 +245,15 @@ class Recruitments extends DolibarrApi
* @param int $limit Limit for list
* @param int $page Page number
* @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
+ * @param string $properties Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
+ * @param bool $pagination_data If this parameter is set to true the response will include pagination data. Default value is false. Page starts from 0*
* @return array Array of order objects
*
* @throws RestException
*
* @url GET /candidature/
*/
- public function indexCandidature($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
+ public function indexCandidature($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '', $properties = '', $pagination_data = false)
{
global $db, $conf;
@@ -278,6 +300,9 @@ class Recruitments extends DolibarrApi
}
}
+ //this query will return total orders with the filters given
+ $sqlTotals = str_replace('SELECT t.rowid', 'SELECT count(t.rowid) as total', $sql);
+
$sql .= $this->db->order($sortfield, $sortorder);
if ($limit) {
if ($page < 0) {
@@ -296,7 +321,7 @@ class Recruitments extends DolibarrApi
$obj = $this->db->fetch_object($result);
$tmp_object = new RecruitmentCandidature($this->db);
if ($tmp_object->fetch($obj->rowid)) {
- $obj_ret[] = $this->_cleanObjectDatas($tmp_object);
+ $obj_ret[] = $this->_filterObjectProperties($this->_cleanObjectDatas($tmp_object), $properties);
}
$i++;
}
@@ -304,6 +329,23 @@ class Recruitments extends DolibarrApi
throw new RestException(503, 'Error when retrieving candidature list: '.$this->db->lasterror());
}
+ //if $pagination_data is true the response will contain element data with all values and element pagination with pagination data(total,page,limit)
+ if ($pagination_data) {
+ $totalsResult = $this->db->query($sqlTotals);
+ $total = $this->db->fetch_object($totalsResult)->total;
+
+ $tmp = $obj_ret;
+ $obj_ret = [];
+
+ $obj_ret['data'] = $tmp;
+ $obj_ret['pagination'] = [
+ 'total' => (int) $total,
+ 'page' => $page, //count starts from 0
+ 'page_count' => ceil((int) $total / $limit),
+ 'limit' => $limit
+ ];
+ }
+
return $obj_ret;
}
diff --git a/htdocs/resource/card.php b/htdocs/resource/card.php
index eb692907114..d4591534da6 100644
--- a/htdocs/resource/card.php
+++ b/htdocs/resource/card.php
@@ -69,6 +69,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
// Load object
include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'.
+$hookmanager->initHooks(array('resource', 'resource_card', 'globalcard'));
$result = restrictedArea($user, 'resource', $object->id, 'resource');
@@ -80,7 +81,6 @@ $permissiontodelete = $user->hasRight('resource', 'delete');
* Actions
*/
-$hookmanager->initHooks(array('resource', 'resource_card', 'globalcard'));
$parameters = array('resource_id' => $id);
$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook < 0) {
diff --git a/htdocs/societe/class/api_contacts.class.php b/htdocs/societe/class/api_contacts.class.php
index 95e7de8d649..f345a21abc2 100644
--- a/htdocs/societe/class/api_contacts.class.php
+++ b/htdocs/societe/class/api_contacts.class.php
@@ -168,11 +168,12 @@ class Contacts extends DolibarrApi
* @param int $includecount Count and return also number of elements the contact is used as a link for
* @param int $includeroles Includes roles of the contact
* @param string $properties Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
+ * @param bool $pagination_data If this parameter is set to true the response will include pagination data. Default value is false. Page starts from 0*
* @return Contact[] Array of contact objects
*
* @throws RestException
*/
- public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $category = 0, $sqlfilters = '', $includecount = 0, $includeroles = 0, $properties = '')
+ public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $category = 0, $sqlfilters = '', $includecount = 0, $includeroles = 0, $properties = '', $pagination_data = false)
{
global $db, $conf;
@@ -225,6 +226,9 @@ class Contacts extends DolibarrApi
}
}
+ //this query will return total orders with the filters given
+ $sqlTotals = str_replace('SELECT t.rowid', 'SELECT count(t.rowid) as total', $sql);
+
$sql .= $this->db->order($sortfield, $sortorder);
if ($limit) {
@@ -263,9 +267,24 @@ class Contacts extends DolibarrApi
} else {
throw new RestException(503, 'Error when retrieve contacts : '.$sql);
}
- if (!count($obj_ret)) {
- throw new RestException(404, 'Contacts not found');
+
+ //if $pagination_data is true the response will contain element data with all values and element pagination with pagination data(total,page,limit)
+ if ($pagination_data) {
+ $totalsResult = $this->db->query($sqlTotals);
+ $total = $this->db->fetch_object($totalsResult)->total;
+
+ $tmp = $obj_ret;
+ $obj_ret = [];
+
+ $obj_ret['data'] = $tmp;
+ $obj_ret['pagination'] = [
+ 'total' => (int) $total,
+ 'page' => $page, //count starts from 0
+ 'page_count' => ceil((int) $total / $limit),
+ 'limit' => $limit
+ ];
}
+
return $obj_ret;
}
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 0bf35006754..677878ad9b8 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1169,7 +1169,9 @@ class Societe extends CommonObject
$contact->town = $this->town;
$this->setUpperOrLowerCase();
$contact->phone_pro = $this->phone;
- $contact->roles = explode(',', getDolGlobalString('CONTACTS_DEFAULT_ROLES'));
+ if (getDolGlobalString('CONTACTS_DEFAULT_ROLES')) {
+ $contact->roles = explode(',', getDolGlobalString('CONTACTS_DEFAULT_ROLES'));
+ }
$contactId = $contact->create($user, $notrigger);
if ($contactId < 0) {
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 22cb2326c1a..253b273d774 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -46,6 +46,10 @@ $socid = GETPOSTINT('socid');
if ($user->socid) {
$socid = $user->socid;
}
+
+// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
+$hookmanager->initHooks(array('consumptionthirdparty', 'globalcard'));
+
$result = restrictedArea($user, 'societe', $socid, '&societe');
$object = new Societe($db);
if ($socid > 0) {
@@ -90,11 +94,6 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
$thirdTypeSelect = GETPOST("third_select_id", 'aZ09');
$type_element = GETPOST('type_element') ? GETPOST('type_element') : '';
-
-// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
-$hookmanager->initHooks(array('consumptionthirdparty', 'globalcard'));
-
-
/*
* Actions
*/
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index 720b03549f6..19fe3cda5fd 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -44,6 +44,10 @@ $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always ''
if ($user->socid) {
$socid = $user->socid;
}
+
+// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
+$hookmanager->initHooks(array('thirdpartynotification', 'globalcard'));
+
$result = restrictedArea($user, 'societe', '', '');
$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
@@ -67,11 +71,6 @@ $now = dol_now();
$object = new Societe($db);
-// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
-$hookmanager->initHooks(array('thirdpartynotification', 'globalcard'));
-
-
-
/*
* Actions
*/
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index d67568189a6..b5f35699e90 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -59,14 +59,15 @@ $socid = GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id');
if ($user->socid) {
$socid = $user->socid;
}
+
+// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
+$hookmanager->initHooks(array('thirdpartycustomerprice', 'globalcard'));
+
$result = restrictedArea($user, 'societe', $socid, '&societe');
// Initialize objects
$object = new Societe($db);
-// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
-$hookmanager->initHooks(array('thirdpartycustomerprice', 'globalcard'));
-
$error = 0;
diff --git a/htdocs/societe/project.php b/htdocs/societe/project.php
index 2e3c84654bc..a12272c94ab 100644
--- a/htdocs/societe/project.php
+++ b/htdocs/societe/project.php
@@ -53,11 +53,12 @@ $socid = GETPOSTINT('socid');
if ($user->socid) {
$socid = $user->socid;
}
-$result = restrictedArea($user, 'societe', $socid, '&societe');
// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
$hookmanager->initHooks(array('projectthirdparty'));
+$result = restrictedArea($user, 'societe', $socid, '&societe');
+
$object = new Societe($db);
$permissiontodelete = $user->hasRight('societe', 'supprimer');
diff --git a/htdocs/societe/societecontact.php b/htdocs/societe/societecontact.php
index 227de670c38..3c6b3ce3850 100644
--- a/htdocs/societe/societecontact.php
+++ b/htdocs/societe/societecontact.php
@@ -65,16 +65,16 @@ $pagenext = $page + 1;
if ($user->socid) {
$socid = $user->socid;
}
+
+// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
+$hookmanager->initHooks(array('contactthirdparty', 'globalcard'));
+
$result = restrictedArea($user, 'societe', $id, '');
// Initialize objects
$object = new Societe($db);
-// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
-$hookmanager->initHooks(array('contactthirdparty', 'globalcard'));
-
-
/*
* Actions
*/
diff --git a/htdocs/supplier_proposal/contact.php b/htdocs/supplier_proposal/contact.php
index adb7956d743..cd82efbe336 100644
--- a/htdocs/supplier_proposal/contact.php
+++ b/htdocs/supplier_proposal/contact.php
@@ -47,14 +47,15 @@ $action = GETPOST('action', 'aZ09');
if ($user->socid) {
$socid = $user->socid;
}
+
+$hookmanager->initHooks(array('supplier_proposalcontactcard', 'globalcard'));
+
$result = restrictedArea($user, 'supplier_proposal', $id, 'supplier_proposal', '');
$object = new SupplierProposal($db);
$permissiontoedit = $user->hasRight('supplier_proposal', 'creer');
-$hookmanager->initHooks(array('supplier_proposalcontactcard', 'globalcard'));
-
/*
* Actions
diff --git a/htdocs/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php
index 9c435ca8485..ec8ba488e95 100644
--- a/htdocs/user/agenda_extsites.php
+++ b/htdocs/user/agenda_extsites.php
@@ -68,6 +68,9 @@ if ($user->socid > 0) {
}
$feature2 = (($socid && $user->hasRight('user', 'self', 'creer')) ? '' : 'user');
+// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
+$hookmanager->initHooks(array('usercard', 'useragenda', 'globalcard'));
+
$result = restrictedArea($user, 'user', $id, 'user&user', $feature2);
// If user is not user that read and no permission to read other users, we stop
@@ -75,9 +78,6 @@ if (($object->id != $user->id) && (!$user->hasRight('user', 'user', 'lire'))) {
accessforbidden();
}
-// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
-$hookmanager->initHooks(array('usercard', 'useragenda', 'globalcard'));
-
/*
* Actions
*/
diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php
index 6b540e1f407..647853897e2 100644
--- a/htdocs/user/clicktodial.php
+++ b/htdocs/user/clicktodial.php
@@ -39,11 +39,10 @@ if ($user->socid > 0) {
}
$feature2 = (($socid && $user->hasRight('user', 'self', 'creer')) ? '' : 'user');
-$result = restrictedArea($user, 'user', $id, 'user&user', $feature2);
-
// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
$hookmanager->initHooks(array('usercard', 'globalcard'));
+$result = restrictedArea($user, 'user', $id, 'user&user', $feature2);
/*
* Actions
diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index 06b51074c95..e0a08cd272f 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -75,6 +75,9 @@ if ($user->socid > 0) {
}
$feature2 = 'user';
+// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
+$hookmanager->initHooks(array('usercard', 'userdoc', 'globalcard'));
+
$result = restrictedArea($user, 'user', $id, 'user&user', $feature2);
if ($user->id != $id && !$canreaduser) {
@@ -108,11 +111,6 @@ if ($id > 0 || !empty($ref)) {
$upload_dir = $conf->user->dir_output."/".$object->id;
}
-// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
-$hookmanager->initHooks(array('usercard', 'userdoc', 'globalcard'));
-
-
-
/*
* Actions
*/
diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php
index a40826c632f..b79f33a0655 100644
--- a/htdocs/user/ldap.php
+++ b/htdocs/user/ldap.php
@@ -43,15 +43,15 @@ if ($user->socid > 0) {
}
$feature2 = (($socid && $user->hasRight('user', 'self', 'creer')) ? '' : 'user');
+// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
+$hookmanager->initHooks(array('usercard', 'userldap', 'globalcard'));
+
$result = restrictedArea($user, 'user', $id, 'user&user', $feature2);
$object = new User($db);
$object->fetch($id, '', '', 1);
$object->loadRights();
-// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
-$hookmanager->initHooks(array('usercard', 'userldap', 'globalcard'));
-
/*
* Actions
diff --git a/htdocs/user/note.php b/htdocs/user/note.php
index c6db1416a7b..b90b2bba740 100644
--- a/htdocs/user/note.php
+++ b/htdocs/user/note.php
@@ -59,11 +59,11 @@ if ($user->socid > 0) {
}
$feature2 = (($socid && $user->hasRight("user", "self", "write")) ? '' : 'user');
-$result = restrictedArea($user, 'user', $id, 'user&user', $feature2);
-
// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
$hookmanager->initHooks(array('usercard', 'usernote', 'globalcard'));
+$result = restrictedArea($user, 'user', $id, 'user&user', $feature2);
+
/*
* Actions
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index e51f7469f5d..0f45e53cb49 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -58,6 +58,9 @@ if ($user->socid > 0) {
}
$feature2 = (($socid && $user->hasRight("user", "self", "write")) ? '' : 'user');
+// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
+$hookmanager->initHooks(array('usercard', 'userihm', 'globalcard'));
+
$result = restrictedArea($user, 'user', $id, 'user&user', $feature2);
if ($user->id != $id && !$canreaduser) {
accessforbidden();
@@ -81,10 +84,6 @@ $searchformtitle=array($langs->trans("Companies"),$langs->trans("Contacts"),$lan
$form = new Form($db);
$formadmin = new FormAdmin($db);
-// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
-$hookmanager->initHooks(array('usercard', 'userihm', 'globalcard'));
-
-
/*
* Actions
*/
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index 6d93054cee1..1ab6fa0f09e 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -74,6 +74,9 @@ if ($user->id == $id && (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !$user
accessforbidden();
}
+// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
+$hookmanager->initHooks(array('usercard', 'userperms', 'globalcard'));
+
$result = restrictedArea($user, 'user', $id, 'user&user', $feature2);
if ($user->id != $id && !$canreaduser) {
accessforbidden();
@@ -85,10 +88,6 @@ $object->loadRights();
$entity = $conf->entity;
-// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
-$hookmanager->initHooks(array('usercard', 'userperms', 'globalcard'));
-
-
/*
* Actions
*/
diff --git a/htdocs/variants/card.php b/htdocs/variants/card.php
index 67afacc7de6..5cf4220d79a 100644
--- a/htdocs/variants/card.php
+++ b/htdocs/variants/card.php
@@ -49,6 +49,10 @@ if (!isModEnabled('variants')) {
if ($user->socid > 0) { // Protection if external user
accessforbidden();
}
+
+// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
+$hookmanager->initHooks(array('productattributecard', 'globalcard'));
+
$result = restrictedArea($user, 'variants');
$object = new ProductAttribute($db);
@@ -56,9 +60,6 @@ $object = new ProductAttribute($db);
// Load object
include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'
-// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
-$hookmanager->initHooks(array('productattributecard', 'globalcard'));
-
$permissiontoread = $user->hasRight('variants', 'read');
$permissiontoadd = $user->hasRight('variants', 'write'); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
$permissiontoedit = $user->hasRight('variants', 'write'); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php