';
print ''.$staticcontratligne->LibStatut($status, 0, ($bool ? 1 : 0)).' ';
- print ''.($nb[$status.$bool] ? $nb[$status.$bool] : 0).' '.$staticcontratligne->LibStatut($status, 3, ($bool ? 1 : 0)).' '.($nb[$status.$bool_str] ? $nb[$status.$bool_str] : 0).' '.$staticcontratligne->LibStatut($status, 3, ($bool ? 1 : 0)).' ';
- $arrayofoperators = array('0'=>'', '='=>'=', '<='=>'<=', '>='=>'>=');
+ $arrayofoperators = array('0' => '', '=' => '=', '<=' => '<=', '>=' => '>=');
print $form->selectarray('search_op2df', $arrayofoperators, $search_op2df, 0, 0, 0, '', 0, 0, 0, '', 'maxwidth50imp');
print '';
print $formother->select_month($search_dfmonth, 'search_dfmonth', 1, 0);
@@ -1032,7 +1032,7 @@ if (!empty($arrayfields['c.date_contrat']['checked'])) {
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
// Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>&$totalarray);
+$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder, 'totalarray' => &$totalarray);
$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
if (!empty($arrayfields['c.datec']['checked'])) {
@@ -1101,7 +1101,7 @@ while ($i < $imaxinloop) {
if ($obj->country_id > 0) {
if (!isset($cacheCountryIDCode[$obj->country_id]['code'])) {
$tmparray = getCountry($obj->country_id, 'all');
- $cacheCountryIDCode[$obj->country_id] = array('code'=> empty($tmparray['code']) ? '' : $tmparray['code'], 'label' => empty($tmparray['label']) ? '' : $tmparray['label']);
+ $cacheCountryIDCode[$obj->country_id] = array('code' => empty($tmparray['code']) ? '' : $tmparray['code'], 'label' => empty($tmparray['label']) ? '' : $tmparray['label']);
}
$socstatic->country_code = $cacheCountryIDCode[$obj->country_id]['code'];
$socstatic->country = $cacheCountryIDCode[$obj->country_id]['label'];
@@ -1113,6 +1113,7 @@ while ($i < $imaxinloop) {
print '';
}
// Output Kanban
+ $arraydata = array();
$arraydata['thirdparty'] = $socstatic;
$arraydata['selected'] = in_array($obj->rowid, $arrayofselected);
$contracttmp->date_contrat = $obj->date_contrat;
@@ -1282,7 +1283,7 @@ while ($i < $imaxinloop) {
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
// Fields from hook
- $parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+ $parameters = array('arrayfields' => $arrayfields, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Date creation
@@ -1359,7 +1360,7 @@ if ($num == 0) {
$db->free($resql);
-$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index 928482bc1be..a2542669485 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -118,21 +118,21 @@ $staticcontratligne = new ContratLigne($db);
$companystatic = new Societe($db);
$arrayfields = array(
- 'c.ref'=>array('label'=>"Contract", 'checked'=>1, 'position'=>80),
- 'p.description'=>array('label'=>"Service", 'checked'=>1, 'position'=>80),
- 's.nom'=>array('label'=>"ThirdParty", 'checked'=>1, 'position'=>90),
- 'cd.tva_tx'=>array('label'=>"VATRate", 'checked'=>-1, 'position'=>100),
- 'cd.subprice'=>array('label'=>"PriceUHT", 'checked'=>-1, 'position'=>105),
- 'cd.qty'=>array('label'=>"Qty", 'checked'=>1, 'position'=>108),
- 'cd.total_ht'=>array('label'=>"TotalHT", 'checked'=>-1, 'position'=>109, 'isameasure'=>1),
- 'cd.total_tva'=>array('label'=>"TotalVAT", 'checked'=>-1, 'position'=>110),
- 'cd.date_ouverture_prevue'=>array('label'=>"DateStartPlannedShort", 'checked'=>1, 'position'=>150),
- 'cd.date_ouverture'=>array('label'=>"DateStartRealShort", 'checked'=>1, 'position'=>160),
- 'cd.date_fin_validite'=>array('label'=>"DateEndPlannedShort", 'checked'=>1, 'position'=>170),
- 'cd.date_cloture'=>array('label'=>"DateEndRealShort", 'checked'=>1, 'position'=>180),
+ 'c.ref' => array('label' => "Contract", 'checked' => 1, 'position' => 80),
+ 'p.description' => array('label' => "Service", 'checked' => 1, 'position' => 80),
+ 's.nom' => array('label' => "ThirdParty", 'checked' => 1, 'position' => 90),
+ 'cd.tva_tx' => array('label' => "VATRate", 'checked' => -1, 'position' => 100),
+ 'cd.subprice' => array('label' => "PriceUHT", 'checked' => -1, 'position' => 105),
+ 'cd.qty' => array('label' => "Qty", 'checked' => 1, 'position' => 108),
+ 'cd.total_ht' => array('label' => "TotalHT", 'checked' => -1, 'position' => 109, 'isameasure' => 1),
+ 'cd.total_tva' => array('label' => "TotalVAT", 'checked' => -1, 'position' => 110),
+ 'cd.date_ouverture_prevue' => array('label' => "DateStartPlannedShort", 'checked' => 1, 'position' => 150),
+ 'cd.date_ouverture' => array('label' => "DateStartRealShort", 'checked' => 1, 'position' => 160),
+ 'cd.date_fin_validite' => array('label' => "DateEndPlannedShort", 'checked' => 1, 'position' => 170),
+ 'cd.date_cloture' => array('label' => "DateEndRealShort", 'checked' => 1, 'position' => 180),
//'cd.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
- 'cd.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
- 'status'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000)
+ 'cd.tms' => array('label' => "DateModificationShort", 'checked' => 0, 'position' => 500),
+ 'status' => array('label' => "Status", 'checked' => 1, 'position' => 1000)
);
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
@@ -159,7 +159,7 @@ if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massa
$massaction = '';
}
-$parameters = array('socid'=>$socid);
+$parameters = array('socid' => $socid);
$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook < 0) {
setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -518,6 +518,7 @@ $newcardbutton = '';
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'contract', 0, '', '', $limit);
if (!empty($sall)) {
+ $fieldstosearchall = array();
foreach ($fieldstosearchall as $key => $val) {
$fieldstosearchall[$key] = $langs->trans($val);
}
@@ -619,7 +620,7 @@ if (!empty($arrayfields['s.nom']['checked'])) {
if (!empty($arrayfields['cd.date_ouverture_prevue']['checked'])) {
print '
';
- $arrayofoperators = array('<'=>'<', '>'=>'>');
+ $arrayofoperators = array('<' => '<', '>' => '>');
print $form->selectarray('filter_opouvertureprevue', $arrayofoperators, $filter_opouvertureprevue, 1, 0, 0, '', 0, 0, 0, '', 'width50');
print ' ';
$filter_dateouvertureprevue = dol_mktime(0, 0, 0, $opouvertureprevuemonth, $opouvertureprevueday, $opouvertureprevueyear);
@@ -628,7 +629,7 @@ if (!empty($arrayfields['cd.date_ouverture_prevue']['checked'])) {
}
if (!empty($arrayfields['cd.date_ouverture']['checked'])) {
print ' ';
- $arrayofoperators = array('<'=>'<', '>'=>'>');
+ $arrayofoperators = array('<' => '<', '>' => '>');
print $form->selectarray('filter_op1', $arrayofoperators, $filter_op1, 1, 0, 0, '', 0, 0, 0, '', 'width50');
print ' ';
$filter_date1 = dol_mktime(0, 0, 0, $op1month, $op1day, $op1year);
@@ -637,7 +638,7 @@ if (!empty($arrayfields['cd.date_ouverture']['checked'])) {
}
if (!empty($arrayfields['cd.date_fin_validite']['checked'])) {
print ' ';
- $arrayofoperators = array('<'=>'<', '>'=>'>');
+ $arrayofoperators = array('<' => '<', '>' => '>');
print $form->selectarray('filter_op2', $arrayofoperators, $filter_op2, 1, 0, 0, '', 0, 0, 0, '', 'width50');
print ' ';
$filter_date2 = dol_mktime(0, 0, 0, $op2month, $op2day, $op2year);
@@ -646,7 +647,7 @@ if (!empty($arrayfields['cd.date_fin_validite']['checked'])) {
}
if (!empty($arrayfields['cd.date_cloture']['checked'])) {
print ' ';
- $arrayofoperators = array('<'=>'<', '>'=>'>');
+ $arrayofoperators = array('<' => '<', '>' => '>');
print $form->selectarray('filter_opcloture', $arrayofoperators, $filter_opcloture, 1, 0, 0, '', 0, 0, 0, '', 'width50');
print ' ';
$filter_date_cloture = dol_mktime(0, 0, 0, $opcloturemonth, $opclotureday, $opclotureyear);
@@ -657,7 +658,7 @@ if (!empty($arrayfields['cd.date_cloture']['checked'])) {
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
// Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
if (!empty($arrayfields['cd.datec']['checked'])) {
@@ -674,11 +675,11 @@ if (!empty($arrayfields['status']['checked'])) {
// Status
print ' ';
$arrayofstatus = array(
- '0'=>$langs->trans("ServiceStatusInitial"),
- '4'=>$langs->trans("ServiceStatusRunning"),
- '4&filter=notexpired'=>$langs->trans("ServiceStatusNotLate"),
- '4&filter=expired'=>$langs->trans("ServiceStatusLate"),
- '5'=>$langs->trans("ServiceStatusClosed")
+ '0' => $langs->trans("ServiceStatusInitial"),
+ '4' => $langs->trans("ServiceStatusRunning"),
+ '4&filter=notexpired' => $langs->trans("ServiceStatusNotLate"),
+ '4&filter=expired' => $langs->trans("ServiceStatusLate"),
+ '5' => $langs->trans("ServiceStatusClosed")
);
$search_status_new = GETPOST('search_status', 'alpha');
if ($filter == 'expired' && !preg_match('/expired/', $search_status_new)) {
@@ -746,7 +747,7 @@ if (!empty($arrayfields['cd.date_cloture']['checked'])) {
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
// Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder);
$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
if (!empty($arrayfields['cd.datec']['checked'])) {
@@ -774,7 +775,7 @@ $productstatic = new Product($db);
$i = 0;
$savnbfield = $totalarray['nbfield'];
-$totalarray = array('nbfield'=>0, 'cd.qty'=>0, 'cd.total_ht'=>0, 'cd.total_tva'=>0);
+$totalarray = array('nbfield' => 0, 'cd.qty' => 0, 'cd.total_ht' => 0, 'cd.total_tva' => 0);
$imaxinloop = ($limit ? min($num, $limit) : $num);
while ($i < $imaxinloop) {
$obj = $db->fetch_object($resql);
@@ -961,7 +962,7 @@ while ($i < $imaxinloop) {
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
// Fields from hook
- $parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+ $parameters = array('arrayfields' => $arrayfields, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Date creation
diff --git a/htdocs/core/actions_addupdatedelete.inc.php b/htdocs/core/actions_addupdatedelete.inc.php
index 5c37dacedbe..ab0186f9e2f 100644
--- a/htdocs/core/actions_addupdatedelete.inc.php
+++ b/htdocs/core/actions_addupdatedelete.inc.php
@@ -587,7 +587,7 @@ if ($action == 'confirm_reopen' && $confirm == 'yes' && $permissiontoadd) {
if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
$newlang = GETPOST('lang_id', 'aZ09');
}
- if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang)) {
+ if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && is_object($object->thirdparty)) {
$newlang = $object->thirdparty->default_lang;
}
if (!empty($newlang)) {
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 1acea501327..9649ef6252c 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -4,6 +4,7 @@
* Copyright (C) 2018 Juanjo Menent
* Copyright (C) 2019 Ferran Marcet
* Copyright (C) 2019-2024 Frédéric France
+ * Copyright (C) 2024 MDW
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -373,9 +374,9 @@ if (!$error && $massaction == 'confirm_presend') {
if ($filepath_found) {
// Create form object
$attachedfilesThirdpartyObj[$thirdpartyid][$objectid] = array(
- 'paths'=>array($filepath_found),
- 'names'=>array($filename_found),
- 'mimes'=>array(dol_mimetype($filepath_found))
+ 'paths' => array($filepath_found),
+ 'names' => array($filename_found),
+ 'mimes' => array(dol_mimetype($filepath_found))
);
} else {
$nbignored++;
@@ -477,7 +478,7 @@ if (!$error && $massaction == 'confirm_presend') {
$substitutionarray['__EMAIL__'] = $thirdparty->email;
$substitutionarray['__CHECK_READ__'] = '
* Copyright (C) 2014 Raphaël Doursenaud
* Copyright (C) 2015 Frederic France
+ * Copyright (C) 2024 MDW
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -194,7 +195,7 @@ class ModeleBoxes // Can't be abstract as it is instantiated to build "empty" bo
* Standard method to show a box (usage by boxes not mandatory, a box can still use its own showBox function)
*
* @param array $head Array with properties of box title
- * @param array $contents Array with properties of box lines
+ * @param array> $contents Array with properties of box lines
* @param int $nooutput No print, only return string
* @return string
*/
diff --git a/htdocs/core/class/cgenericdic.class.php b/htdocs/core/class/cgenericdic.class.php
index 9c617d9c78d..c39f8cbbf23 100644
--- a/htdocs/core/class/cgenericdic.class.php
+++ b/htdocs/core/class/cgenericdic.class.php
@@ -4,6 +4,7 @@
* Copyright (C) 2016 Florian Henry
* Copyright (C) 2015 Raphaël Doursenaud
* Copyright (C) 2024 Frédéric France
+ * Copyright (C) 2024 MDW
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -220,16 +221,15 @@ class CGenericDic extends CommonDict
/**
* Load object in memory from the database
*
- * @param string $sortorder Sort Order
- * @param string $sortfield Sort field
- * @param int $limit offset limit
- * @param int $offset offset limit
- * @param array $filter filter array
- * @param string $filtermode filter mode (AND or OR)
- *
- * @return int Return integer <0 if KO, >0 if OK
+ * @param string $sortorder Sort Order
+ * @param string $sortfield Sort field
+ * @param int $limit Limit
+ * @param int $offset offset limit
+ * @param string|array $filter filter USF
+ * @param string $filtermode filter mode (AND or OR)
+ * @return int Return integer <0 if KO, >0 if OK
*/
- public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+ public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
{
dol_syslog(__METHOD__, LOG_DEBUG);
@@ -243,23 +243,36 @@ class CGenericDic extends CommonDict
}
$sql = "SELECT";
- $sql .= " t.".$fieldrowid.",";
+ $sql .= " t.".$this->db->sanitize($fieldrowid).",";
$sql .= " t.code,";
- $sql .= " t.".$fieldlabel." as label,";
+ $sql .= " t.".$this->db->sanitize($fieldlabel)." as label,";
$sql .= " t.active";
$sql .= " FROM ".$this->db->prefix().$this->table_element." as t";
// Manage filter
- $sqlwhere = array();
- if (count($filter) > 0) {
- foreach ($filter as $key => $value) {
- $sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
+ if (is_array($filter)) {
+ $sqlwhere = array();
+ if (count($filter) > 0) {
+ foreach ($filter as $key => $value) {
+ $sqlwhere[] = $this->db->sanitize($key)." LIKE '%".$this->db->escape($value)."%'";
+ }
}
+ if (count($sqlwhere) > 0) {
+ $sql .= " WHERE ".implode(' '.$this->db->escape($filtermode).' ', $sqlwhere);
+ }
+
+ $filter = '';
}
- if (count($sqlwhere) > 0) {
- $sql .= " WHERE ".implode(' '.$this->db->escape($filtermode).' ', $sqlwhere);
+ // Manage filter
+ $errormessage = '';
+ $sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+ if ($errormessage) {
+ $this->errors[] = $errormessage;
+ dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
+ return -1;
}
+
if (!empty($sortfield)) {
$sql .= $this->db->order($sortfield, $sortorder);
}
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 75b45b1850a..b80ce304f94 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -111,7 +111,18 @@ abstract class CommonDocGenerator
public $tva;
public $tva_array;
+ /**
+ * Local tax rates Array[tax_type][tax_rate]
+ *
+ * @var array>
+ */
public $localtax1;
+
+ /**
+ * Local tax rates Array[tax_type][tax_rate]
+ *
+ * @var array>
+ */
public $localtax2;
/**
@@ -196,28 +207,28 @@ abstract class CommonDocGenerator
$logotouse = $conf->user->dir_output . '/' . get_exdir(0, 0, 0, 0, $user, 'user') . 'photos/' . getImageFileNameForSize($user->photo, '_small');
$array_user = array(
- 'myuser_lastname'=>$user->lastname,
- 'myuser_firstname'=>$user->firstname,
- 'myuser_fullname'=>$user->getFullName($outputlangs, 1),
- 'myuser_login'=>$user->login,
- 'myuser_phone'=>$user->office_phone,
- 'myuser_address'=>$user->address,
- 'myuser_zip'=>$user->zip,
- 'myuser_town'=>$user->town,
- 'myuser_country'=>$user->country,
- 'myuser_country_code'=>$user->country_code,
- 'myuser_state'=>$user->state,
- 'myuser_state_code'=>$user->state_code,
- 'myuser_fax'=>$user->office_fax,
- 'myuser_mobile'=>$user->user_mobile,
- 'myuser_email'=>$user->email,
- 'myuser_logo'=>$logotouse,
- 'myuser_job'=>$user->job,
- 'myuser_web'=>'', // url not exist in $user object
- 'myuser_birth'=>dol_print_date($user->birth, 'day', 'gmt'),
- 'myuser_dateemployment'=>dol_print_date($user->dateemployment, 'day', 'tzuser'),
- 'myuser_dateemploymentend'=>dol_print_date($user->dateemploymentend, 'day', 'tzuser'),
- 'myuser_gender'=>$user->gender,
+ 'myuser_lastname' => $user->lastname,
+ 'myuser_firstname' => $user->firstname,
+ 'myuser_fullname' => $user->getFullName($outputlangs, 1),
+ 'myuser_login' => $user->login,
+ 'myuser_phone' => $user->office_phone,
+ 'myuser_address' => $user->address,
+ 'myuser_zip' => $user->zip,
+ 'myuser_town' => $user->town,
+ 'myuser_country' => $user->country,
+ 'myuser_country_code' => $user->country_code,
+ 'myuser_state' => $user->state,
+ 'myuser_state_code' => $user->state_code,
+ 'myuser_fax' => $user->office_fax,
+ 'myuser_mobile' => $user->user_mobile,
+ 'myuser_email' => $user->email,
+ 'myuser_logo' => $logotouse,
+ 'myuser_job' => $user->job,
+ 'myuser_web' => '', // url not exist in $user object
+ 'myuser_birth' => dol_print_date($user->birth, 'day', 'gmt'),
+ 'myuser_dateemployment' => dol_print_date($user->dateemployment, 'day', 'tzuser'),
+ 'myuser_dateemploymentend' => dol_print_date($user->dateemploymentend, 'day', 'tzuser'),
+ 'myuser_gender' => $user->gender,
);
// Retrieve extrafields
if (is_array($user->array_options) && count($user->array_options)) {
@@ -299,32 +310,32 @@ abstract class CommonDocGenerator
$logotouse = $conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
return array(
- 'mycompany_logo'=>$logotouse,
- 'mycompany_name'=>$mysoc->name,
- 'mycompany_email'=>$mysoc->email,
- 'mycompany_phone'=>$mysoc->phone,
- 'mycompany_fax'=>$mysoc->fax,
- 'mycompany_address'=>$mysoc->address,
- 'mycompany_zip'=>$mysoc->zip,
- 'mycompany_town'=>$mysoc->town,
- 'mycompany_country'=>$mysoc->country,
- 'mycompany_country_code'=>$mysoc->country_code,
- 'mycompany_state'=>$mysoc->state,
- 'mycompany_state_code'=>$mysoc->state_code,
- 'mycompany_web'=>$mysoc->url,
- 'mycompany_juridicalstatus'=>$mysoc->forme_juridique,
- 'mycompany_managers'=>$mysoc->managers,
- 'mycompany_capital'=>$mysoc->capital,
- 'mycompany_barcode'=>$mysoc->barcode,
- 'mycompany_idprof1'=>$mysoc->idprof1,
- 'mycompany_idprof2'=>$mysoc->idprof2,
- 'mycompany_idprof3'=>$mysoc->idprof3,
- 'mycompany_idprof4'=>$mysoc->idprof4,
- 'mycompany_idprof5'=>$mysoc->idprof5,
- 'mycompany_idprof6'=>$mysoc->idprof6,
- 'mycompany_vatnumber'=>$mysoc->tva_intra,
- 'mycompany_socialobject'=>$mysoc->socialobject,
- 'mycompany_note_private'=>$mysoc->note_private,
+ 'mycompany_logo' => $logotouse,
+ 'mycompany_name' => $mysoc->name,
+ 'mycompany_email' => $mysoc->email,
+ 'mycompany_phone' => $mysoc->phone,
+ 'mycompany_fax' => $mysoc->fax,
+ 'mycompany_address' => $mysoc->address,
+ 'mycompany_zip' => $mysoc->zip,
+ 'mycompany_town' => $mysoc->town,
+ 'mycompany_country' => $mysoc->country,
+ 'mycompany_country_code' => $mysoc->country_code,
+ 'mycompany_state' => $mysoc->state,
+ 'mycompany_state_code' => $mysoc->state_code,
+ 'mycompany_web' => $mysoc->url,
+ 'mycompany_juridicalstatus' => $mysoc->forme_juridique,
+ 'mycompany_managers' => $mysoc->managers,
+ 'mycompany_capital' => $mysoc->capital,
+ 'mycompany_barcode' => $mysoc->barcode,
+ 'mycompany_idprof1' => $mysoc->idprof1,
+ 'mycompany_idprof2' => $mysoc->idprof2,
+ 'mycompany_idprof3' => $mysoc->idprof3,
+ 'mycompany_idprof4' => $mysoc->idprof4,
+ 'mycompany_idprof5' => $mysoc->idprof5,
+ 'mycompany_idprof6' => $mysoc->idprof6,
+ 'mycompany_vatnumber' => $mysoc->tva_intra,
+ 'mycompany_socialobject' => $mysoc->socialobject,
+ 'mycompany_note_private' => $mysoc->note_private,
//'mycompany_note_public'=>$mysoc->note_public, // Only private not exists for "mysoc" but both for thirdparties
);
}
@@ -353,38 +364,38 @@ abstract class CommonDocGenerator
}
$array_thirdparty = array(
- 'company_name'=>$object->name,
+ 'company_name' => $object->name,
'company_name_alias' => $object->name_alias,
- 'company_email'=>$object->email,
- 'company_phone'=>$object->phone,
- 'company_fax'=>$object->fax,
- 'company_address'=>$object->address,
- 'company_zip'=>$object->zip,
- 'company_town'=>$object->town,
- 'company_country'=>$object->country,
- 'company_country_code'=>$object->country_code,
- 'company_state'=>$object->state,
- 'company_state_code'=>$object->state_code,
- 'company_web'=>$object->url,
- 'company_barcode'=>$object->barcode,
- 'company_vatnumber'=>$object->tva_intra,
- 'company_customercode'=>$object->code_client,
- 'company_suppliercode'=>$object->code_fournisseur,
- 'company_customeraccountancycode'=>$object->code_compta,
- 'company_supplieraccountancycode'=>$object->code_compta_fournisseur,
- 'company_juridicalstatus'=>$object->forme_juridique,
- 'company_outstanding_limit'=>$object->outstanding_limit,
- 'company_capital'=>$object->capital,
- 'company_idprof1'=>$object->idprof1,
- 'company_idprof2'=>$object->idprof2,
- 'company_idprof3'=>$object->idprof3,
- 'company_idprof4'=>$object->idprof4,
- 'company_idprof5'=>$object->idprof5,
- 'company_idprof6'=>$object->idprof6,
- 'company_note_public'=>$object->note_public,
- 'company_note_private'=>$object->note_private,
- 'company_default_bank_iban'=>(is_object($object->bank_account) ? $object->bank_account->iban : ''),
- 'company_default_bank_bic'=>(is_object($object->bank_account) ? $object->bank_account->bic : '')
+ 'company_email' => $object->email,
+ 'company_phone' => $object->phone,
+ 'company_fax' => $object->fax,
+ 'company_address' => $object->address,
+ 'company_zip' => $object->zip,
+ 'company_town' => $object->town,
+ 'company_country' => $object->country,
+ 'company_country_code' => $object->country_code,
+ 'company_state' => $object->state,
+ 'company_state_code' => $object->state_code,
+ 'company_web' => $object->url,
+ 'company_barcode' => $object->barcode,
+ 'company_vatnumber' => $object->tva_intra,
+ 'company_customercode' => $object->code_client,
+ 'company_suppliercode' => $object->code_fournisseur,
+ 'company_customeraccountancycode' => $object->code_compta,
+ 'company_supplieraccountancycode' => $object->code_compta_fournisseur,
+ 'company_juridicalstatus' => $object->forme_juridique,
+ 'company_outstanding_limit' => $object->outstanding_limit,
+ 'company_capital' => $object->capital,
+ 'company_idprof1' => $object->idprof1,
+ 'company_idprof2' => $object->idprof2,
+ 'company_idprof3' => $object->idprof3,
+ 'company_idprof4' => $object->idprof4,
+ 'company_idprof5' => $object->idprof5,
+ 'company_idprof6' => $object->idprof6,
+ 'company_note_public' => $object->note_public,
+ 'company_note_private' => $object->note_private,
+ 'company_default_bank_iban' => (is_object($object->bank_account) ? $object->bank_account->iban : ''),
+ 'company_default_bank_bic' => (is_object($object->bank_account) ? $object->bank_account->bic : '')
);
// Retrieve extrafields
@@ -471,15 +482,15 @@ abstract class CommonDocGenerator
$now = dol_now('gmt'); // gmt
$array_other = array(
// Date in default language
- 'current_date'=>dol_print_date($now, 'day', 'tzuser'),
- 'current_datehour'=>dol_print_date($now, 'dayhour', 'tzuser'),
- 'current_server_date'=>dol_print_date($now, 'day', 'tzserver'),
- 'current_server_datehour'=>dol_print_date($now, 'dayhour', 'tzserver'),
+ 'current_date' => dol_print_date($now, 'day', 'tzuser'),
+ 'current_datehour' => dol_print_date($now, 'dayhour', 'tzuser'),
+ 'current_server_date' => dol_print_date($now, 'day', 'tzserver'),
+ 'current_server_datehour' => dol_print_date($now, 'dayhour', 'tzserver'),
// Date in requested output language
- 'current_date_locale'=>dol_print_date($now, 'day', 'tzuser', $outputlangs),
- 'current_datehour_locale'=>dol_print_date($now, 'dayhour', 'tzuser', $outputlangs),
- 'current_server_date_locale'=>dol_print_date($now, 'day', 'tzserver', $outputlangs),
- 'current_server_datehour_locale'=>dol_print_date($now, 'dayhour', 'tzserver', $outputlangs),
+ 'current_date_locale' => dol_print_date($now, 'day', 'tzuser', $outputlangs),
+ 'current_datehour_locale' => dol_print_date($now, 'dayhour', 'tzuser', $outputlangs),
+ 'current_server_date_locale' => dol_print_date($now, 'day', 'tzserver', $outputlangs),
+ 'current_server_datehour_locale' => dol_print_date($now, 'dayhour', 'tzserver', $outputlangs),
);
@@ -534,45 +545,45 @@ abstract class CommonDocGenerator
$object->date_commande = $object->date;
}
$resarray = array(
- $array_key.'_id'=>$object->id,
+ $array_key.'_id' => $object->id,
$array_key.'_ref' => (property_exists($object, 'ref') ? $object->ref : ''),
$array_key.'_label' => (property_exists($object, 'label') ? $object->label : ''),
$array_key.'_ref_ext' => (property_exists($object, 'ref_ext') ? $object->ref_ext : ''),
- $array_key.'_ref_customer'=>(!empty($object->ref_client) ? $object->ref_client : (empty($object->ref_customer) ? '' : $object->ref_customer)),
- $array_key.'_ref_supplier'=>(!empty($object->ref_fournisseur) ? $object->ref_fournisseur : (empty($object->ref_supplier) ? '' : $object->ref_supplier)),
- $array_key.'_source_invoice_ref'=>((empty($invoice_source) || empty($invoice_source->ref)) ? '' : $invoice_source->ref),
+ $array_key.'_ref_customer' => (!empty($object->ref_client) ? $object->ref_client : (empty($object->ref_customer) ? '' : $object->ref_customer)),
+ $array_key.'_ref_supplier' => (!empty($object->ref_fournisseur) ? $object->ref_fournisseur : (empty($object->ref_supplier) ? '' : $object->ref_supplier)),
+ $array_key.'_source_invoice_ref' => ((empty($invoice_source) || empty($invoice_source->ref)) ? '' : $invoice_source->ref),
// Dates
- $array_key.'_hour'=>dol_print_date($date, 'hour'),
- $array_key.'_date'=>dol_print_date($date, 'day'),
- $array_key.'_date_rfc'=>dol_print_date($date, 'dayrfc'),
- $array_key.'_date_limit'=>(!empty($object->date_lim_reglement) ? dol_print_date($object->date_lim_reglement, 'day') : ''),
- $array_key.'_date_limit_rfc'=>(!empty($object->date_lim_reglement) ? dol_print_date($object->date_lim_reglement, 'dayrfc') : ''),
- $array_key.'_date_end'=>(!empty($object->fin_validite) ? dol_print_date($object->fin_validite, 'day') : ''),
- $array_key.'_date_creation'=>dol_print_date($object->date_creation, 'day'),
- $array_key.'_date_modification'=>(!empty($object->date_modification) ? dol_print_date($object->date_modification, 'day') : ''),
- $array_key.'_date_validation'=>(!empty($object->date_validation) ? dol_print_date($object->date_validation, 'dayhour') : ''),
- $array_key.'_date_approve'=>(!empty($object->date_approve) ? dol_print_date($object->date_approve, 'day') : ''),
- $array_key.'_date_delivery_planed'=>(!empty($object->delivery_date) ? dol_print_date($object->delivery_date, 'day') : ''),
- $array_key.'_date_close'=>(!empty($object->date_cloture) ? dol_print_date($object->date_cloture, 'dayhour') : ''),
+ $array_key.'_hour' => dol_print_date($date, 'hour'),
+ $array_key.'_date' => dol_print_date($date, 'day'),
+ $array_key.'_date_rfc' => dol_print_date($date, 'dayrfc'),
+ $array_key.'_date_limit' => (!empty($object->date_lim_reglement) ? dol_print_date($object->date_lim_reglement, 'day') : ''),
+ $array_key.'_date_limit_rfc' => (!empty($object->date_lim_reglement) ? dol_print_date($object->date_lim_reglement, 'dayrfc') : ''),
+ $array_key.'_date_end' => (!empty($object->fin_validite) ? dol_print_date($object->fin_validite, 'day') : ''),
+ $array_key.'_date_creation' => dol_print_date($object->date_creation, 'day'),
+ $array_key.'_date_modification' => (!empty($object->date_modification) ? dol_print_date($object->date_modification, 'day') : ''),
+ $array_key.'_date_validation' => (!empty($object->date_validation) ? dol_print_date($object->date_validation, 'dayhour') : ''),
+ $array_key.'_date_approve' => (!empty($object->date_approve) ? dol_print_date($object->date_approve, 'day') : ''),
+ $array_key.'_date_delivery_planed' => (!empty($object->delivery_date) ? dol_print_date($object->delivery_date, 'day') : ''),
+ $array_key.'_date_close' => (!empty($object->date_cloture) ? dol_print_date($object->date_cloture, 'dayhour') : ''),
- $array_key.'_payment_mode_code'=>$object->mode_reglement_code,
- $array_key.'_payment_mode'=>($outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code) != 'PaymentType'.$object->mode_reglement_code ? $outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code) : $object->mode_reglement),
- $array_key.'_payment_term_code'=>$object->cond_reglement_code,
- $array_key.'_payment_term'=>($outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code) != 'PaymentCondition'.$object->cond_reglement_code ? $outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code) : ($object->cond_reglement_doc ? $object->cond_reglement_doc : $object->cond_reglement)),
+ $array_key.'_payment_mode_code' => $object->mode_reglement_code,
+ $array_key.'_payment_mode' => ($outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code) != 'PaymentType'.$object->mode_reglement_code ? $outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code) : $object->mode_reglement),
+ $array_key.'_payment_term_code' => $object->cond_reglement_code,
+ $array_key.'_payment_term' => ($outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code) != 'PaymentCondition'.$object->cond_reglement_code ? $outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code) : ($object->cond_reglement_doc ? $object->cond_reglement_doc : $object->cond_reglement)),
$array_key.'_incoterms' => (method_exists($object, 'display_incoterms') ? $object->display_incoterms() : ''),
- $array_key.'_total_ht_locale'=>price($object->total_ht, 0, $outputlangs),
- $array_key.'_total_vat_locale'=>(!empty($object->total_vat) ? price($object->total_vat, 0, $outputlangs) : price($object->total_tva, 0, $outputlangs)),
- $array_key.'_total_localtax1_locale'=>price($object->total_localtax1, 0, $outputlangs),
- $array_key.'_total_localtax2_locale'=>price($object->total_localtax2, 0, $outputlangs),
- $array_key.'_total_ttc_locale'=>price($object->total_ttc, 0, $outputlangs),
+ $array_key.'_total_ht_locale' => price($object->total_ht, 0, $outputlangs),
+ $array_key.'_total_vat_locale' => (!empty($object->total_vat) ? price($object->total_vat, 0, $outputlangs) : price($object->total_tva, 0, $outputlangs)),
+ $array_key.'_total_localtax1_locale' => price($object->total_localtax1, 0, $outputlangs),
+ $array_key.'_total_localtax2_locale' => price($object->total_localtax2, 0, $outputlangs),
+ $array_key.'_total_ttc_locale' => price($object->total_ttc, 0, $outputlangs),
- $array_key.'_total_ht'=>price2num($object->total_ht),
- $array_key.'_total_vat'=>(!empty($object->total_vat) ? price2num($object->total_vat) : price2num($object->total_tva)),
- $array_key.'_total_localtax1'=>price2num($object->total_localtax1),
- $array_key.'_total_localtax2'=>price2num($object->total_localtax2),
- $array_key.'_total_ttc'=>price2num($object->total_ttc),
+ $array_key.'_total_ht' => price2num($object->total_ht),
+ $array_key.'_total_vat' => (!empty($object->total_vat) ? price2num($object->total_vat) : price2num($object->total_tva)),
+ $array_key.'_total_localtax1' => price2num($object->total_localtax1),
+ $array_key.'_total_localtax2' => price2num($object->total_localtax2),
+ $array_key.'_total_ttc' => price2num($object->total_ttc),
$array_key.'_multicurrency_code' => $object->multicurrency_code,
$array_key.'_multicurrency_tx' => price2num($object->multicurrency_tx),
@@ -583,24 +594,24 @@ abstract class CommonDocGenerator
$array_key.'_multicurrency_total_tva_locale' => price($object->multicurrency_total_tva, 0, $outputlangs),
$array_key.'_multicurrency_total_ttc_locale' => price($object->multicurrency_total_ttc, 0, $outputlangs),
- $array_key.'_note_private'=>$object->note_private,
- $array_key.'_note_public'=>$object->note_public,
- $array_key.'_note'=>$object->note_public, // For backward compatibility
+ $array_key.'_note_private' => $object->note_private,
+ $array_key.'_note_public' => $object->note_public,
+ $array_key.'_note' => $object->note_public, // For backward compatibility
// Payments
- $array_key.'_already_payed_locale'=>price($sumpayed, 0, $outputlangs),
- $array_key.'_already_payed'=>price2num($sumpayed),
- $array_key.'_already_deposit_locale'=>price($sumdeposit, 0, $outputlangs),
- $array_key.'_already_deposit'=>price2num($sumdeposit),
- $array_key.'_already_creditnote_locale'=>price($sumcreditnote, 0, $outputlangs),
- $array_key.'_already_creditnote'=>price2num($sumcreditnote),
+ $array_key.'_already_payed_locale' => price($sumpayed, 0, $outputlangs),
+ $array_key.'_already_payed' => price2num($sumpayed),
+ $array_key.'_already_deposit_locale' => price($sumdeposit, 0, $outputlangs),
+ $array_key.'_already_deposit' => price2num($sumdeposit),
+ $array_key.'_already_creditnote_locale' => price($sumcreditnote, 0, $outputlangs),
+ $array_key.'_already_creditnote' => price2num($sumcreditnote),
- $array_key.'_already_payed_all_locale'=>price(price2num($already_payed_all, 'MT'), 0, $outputlangs),
- $array_key.'_already_payed_all'=> price2num($already_payed_all, 'MT'),
+ $array_key.'_already_payed_all_locale' => price(price2num($already_payed_all, 'MT'), 0, $outputlangs),
+ $array_key.'_already_payed_all' => price2num($already_payed_all, 'MT'),
// Remain to pay with all known information (except open direct debit requests)
- $array_key.'_remain_to_pay_locale'=>price(price2num($object->total_ttc - $already_payed_all, 'MT'), 0, $outputlangs),
- $array_key.'_remain_to_pay'=>price2num($object->total_ttc - $already_payed_all, 'MT')
+ $array_key.'_remain_to_pay_locale' => price(price2num($object->total_ttc - $already_payed_all, 'MT'), 0, $outputlangs),
+ $array_key.'_remain_to_pay' => price2num($object->total_ttc - $already_payed_all, 'MT')
);
if (in_array($object->element, array('facture', 'invoice', 'supplier_invoice', 'facture_fournisseur'))) {
@@ -616,10 +627,10 @@ abstract class CommonDocGenerator
$resarray[$array_key.'_bank_bic'] = (empty($bank_account) ? '' : $bank_account->bic);
$resarray[$array_key.'_bank_label'] = (empty($bank_account) ? '' : $bank_account->label);
$resarray[$array_key.'_bank_number'] = (empty($bank_account) ? '' : $bank_account->number);
- $resarray[$array_key.'_bank_proprio'] =(empty($bank_account) ? '' : $bank_account->proprio);
- $resarray[$array_key.'_bank_address'] =(empty($bank_account) ? '' : $bank_account->address);
- $resarray[$array_key.'_bank_state'] =(empty($bank_account) ? '' : $bank_account->state);
- $resarray[$array_key.'_bank_country'] =(empty($bank_account) ? '' : $bank_account->country);
+ $resarray[$array_key.'_bank_proprio'] = (empty($bank_account) ? '' : $bank_account->proprio);
+ $resarray[$array_key.'_bank_address'] = (empty($bank_account) ? '' : $bank_account->address);
+ $resarray[$array_key.'_bank_state'] = (empty($bank_account) ? '' : $bank_account->state);
+ $resarray[$array_key.'_bank_country'] = (empty($bank_account) ? '' : $bank_account->country);
}
if (method_exists($object, 'getTotalDiscount') && in_array(get_class($object), array('Propal', 'Proposal', 'Commande', 'Facture', 'SupplierProposal', 'CommandeFournisseur', 'FactureFournisseur'))) {
@@ -642,7 +653,7 @@ abstract class CommonDocGenerator
$resarray[$array_key.'_project_date_start'] = dol_print_date($object->project->date_start, 'day');
$resarray[$array_key.'_project_date_end'] = dol_print_date($object->project->date_end, 'day');
} else { // empty replacement
- $resarray[$array_key.'_project_ref'] ='';
+ $resarray[$array_key.'_project_ref'] = '';
$resarray[$array_key.'_project_title'] = '';
$resarray[$array_key.'_project_description'] = '';
$resarray[$array_key.'_project_date_start'] = '';
@@ -714,38 +725,38 @@ abstract class CommonDocGenerator
// phpcs:enable
$resarray = array(
'line_pos' => $linenumber,
- 'line_fulldesc'=>doc_getlinedesc($line, $outputlangs),
+ 'line_fulldesc' => doc_getlinedesc($line, $outputlangs),
- 'line_product_ref'=>(empty($line->product_ref) ? '' : $line->product_ref),
- 'line_product_ref_fourn'=>(empty($line->ref_fourn) ? '' : $line->ref_fourn), // for supplier doc lines
- 'line_product_label'=>(empty($line->product_label) ? '' : $line->product_label),
- 'line_product_type'=>(empty($line->product_type) ? '' : $line->product_type),
- 'line_product_barcode'=>(empty($line->product_barcode) ? '' : $line->product_barcode),
- 'line_product_desc'=>(empty($line->product_desc) ? '' : $line->product_desc),
+ 'line_product_ref' => (empty($line->product_ref) ? '' : $line->product_ref),
+ 'line_product_ref_fourn' => (empty($line->ref_fourn) ? '' : $line->ref_fourn), // for supplier doc lines
+ 'line_product_label' => (empty($line->product_label) ? '' : $line->product_label),
+ 'line_product_type' => (empty($line->product_type) ? '' : $line->product_type),
+ 'line_product_barcode' => (empty($line->product_barcode) ? '' : $line->product_barcode),
+ 'line_product_desc' => (empty($line->product_desc) ? '' : $line->product_desc),
- 'line_desc'=>$line->desc,
- 'line_vatrate'=>vatrate($line->tva_tx, true, $line->info_bits),
- 'line_localtax1_rate'=>vatrate($line->localtax1_tx),
- 'line_localtax2_rate'=>vatrate($line->localtax1_tx),
- 'line_up'=>price2num($line->subprice),
- 'line_up_locale'=>price($line->subprice, 0, $outputlangs),
- 'line_total_up'=>price2num($line->subprice * $line->qty),
- 'line_total_up_locale'=>price($line->subprice * $line->qty, 0, $outputlangs),
- 'line_qty'=>$line->qty,
- 'line_discount_percent'=>($line->remise_percent ? $line->remise_percent.'%' : ''),
- 'line_price_ht'=>price2num($line->total_ht),
- 'line_price_ttc'=>price2num($line->total_ttc),
- 'line_price_vat'=>price2num($line->total_tva),
- 'line_price_ht_locale'=>price($line->total_ht, 0, $outputlangs),
- 'line_price_ttc_locale'=>price($line->total_ttc, 0, $outputlangs),
- 'line_price_vat_locale'=>price($line->total_tva, 0, $outputlangs),
+ 'line_desc' => $line->desc,
+ 'line_vatrate' => vatrate($line->tva_tx, true, $line->info_bits),
+ 'line_localtax1_rate' => vatrate($line->localtax1_tx),
+ 'line_localtax2_rate' => vatrate($line->localtax1_tx),
+ 'line_up' => price2num($line->subprice),
+ 'line_up_locale' => price($line->subprice, 0, $outputlangs),
+ 'line_total_up' => price2num($line->subprice * $line->qty),
+ 'line_total_up_locale' => price($line->subprice * $line->qty, 0, $outputlangs),
+ 'line_qty' => $line->qty,
+ 'line_discount_percent' => ($line->remise_percent ? $line->remise_percent.'%' : ''),
+ 'line_price_ht' => price2num($line->total_ht),
+ 'line_price_ttc' => price2num($line->total_ttc),
+ 'line_price_vat' => price2num($line->total_tva),
+ 'line_price_ht_locale' => price($line->total_ht, 0, $outputlangs),
+ 'line_price_ttc_locale' => price($line->total_ttc, 0, $outputlangs),
+ 'line_price_vat_locale' => price($line->total_tva, 0, $outputlangs),
// Dates
- 'line_date_start'=>dol_print_date($line->date_start, 'day'),
- 'line_date_start_locale'=>dol_print_date($line->date_start, 'day', 'tzserver', $outputlangs),
- 'line_date_start_rfc'=>dol_print_date($line->date_start, 'dayrfc'),
- 'line_date_end'=>dol_print_date($line->date_end, 'day'),
- 'line_date_end_locale'=>dol_print_date($line->date_end, 'day', 'tzserver', $outputlangs),
- 'line_date_end_rfc'=>dol_print_date($line->date_end, 'dayrfc'),
+ 'line_date_start' => dol_print_date($line->date_start, 'day'),
+ 'line_date_start_locale' => dol_print_date($line->date_start, 'day', 'tzserver', $outputlangs),
+ 'line_date_start_rfc' => dol_print_date($line->date_start, 'dayrfc'),
+ 'line_date_end' => dol_print_date($line->date_end, 'day'),
+ 'line_date_end_locale' => dol_print_date($line->date_end, 'day', 'tzserver', $outputlangs),
+ 'line_date_end_rfc' => dol_print_date($line->date_end, 'dayrfc'),
'line_multicurrency_code' => price2num($line->multicurrency_code),
'line_multicurrency_subprice' => price2num($line->multicurrency_subprice),
@@ -844,27 +855,27 @@ abstract class CommonDocGenerator
$calculatedVolume = ($object->trueWidth * $object->trueHeight * $object->trueDepth);
$array_shipment = array(
- $array_key.'_id'=>$object->id,
- $array_key.'_ref'=>$object->ref,
- $array_key.'_ref_ext'=>$object->ref_ext,
- $array_key.'_ref_customer'=>$object->ref_customer,
- $array_key.'_date_delivery'=>dol_print_date($object->date_delivery, 'day'),
- $array_key.'_hour_delivery'=>dol_print_date($object->date_delivery, 'hour'),
- $array_key.'_date_creation'=>dol_print_date($object->date_creation, 'day'),
- $array_key.'_total_ht'=>price($object->total_ht),
- $array_key.'_total_vat'=>price($object->total_tva),
- $array_key.'_total_ttc'=>price($object->total_ttc),
+ $array_key.'_id' => $object->id,
+ $array_key.'_ref' => $object->ref,
+ $array_key.'_ref_ext' => $object->ref_ext,
+ $array_key.'_ref_customer' => $object->ref_customer,
+ $array_key.'_date_delivery' => dol_print_date($object->date_delivery, 'day'),
+ $array_key.'_hour_delivery' => dol_print_date($object->date_delivery, 'hour'),
+ $array_key.'_date_creation' => dol_print_date($object->date_creation, 'day'),
+ $array_key.'_total_ht' => price($object->total_ht),
+ $array_key.'_total_vat' => price($object->total_tva),
+ $array_key.'_total_ttc' => price($object->total_ttc),
$array_key.'_total_discount_ht' => price($object->getTotalDiscount()),
- $array_key.'_note_private'=>$object->note_private,
- $array_key.'_note'=>$object->note_public,
- $array_key.'_tracking_number'=>$object->tracking_number,
- $array_key.'_tracking_url'=>$object->tracking_url,
- $array_key.'_shipping_method'=>$object->listmeths[0]['libelle'],
- $array_key.'_weight'=>$object->trueWeight.' '.measuringUnitString(0, 'weight', $object->weight_units),
- $array_key.'_width'=>$object->trueWidth.' '.measuringUnitString(0, 'size', $object->width_units),
- $array_key.'_height'=>$object->trueHeight.' '.measuringUnitString(0, 'size', $object->height_units),
- $array_key.'_depth'=>$object->trueDepth.' '.measuringUnitString(0, 'size', $object->depth_units),
- $array_key.'_size'=>$calculatedVolume.' '.measuringUnitString(0, 'volume'),
+ $array_key.'_note_private' => $object->note_private,
+ $array_key.'_note' => $object->note_public,
+ $array_key.'_tracking_number' => $object->tracking_number,
+ $array_key.'_tracking_url' => $object->tracking_url,
+ $array_key.'_shipping_method' => $object->listmeths[0]['libelle'],
+ $array_key.'_weight' => $object->trueWeight.' '.measuringUnitString(0, 'weight', $object->weight_units),
+ $array_key.'_width' => $object->trueWidth.' '.measuringUnitString(0, 'size', $object->width_units),
+ $array_key.'_height' => $object->trueHeight.' '.measuringUnitString(0, 'size', $object->height_units),
+ $array_key.'_depth' => $object->trueDepth.' '.measuringUnitString(0, 'size', $object->depth_units),
+ $array_key.'_size' => $calculatedVolume.' '.measuringUnitString(0, 'volume'),
);
// Add vat by rates
@@ -1367,7 +1378,7 @@ abstract class CommonDocGenerator
'object' => $object,
'extrafields' => $extrafields,
'extrafieldKey' => $extrafieldKey,
- 'extrafieldOutputContent' =>& $extrafieldOutputContent
+ 'extrafieldOutputContent' => & $extrafieldOutputContent
);
$reshook = $hookmanager->executeHooks('getPDFExtrafieldContent', $parameters, $this); // Note that $action and $object may have been modified by hook
if ($reshook < 0) {
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 708e198ac98..a32425ceef4 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -551,7 +551,6 @@ abstract class CommonInvoice extends CommonObject
public function is_erasable()
{
// phpcs:enable
- global $conf;
// We check if invoice is a temporary number (PROVxxxx)
$tmppart = substr($this->ref, 1, 4);
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index edca6bd2b10..549d76c1cd8 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -138,8 +138,9 @@ abstract class CommonObject
*/
public $array_options = array();
+
/**
- * @var array Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+ * @var array,position:int,notnull:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array,comment?:string}> Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
*/
public $fields = array();
@@ -775,7 +776,7 @@ abstract class CommonObject
public $extraparams = array();
/**
- * @var array List of child tables. To test if we can delete object.
+ * @var array List of child tables. To test if we can delete object.
*/
protected $childtables = array();
@@ -1666,11 +1667,7 @@ abstract class CommonObject
$tmpelement = $obj->element;
$transkey = "TypeContact_".$tmpelement."_".$source."_".$obj->code;
$libelle_type = ($langs->trans($transkey) != $transkey ? $langs->trans($transkey) : $obj->type_label);
- if (empty($option)) {
- $tab[$obj->rowid] = $libelle_element.' - '.$libelle_type;
- } else {
- $tab[$obj->rowid] = $libelle_element.' - '.$libelle_type;
- }
+ $tab[$obj->rowid] = $libelle_element.' - '.$libelle_type;
}
}
}
@@ -7317,7 +7314,7 @@ abstract class CommonObject
$isDependList = 1;
}
$tmpselect .= (!empty($parent) ? ' parent="'.$parent.'"' : '');
- $tmpselect .= '>'.$valb.'';
+ $tmpselect .= '>'.$langs->trans($valb).'';
}
$out .= '';
@@ -7947,7 +7944,7 @@ abstract class CommonObject
} elseif ($type == 'select') {
$value = isset($param['options'][$value]) ? $param['options'][$value] : '';
if (strpos($value, "|") !== false) {
- $value = explode('|', $value)[0];
+ $value = $langs->trans(explode('|', $value)[0]);
}
} elseif ($type == 'sellist') {
$param_list = array_keys($param['options']);
@@ -8542,7 +8539,7 @@ abstract class CommonObject
}
$visibility = 1;
- if ($visibility && isset($extrafields->attributes[$this->table_element]['list'][$key])) {
+ if (isset($extrafields->attributes[$this->table_element]['list'][$key])) {
$visibility = (int) dol_eval($extrafields->attributes[$this->table_element]['list'][$key], 1, 1, '2');
}
@@ -8551,9 +8548,9 @@ abstract class CommonObject
$perms = (int) dol_eval($extrafields->attributes[$this->table_element]['perms'][$key], 1, 1, '2');
}
- if (($mode == 'create') && abs($visibility) != 1 && abs($visibility) != 3) {
+ if (($mode == 'create') && !in_array(abs($visibility), array(1, 3))) {
continue; // <> -1 and <> 1 and <> 3 = not visible on forms, only on list
- } elseif (($mode == 'edit') && abs($visibility) != 1 && abs($visibility) != 3 && abs($visibility) != 4) {
+ } elseif (($mode == 'edit') && !in_array(abs($visibility), array(1, 3, 4))) {
continue; // <> -1 and <> 1 and <> 3 = not visible on forms, only on list and <> 4 = not visible at the creation
} elseif ($mode == 'view' && empty($visibility)) {
continue;
@@ -8767,13 +8764,7 @@ abstract class CommonObject
}
$out .= ($display_type == 'card' ? ' ' : '
' : '');
- } else {
- $out .= ($display_type == 'card' ? '' : '');
- }
-
+ $out .= ($display_type == 'card' ? '' : '');
$e++;
}
}
diff --git a/htdocs/core/class/commonstickergenerator.class.php b/htdocs/core/class/commonstickergenerator.class.php
index ba63bba320e..9e32529e9b1 100644
--- a/htdocs/core/class/commonstickergenerator.class.php
+++ b/htdocs/core/class/commonstickergenerator.class.php
@@ -296,7 +296,7 @@ abstract class CommonStickerGenerator extends CommonDocGenerator
* protected Set format
*
* @param TCPDF $pdf PDF reference
- * @param string $format Format
+ * @param array{metric:string,name:string,code:string,marginLeft:float,marginTip:float,SpaceX:float,SpaceY:float,NX:int,NY:int,width:float,height:float,font-size:float} $format Format
* @return void
*/
protected function _Set_Format(&$pdf, $format)
diff --git a/htdocs/core/class/cproductnature.class.php b/htdocs/core/class/cproductnature.class.php
index b395bf8983f..749b07b4029 100644
--- a/htdocs/core/class/cproductnature.class.php
+++ b/htdocs/core/class/cproductnature.class.php
@@ -1,6 +1,7 @@
* Copyright (C) 2020 Florian HENRY