';
diff --git a/htdocs/admin/socialnetworks.php b/htdocs/admin/socialnetworks.php
new file mode 100644
index 00000000000..9aba26b3fc4
--- /dev/null
+++ b/htdocs/admin/socialnetworks.php
@@ -0,0 +1,123 @@
+
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+/**
+ * \file htdocs/admin/socialnetworks.php
+ * \ingroup socialnetworks
+ * \brief Page to setup the module Social Networks
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/mailmanspip.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("admin", "errors"));
+
+if (! $user->admin) accessforbidden();
+
+$type=array('yesno','texte','chaine');
+
+$action = GETPOST('action','aZ09');
+
+
+
+/*
+ * Actions
+ */
+
+// Action activation d'un sous module du module adherent
+if ($action == 'set')
+{
+ $result=dolibarr_set_const($db, $_GET["name"], $_GET["value"], '', 0, '', $conf->entity);
+ if ($result < 0)
+ {
+ dol_print_error($db);
+ }
+}
+
+// Action desactivation d'un sous module du module adherent
+if ($action == 'unset')
+{
+ $result=dolibarr_del_const($db, $_GET["name"], $conf->entity);
+ if ($result < 0)
+ {
+ dol_print_error($db);
+ }
+}
+
+
+/*
+ * View
+ */
+
+$help_url='';
+
+llxHeader('',$langs->trans("SocialNetworkSetup"),$help_url);
+
+
+$linkback=''.$langs->trans("BackToModuleList").'';
+print load_fiche_titre($langs->trans("SocialNetworkSetup"),$linkback,'title_setup');
+
+//$head = socialnetworks_admin_prepare_head();
+$h=0;
+$head = array();
+$head[$h][0] = DOL_URL_ROOT.'/admin/socialnetworks.php';
+$head[$h][1] = $langs->trans("Setup");
+$head[$h][2] = 'setup';
+$h++;
+
+
+print '';
+
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 9c2ee62565d..99a07c17248 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -156,7 +156,8 @@ $i=0;
foreach($_SESSION as $key => $val)
{
if ($i > 0) print ', ';
- print $key.' => '.dol_escape_htmltag($val);
+ if (is_array($val)) print $key.' => array(...)';
+ else print $key.' => '.dol_escape_htmltag($val);
$i++;
}
print ''."\n";
diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php
index 0418830cce8..10cffafb9a9 100644
--- a/htdocs/admin/system/filecheck.php
+++ b/htdocs/admin/system/filecheck.php
@@ -337,7 +337,13 @@ if (! $error && $xml)
$i++;
$out.='
';
setEventMessages($printer->error, $printer->errors, 'errors');
diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php
index 54d265bf6af..dd64a07b8d9 100644
--- a/htdocs/core/boxes/box_factures_imp.php
+++ b/htdocs/core/boxes/box_factures_imp.php
@@ -86,7 +86,7 @@ class box_factures_imp extends ModeleBoxes
if ($user->rights->facture->lire)
{
- $sql = "SELECT s.nom as name, s.rowid as socid,";
+ $sql = "SELECT s.nom as name, s.rowid as socid, s.email,";
$sql.= " s.code_client,";
$sql.= " s.logo,";
$sql.= " f.facnumber, f.date_lim_reglement as datelimite,";
@@ -134,9 +134,11 @@ class box_factures_imp extends ModeleBoxes
$facturestatic->total_ttc = $objp->total_ttc;
$facturestatic->statut = $objp->fk_statut;
$facturestatic->date_lim_reglement = $db->jdate($objp->datelimite);
+
$societestatic->id = $objp->socid;
$societestatic->name = $objp->name;
$societestatic->client = 1;
+ $societestatic->email = $objp->email;
$societestatic->code_client = $objp->code_client;
$societestatic->logo = $objp->logo;
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 45998a78869..d1a46e4d0b9 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -59,7 +59,11 @@ class CMailFile
var $eol;
var $eol2;
- var $error='';
+
+ /**
+ * @var string Error code (or message)
+ */
+ public $error='';
var $smtps; // Contains SMTPs object (if this method is used)
var $phpmailer; // Contains PHPMailer object (if this method is used)
@@ -1027,7 +1031,7 @@ class CMailFile
$mimedone=0;
$out = "";
- if ($filename_list)
+ if (is_array($filename_list))
{
$filename_list_size=count($filename_list);
for($i=0;$i < $filename_list_size;$i++)
@@ -1199,7 +1203,7 @@ class CMailFile
/**
* Attach an image to email (mode = 'mail')
*
- * @param array $images_list Tableau
+ * @param array $images_list Array of array image
* @return string Chaine images encodees
*/
function write_images($images_list)
@@ -1207,7 +1211,7 @@ class CMailFile
// phpcs:enable
$out = '';
- if ($images_list)
+ if (is_array($images_list))
{
foreach ($images_list as $img)
{
diff --git a/htdocs/core/class/CSMSFile.class.php b/htdocs/core/class/CSMSFile.class.php
index c2512af70ef..b6c334f7e1c 100644
--- a/htdocs/core/class/CSMSFile.class.php
+++ b/htdocs/core/class/CSMSFile.class.php
@@ -34,15 +34,18 @@
*/
class CSMSFile
{
- var $error='';
+ /**
+ * @var string Error code (or message)
+ */
+ public $error='';
- var $addr_from;
- var $addr_to;
- var $deferred;
- var $priority;
- var $class;
- var $message;
- var $nostop;
+ public $addr_from;
+ public $addr_to;
+ public $deferred;
+ public $priority;
+ public $class;
+ public $message;
+ public $nostop;
/**
diff --git a/htdocs/core/class/antivir.class.php b/htdocs/core/class/antivir.class.php
index d18501d54d9..c67e3f5f59d 100644
--- a/htdocs/core/class/antivir.class.php
+++ b/htdocs/core/class/antivir.class.php
@@ -40,7 +40,10 @@ class AntiVir
*/
public $errors = array();
- var $output;
+ /**
+ * @var string Used to return message
+ */
+ public $output;
/**
* @var DoliDB Database handler.
diff --git a/htdocs/core/class/canvas.class.php b/htdocs/core/class/canvas.class.php
index a4665701661..cf830048cc0 100644
--- a/htdocs/core/class/canvas.class.php
+++ b/htdocs/core/class/canvas.class.php
@@ -43,15 +43,15 @@ class Canvas
*/
public $errors = array();
- var $actiontype;
+ public $actiontype;
- var $dirmodule; // Module directory
- var $targetmodule; // Module concerned by canvas (ex: thirdparty, contact, ...)
- var $canvas; // Name of canvas (ex: company, individual, product, service, ...)
- var $card; // Tab (sub-canvas)
+ public $dirmodule; // Module directory
+ public $targetmodule; // Module concerned by canvas (ex: thirdparty, contact, ...)
+ public $canvas; // Name of canvas (ex: company, individual, product, service, ...)
+ public $card; // Tab (sub-canvas)
- var $template_dir; // Initialized by getCanvas with templates directory
- var $control; // Initialized by getCanvas with controller instance
+ public $template_dir; // Initialized by getCanvas with templates directory
+ public $control; // Initialized by getCanvas with controller instance
/**
diff --git a/htdocs/core/class/ccountry.class.php b/htdocs/core/class/ccountry.class.php
index 2f9a8636c8b..f07916a7511 100644
--- a/htdocs/core/class/ccountry.class.php
+++ b/htdocs/core/class/ccountry.class.php
@@ -76,7 +76,6 @@ class Ccountry // extends CommonObject
function __construct($db)
{
$this->db = $db;
- return 1;
}
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index a818bfe7a2f..3792aaf9327 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -33,7 +33,11 @@
*/
abstract class CommonDocGenerator
{
- var $error='';
+ /**
+ * @var string Error code (or message)
+ */
+ public $error='';
+
protected $db;
@@ -491,11 +495,11 @@ abstract class CommonDocGenerator
/**
* Define array with couple substitution key => substitution value
*
- * @param array $line Array of lines
+ * @param Object $line Object line
* @param Translate $outputlangs Lang object to use for output
* @return array Return a substitution array
*/
- function get_substitutionarray_lines($line,$outputlangs)
+ function get_substitutionarray_lines($line, $outputlangs)
{
// phpcs:enable
global $conf;
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index e9be4b1f9da..9b1cb8776c3 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -431,11 +431,11 @@ abstract class CommonInvoice extends CommonObject
{
global $langs;
if ($this->type == CommonInvoice::TYPE_STANDARD) return $langs->trans("InvoiceStandard");
- if ($this->type == CommonInvoice::TYPE_REPLACEMENT) return $langs->trans("InvoiceReplacement");
- if ($this->type == CommonInvoice::TYPE_CREDIT_NOTE) return $langs->trans("InvoiceAvoir");
- if ($this->type == CommonInvoice::TYPE_DEPOSIT) return $langs->trans("InvoiceDeposit");
- if ($this->type == CommonInvoice::TYPE_PROFORMA) return $langs->trans("InvoiceProForma"); // Not used.
- if ($this->type == CommonInvoice::TYPE_SITUATION) return $langs->trans("InvoiceSituation");
+ elseif ($this->type == CommonInvoice::TYPE_REPLACEMENT) return $langs->trans("InvoiceReplacement");
+ elseif ($this->type == CommonInvoice::TYPE_CREDIT_NOTE) return $langs->trans("InvoiceAvoir");
+ elseif ($this->type == CommonInvoice::TYPE_DEPOSIT) return $langs->trans("InvoiceDeposit");
+ elseif ($this->type == CommonInvoice::TYPE_PROFORMA) return $langs->trans("InvoiceProForma"); // Not used.
+ elseif ($this->type == CommonInvoice::TYPE_SITUATION) return $langs->trans("InvoiceSituation");
return $langs->trans("Unknown");
}
@@ -475,10 +475,10 @@ abstract class CommonInvoice extends CommonObject
if (! $paye)
{
if ($status == 0) return $langs->trans('Bill'.$prefix.'StatusDraft');
- if (($status == 3 || $status == 2) && $alreadypaid <= 0) return $langs->trans('Bill'.$prefix.'StatusClosedUnpaid');
- if (($status == 3 || $status == 2) && $alreadypaid > 0) return $langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
- if ($alreadypaid <= 0) return $langs->trans('Bill'.$prefix.'StatusNotPaid');
- return $langs->trans('Bill'.$prefix.'StatusStarted');
+ elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return $langs->trans('Bill'.$prefix.'StatusClosedUnpaid');
+ elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return $langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
+ elseif ($alreadypaid <= 0) return $langs->trans('Bill'.$prefix.'StatusNotPaid');
+ else return $langs->trans('Bill'.$prefix.'StatusStarted');
}
else
{
@@ -493,10 +493,10 @@ abstract class CommonInvoice extends CommonObject
if (! $paye)
{
if ($status == 0) return $langs->trans('Bill'.$prefix.'StatusDraft');
- if (($status == 3 || $status == 2) && $alreadypaid <= 0) return $langs->trans('Bill'.$prefix.'StatusCanceled');
- if (($status == 3 || $status == 2) && $alreadypaid > 0) return $langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
- if ($alreadypaid <= 0) return $langs->trans('Bill'.$prefix.'StatusNotPaid');
- return $langs->trans('Bill'.$prefix.'StatusStarted');
+ elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return $langs->trans('Bill'.$prefix.'StatusCanceled');
+ elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return $langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
+ elseif ($alreadypaid <= 0) return $langs->trans('Bill'.$prefix.'StatusNotPaid');
+ else return $langs->trans('Bill'.$prefix.'StatusStarted');
}
else
{
@@ -511,10 +511,10 @@ abstract class CommonInvoice extends CommonObject
if (! $paye)
{
if ($status == 0) return img_picto($langs->trans('BillStatusDraft'),'statut0').' '.$langs->trans('Bill'.$prefix.'StatusDraft');
- if (($status == 3 || $status == 2) && $alreadypaid <= 0) return img_picto($langs->trans('StatusCanceled'),'statut5').' '.$langs->trans('Bill'.$prefix.'StatusCanceled');
- if (($status == 3 || $status == 2) && $alreadypaid > 0) return img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut9').' '.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
- if ($alreadypaid <= 0) return img_picto($langs->trans('BillStatusNotPaid'),'statut1').' '.$langs->trans('Bill'.$prefix.'StatusNotPaid');
- return img_picto($langs->trans('BillStatusStarted'),'statut3').' '.$langs->trans('Bill'.$prefix.'StatusStarted');
+ elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return img_picto($langs->trans('StatusCanceled'),'statut5').' '.$langs->trans('Bill'.$prefix.'StatusCanceled');
+ elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut9').' '.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
+ elseif ($alreadypaid <= 0) return img_picto($langs->trans('BillStatusNotPaid'),'statut1').' '.$langs->trans('Bill'.$prefix.'StatusNotPaid');
+ else return img_picto($langs->trans('BillStatusStarted'),'statut3').' '.$langs->trans('Bill'.$prefix.'StatusStarted');
}
else
{
@@ -529,10 +529,10 @@ abstract class CommonInvoice extends CommonObject
if (! $paye)
{
if ($status == 0) return img_picto($langs->trans('BillStatusDraft'),'statut0');
- if (($status == 3 || $status == 2) && $alreadypaid <= 0) return img_picto($langs->trans('BillStatusCanceled'),'statut5');
- if (($status == 3 || $status == 2) && $alreadypaid > 0) return img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut9');
- if ($alreadypaid <= 0) return img_picto($langs->trans('BillStatusNotPaid'),'statut1');
- return img_picto($langs->trans('BillStatusStarted'),'statut3');
+ elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return img_picto($langs->trans('BillStatusCanceled'),'statut5');
+ elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut9');
+ elseif ($alreadypaid <= 0) return img_picto($langs->trans('BillStatusNotPaid'),'statut1');
+ else return img_picto($langs->trans('BillStatusStarted'),'statut3');
}
else
{
@@ -547,10 +547,10 @@ abstract class CommonInvoice extends CommonObject
if (! $paye)
{
if ($status == 0) return img_picto($langs->trans('BillStatusDraft'),'statut0').' '.$langs->trans('BillStatusDraft');
- if (($status == 3 || $status == 2) && $alreadypaid <= 0) return img_picto($langs->trans('BillStatusCanceled'),'statut5').' '.$langs->trans('Bill'.$prefix.'StatusCanceled');
- if (($status == 3 || $status == 2) && $alreadypaid > 0) return img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut9').' '.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
- if ($alreadypaid <= 0) return img_picto($langs->trans('BillStatusNotPaid'),'statut1').' '.$langs->trans('BillStatusNotPaid');
- return img_picto($langs->trans('BillStatusStarted'),'statut3').' '.$langs->trans('BillStatusStarted');
+ elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return img_picto($langs->trans('BillStatusCanceled'),'statut5').' '.$langs->trans('Bill'.$prefix.'StatusCanceled');
+ elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut9').' '.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
+ elseif ($alreadypaid <= 0) return img_picto($langs->trans('BillStatusNotPaid'),'statut1').' '.$langs->trans('BillStatusNotPaid');
+ else return img_picto($langs->trans('BillStatusStarted'),'statut3').' '.$langs->trans('BillStatusStarted');
}
else
{
@@ -566,14 +566,14 @@ abstract class CommonInvoice extends CommonObject
if (! $paye)
{
if ($status == 0) return ''.$langs->trans('Bill'.$prefix.'StatusDraft').' '.img_picto($langs->trans('BillStatusDraft'),'statut0');
- if (($status == 3 || $status == 2) && $alreadypaid <= 0) return ''.$langs->trans('Bill'.$prefix.'StatusCanceled').' '.img_picto($langs->trans('BillStatusCanceled'),'statut5');
- if (($status == 3 || $status == 2) && $alreadypaid > 0) return ''.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially').' '.img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut9');
- if ($alreadypaid <= 0)
+ elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return ''.$langs->trans('Bill'.$prefix.'StatusCanceled').' '.img_picto($langs->trans('BillStatusCanceled'),'statut5');
+ elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return ''.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially').' '.img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut9');
+ elseif ($alreadypaid <= 0)
{
if ($type == self::TYPE_CREDIT_NOTE) return ''.$langs->trans('Bill'.$prefix.'StatusNotRefunded').' '.img_picto($langs->trans('StatusNotRefunded'),'statut1');
return ''.$langs->trans('Bill'.$prefix.'StatusNotPaid').' '.img_picto($langs->trans('BillStatusNotPaid'),'statut1');
}
- return ''.$langs->trans('Bill'.$prefix.'StatusStarted').' '.img_picto($langs->trans('BillStatusStarted'),'statut3');
+ else return ''.$langs->trans('Bill'.$prefix.'StatusStarted').' '.img_picto($langs->trans('BillStatusStarted'),'statut3');
}
else
{
@@ -598,7 +598,9 @@ abstract class CommonInvoice extends CommonObject
if (! $cond_reglement) $cond_reglement=$this->cond_reglement_code;
if (! $cond_reglement) $cond_reglement=$this->cond_reglement_id;
- $cdr_nbjour=0; $cdr_type=0; $cdr_decalage=0;
+ $cdr_nbjour=0;
+ $cdr_type=0;
+ $cdr_decalage=0;
$sqltemp = 'SELECT c.type_cdr,c.nbjour,c.decalage';
$sqltemp.= ' FROM '.MAIN_DB_PREFIX.'c_payment_term as c';
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 7991bbb9ae9..8f7366541e3 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1164,8 +1164,8 @@ abstract class CommonObject
$sql.= " ".MAIN_DB_PREFIX."c_type_contact as tc";
$sql.= " WHERE ec.element_id = ".$id;
$sql.= " AND ec.fk_socpeople = c.rowid";
- if ($source == 'internal') $sql.= " AND c.entity IN (0,".$conf->entity.")";
- if ($source == 'external') $sql.= " AND c.entity IN (".getEntity('socpeople').")";
+ if ($source == 'internal') $sql.= " AND c.entity IN (".getEntity('user').")";
+ if ($source == 'external') $sql.= " AND c.entity IN (".getEntity('societe').")";
$sql.= " AND ec.fk_c_type_contact = tc.rowid";
$sql.= " AND tc.element = '".$element."'";
$sql.= " AND tc.source = '".$source."'";
@@ -2899,6 +2899,7 @@ abstract class CommonObject
// Special case
if ($origin == 'order') $origin='commande';
if ($origin == 'invoice') $origin='facture';
+ if ($origin == 'invoice_template') $origin='facturerec';
$this->db->begin();
@@ -3824,6 +3825,7 @@ abstract class CommonObject
print '
';
+ // Adds a line numbering column
if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) print '
';
// Description
@@ -4911,6 +4913,9 @@ abstract class CommonObject
}
}
+ //dol_syslog("attributeLabel=".$attributeLabel, LOG_DEBUG);
+ //dol_syslog("attributeType=".$attributeType, LOG_DEBUG);
+
switch ($attributeType)
{
case 'int':
@@ -4924,6 +4929,21 @@ abstract class CommonObject
$new_array_options[$key] = null;
}
break;
+ case 'double':
+ $value = price2num($value);
+ if (!is_numeric($value) && $value!='')
+ {
+ dol_syslog($langs->trans("ExtraFieldHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);
+ $this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
+ return -1;
+ }
+ elseif ($value=='')
+ {
+ $new_array_options[$key] = null;
+ }
+ //dol_syslog("double value"." sur ".$attributeLabel."(".$value." is '".$attributeType."')", LOG_DEBUG);
+ $new_array_options[$key] = $value;
+ break;
/*case 'select': // Not required, we chosed value='0' for undefined values
if ($value=='-1')
{
@@ -5118,6 +5138,9 @@ abstract class CommonObject
$attributeParam = $extrafields->attributes[$this->table_element]['param'][$key];
$attributeRequired = $extrafields->attributes[$this->table_element]['required'][$key];
+ //dol_syslog("attributeLabel=".$attributeLabel, LOG_DEBUG);
+ //dol_syslog("attributeType=".$attributeType, LOG_DEBUG);
+
switch ($attributeType)
{
case 'int':
@@ -5131,6 +5154,21 @@ abstract class CommonObject
$this->array_options["options_".$key] = null;
}
break;
+ case 'double':
+ $value = price2num($value);
+ if (!is_numeric($value) && $value!='')
+ {
+ dol_syslog($langs->trans("ExtraFieldHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);
+ $this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
+ return -1;
+ }
+ elseif ($value=='')
+ {
+ $this->array_options["options_".$key] = null;
+ }
+ //dol_syslog("double value"." sur ".$attributeLabel."(".$value." is '".$attributeType."')", LOG_DEBUG);
+ $this->array_options["options_".$key] = $value;
+ break;
/*case 'select': // Not required, we chosed value='0' for undefined values
if ($value=='-1')
{
@@ -5329,7 +5367,7 @@ abstract class CommonObject
if (!$required && $value == '') $value = '-1';
// TODO Must also support $moreparam
- $out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 1, 0);
+ $out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);
}
elseif (in_array($type,array('int','integer')))
{
@@ -7288,7 +7326,7 @@ abstract class CommonObject
$comment = new Comment($this->db);
$result=$comment->fetchAllFor($this->element, $this->id);
if ($result<0) {
- $this->errors=array_merge($this->errors,$comment->errors);
+ $this->errors=array_merge($this->errors, $comment->errors);
return -1;
} else {
$this->comments = $comment->comments;
@@ -7305,4 +7343,20 @@ abstract class CommonObject
{
return count($this->comments);
}
+
+ /**
+ * Trim object parameters
+ * @param string[] $parameters array of parameters to trim
+ *
+ * @return void
+ */
+ public function trimParameters($parameters)
+ {
+ if (!is_array($parameters)) return;
+ foreach ($parameters as $parameter) {
+ if (isset($this->$parameter)) {
+ $this->$parameter = trim($this->$parameter);
+ }
+ }
+ }
}
diff --git a/htdocs/core/class/commonstickergenerator.class.php b/htdocs/core/class/commonstickergenerator.class.php
index 6d4c32d82bb..5289ed882ff 100644
--- a/htdocs/core/class/commonstickergenerator.class.php
+++ b/htdocs/core/class/commonstickergenerator.class.php
@@ -61,9 +61,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php';
*/
abstract class CommonStickerGenerator
{
-
public $code; // Code of format
- public $format; // Array with informations
+
+ /**
+ * @var array format Array with informations
+ */
+ public $format;
// protected
var $_Avery_Name = ''; // Nom du format de l'etiquette
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index db22d443c54..d6c768811c8 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -35,12 +35,12 @@ class Conf
/** \public */
//! To store properties found in conf file
var $file;
-
+
/**
* @var DoliDB Database handler.
*/
public $db;
-
+
//! To store properties found into database
var $global;
//! To store browser info
@@ -182,7 +182,7 @@ class Conf
if (is_array($arrValue) && ! empty($arrValue)) $value = $arrValue;
else if (in_array($partname,array('login','menus','substitutions','triggers','tpl'))) $value = '/'.$modulename.'/core/'.$partname.'/';
else if (in_array($partname,array('models','theme'))) $value = '/'.$modulename.'/';
- else if (in_array($partname,array('sms'))) $value = $modulename;
+ else if (in_array($partname,array('sms'))) $value = '/'.$modulename.'/';
else if ($value == 1) $value = '/'.$modulename.'/core/modules/'.$partname.'/'; // ex: partname = societe
$this->modules_parts[$partname] = array_merge($this->modules_parts[$partname], array($modulename => $value)); // $value may be a string or an array
}
diff --git a/htdocs/core/class/cstate.class.php b/htdocs/core/class/cstate.class.php
index 085da06c754..4320446d7b5 100644
--- a/htdocs/core/class/cstate.class.php
+++ b/htdocs/core/class/cstate.class.php
@@ -56,7 +56,19 @@ class Cstate // extends CommonObject
public $id;
public $code_departement;
- public $nom;
+
+ /**
+ * @var string
+ * @deprecated
+ * @see name
+ */
+ public $nom='';
+
+ /**
+ * @var string name
+ */
+ public $name='';
+
public $active;
@@ -70,7 +82,6 @@ class Cstate // extends CommonObject
function __construct($db)
{
$this->db = $db;
- return 1;
}
diff --git a/htdocs/core/class/ctypent.class.php b/htdocs/core/class/ctypent.class.php
index 9366cf6317b..db8ed461727 100644
--- a/htdocs/core/class/ctypent.class.php
+++ b/htdocs/core/class/ctypent.class.php
@@ -66,7 +66,6 @@ class Ctypent // extends CommonObject
function __construct($db)
{
$this->db = $db;
- return 1;
}
diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 618716ce0e4..ad7b900b033 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -39,46 +39,46 @@
*/
class DolGraph
{
- var $type=array(); // Array with type of each series. Example: array('bars', 'lines', ...)
- var $mode='side'; // Mode bars graph: side, depth
+ public $type=array(); // Array with type of each series. Example: array('bars', 'lines', ...)
+ public $mode='side'; // Mode bars graph: side, depth
private $_library='jflot'; // Graphic library to use (jflot, artichow)
//! Array of data
- var $data; // Data of graph: array(array('abs1',valA1,valB1), array('abs2',valA2,valB2), ...)
- var $title; // Title of graph
- var $cssprefix=''; // To add into css styles
- var $width=380;
- var $height=200;
- var $MaxValue=0;
- var $MinValue=0;
- var $SetShading=0;
+ public $data; // Data of graph: array(array('abs1',valA1,valB1), array('abs2',valA2,valB2), ...)
+ public $title; // Title of graph
+ public $cssprefix=''; // To add into css styles
+ public $width=380;
+ public $height=200;
+ public $MaxValue=0;
+ public $MinValue=0;
+ public $SetShading=0;
- var $PrecisionY=-1;
+ public $PrecisionY=-1;
- var $horizTickIncrement=-1;
- var $SetNumXTicks=-1;
- var $labelInterval=-1;
+ public $horizTickIncrement=-1;
+ public $SetNumXTicks=-1;
+ public $labelInterval=-1;
- var $hideXGrid=false;
- var $hideYGrid=false;
+ public $hideXGrid=false;
+ public $hideYGrid=false;
- var $Legend=array();
- var $LegendWidthMin=0;
- var $showlegend=1;
- var $showpointvalue=1;
- var $showpercent=0;
- var $combine=0; // 0.05 if you want to combine records < 5% into "other"
- var $graph; // Objet Graph (Artichow, Phplot...)
+ public $Legend=array();
+ public $LegendWidthMin=0;
+ public $showlegend=1;
+ public $showpointvalue=1;
+ public $showpercent=0;
+ public $combine=0; // 0.05 if you want to combine records < 5% into "other"
+ public $graph; // Objet Graph (Artichow, Phplot...)
/**
* @var string Error code (or message)
*/
public $error='';
- var $bordercolor; // array(R,G,B)
- var $bgcolor; // array(R,G,B)
- var $bgcolorgrid=array(255,255,255); // array(R,G,B)
- var $datacolor; // array(array(R,G,B),...)
+ public $bordercolor; // array(R,G,B)
+ public $bgcolor; // array(R,G,B)
+ public $bgcolorgrid=array(255,255,255); // array(R,G,B)
+ public $datacolor; // array(array(R,G,B),...)
private $stringtoshow; // To store string to output graph into HTML page
diff --git a/htdocs/core/class/events.class.php b/htdocs/core/class/events.class.php
index 2ac2a51d2ed..436a708d312 100644
--- a/htdocs/core/class/events.class.php
+++ b/htdocs/core/class/events.class.php
@@ -117,7 +117,6 @@ class Events // extends CommonObject
function __construct($db)
{
$this->db = $db;
- return 1;
}
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index c86bd3eff3f..07f6849e7ec 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1001,7 +1001,7 @@ class ExtraFields
if (!$required && $value == '') $value = '-1';
// TODO Must also support $moreparam
- $out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 1, 0);
+ $out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);
}
elseif (in_array($type,array('int','integer')))
{
diff --git a/htdocs/core/class/fiscalyear.class.php b/htdocs/core/class/fiscalyear.class.php
index de4dc46ac90..c4ab50179d9 100644
--- a/htdocs/core/class/fiscalyear.class.php
+++ b/htdocs/core/class/fiscalyear.class.php
@@ -79,9 +79,7 @@ class Fiscalyear extends CommonObject
$this->db = $db;
$this->statuts_short = array(0 => 'Opened', 1 => 'Closed');
- $this->statuts = array(0 => 'Opened', 1 => 'Closed');
-
- return 1;
+ $this->statuts = array(0 => 'Opened', 1 => 'Closed');
}
/**
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 177b05850ed..149f1681725 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1108,8 +1108,8 @@ class Form
else if (!is_array($selected)) $selected = array($selected);
// Clean $filter that may contains sql conditions so sql code
- if (function_exists('test_sql_and_script_inject')) {
- if (test_sql_and_script_inject($filter, 3)>0) {
+ if (function_exists('testSqlAndScriptInject')) {
+ if (testSqlAndScriptInject($filter, 3)>0) {
$filter ='';
}
}
@@ -4829,6 +4829,10 @@ class Form
$tmpthirdparty=new Societe($this->db);
$defaulttx=get_default_tva($societe_vendeuse, (is_object($societe_acheteuse)?$societe_acheteuse:$tmpthirdparty), $idprod);
$defaultnpr=get_default_npr($societe_vendeuse, (is_object($societe_acheteuse)?$societe_acheteuse:$tmpthirdparty), $idprod);
+ if (preg_match('/\((.*)\)/', $defaulttx, $reg)) {
+ $defaultcode=$reg[1];
+ $defaulttx=preg_replace('/\s*\(.*\)/','',$defaulttx);
+ }
if (empty($defaulttx)) $defaultnpr=0;
}
@@ -4928,18 +4932,17 @@ class Form
* @param int $fullday When a checkbox with this html name is on, hour and day are set with 00:00 or 23:59
* @param string $addplusone Add a link "+1 hour". Value must be name of another select_date field.
* @param datetime $adddateof Add a link "Date of invoice" using the following date.
- * @return string|null Nothing or string if nooutput is 1
+ * @return string|null Nothing or string if nooutput is 1
* @deprecated
* @see form_date, select_month, select_year, select_dayofweek
*/
function select_date($set_time='', $prefix='re', $h=0, $m=0, $empty=0, $form_name="", $d=1, $addnowlink=0, $nooutput=0, $disabled=0, $fullday='', $addplusone='', $adddateof='')
{
// phpcs:enable
- $retstring = $this->selectDate($set_time='', $prefix='re', $h=0, $m=0, $empty=0, $form_name="", $d=1, $addnowlink=0, $disabled=0, $fullday='', $addplusone='', $adddateof='');
+ $retstring = $this->selectDate($set_time, $prefix, $h, $m, $empty, $form_name, $d, $addnowlink, $disabled, $fullday, $addplusone, $adddateof);
if (! empty($nooutput)) {
return $retstring;
}
-
print $retstring;
return;
}
@@ -5730,7 +5733,7 @@ class Form
* @param string $morecss Add more class to css styles
* @param int $callurlonselect If set to 1, some code is added so an url return by the ajax is called when value is selected.
* @param string $placeholder String to use as placeholder
- * @param integer $acceptdelayedhtml 1 if caller request to have html js content not returned but saved into global $delayedhtmlcontent (so caller can show it at end of page to avoid flash FOUC effect)
+ * @param integer $acceptdelayedhtml 1 = caller is requesting to have html js content not returned but saved into global $delayedhtmlcontent (so caller can show it at end of page to avoid flash FOUC effect)
* @return string HTML select string
* @see selectArrayFilter, ajax_combobox in ajax.lib.php
*/
@@ -5832,7 +5835,7 @@ class Form
* @param string $morecss Add more class to css styles
* @param int $callurlonselect If set to 1, some code is added so an url return by the ajax is called when value is selected.
* @param string $placeholder String to use as placeholder
- * @param integer $acceptdelayedhtml 1 if caller request to have html js content not returned but saved into global $delayedhtmlcontent (so caller can show it at end of page to avoid flash FOUC effect)
+ * @param integer $acceptdelayedhtml 1 = caller is requesting to have html js content not returned but saved into global $delayedhtmlcontent (so caller can show it at end of page to avoid flash FOUC effect)
* @return string HTML select string
* @see selectArrayAjax, ajax_combobox in ajax.lib.php
*/
@@ -5949,55 +5952,76 @@ class Form
* @param int $width Force width of select box. May be used only when using jquery couch. Example: 250, 95%
* @param string $moreattrib Add more options on select component. Example: 'disabled'
* @param string $elemtype Type of element we show ('category', ...)
+ * @param string $placeholder String to use as placeholder
+ * @param int $addjscombo Add js combo
* @return string HTML multiselect string
* @see selectarray
*/
- static function multiselectarray($htmlname, $array, $selected=array(), $key_in_label=0, $value_as_key=0, $morecss='', $translate=0, $width=0, $moreattrib='',$elemtype='')
+ static function multiselectarray($htmlname, $array, $selected=array(), $key_in_label=0, $value_as_key=0, $morecss='', $translate=0, $width=0, $moreattrib='', $elemtype='', $placeholder='', $addjscombo=1)
{
global $conf, $langs;
$out = '';
+
// Add code for jquery to use multiselect
if (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT'))
{
- $tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
- $out.="\n".'
- ';
+ $out.="\n".'
+ ';
}
// Try also magic suggest
@@ -6075,7 +6099,7 @@ class Form
}
if ($val['label'])
{
- $lis.='
';
+ $lis.='';
$listcheckedstring.=(empty($val['checked'])?'':$key.',');
}
}
@@ -6346,6 +6370,7 @@ class Form
'propal'=>array('enabled'=>$conf->propal->enabled, 'perms'=>1, 'label'=>'LinkToProposal', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('propal').')'),
'order'=>array('enabled'=>$conf->commande->enabled, 'perms'=>1, 'label'=>'LinkToOrder', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('commande').')'),
'invoice'=>array('enabled'=>$conf->facture->enabled, 'perms'=>1, 'label'=>'LinkToInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.facnumber as ref, t.ref_client, t.total as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('facture').')'),
+ 'invoice_template'=>array('enabled'=>$conf->facture->enabled, 'perms'=>1, 'label'=>'LinkToTemplateInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.titre as ref, t.total as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_rec as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('facture').')'),
'contrat'=>array('enabled'=>$conf->contrat->enabled , 'perms'=>1, 'label'=>'LinkToContract', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, '' as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('contract').')'),
'fichinter'=>array('enabled'=>$conf->ficheinter->enabled, 'perms'=>1, 'label'=>'LinkToIntervention', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."fichinter as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('intervention').')'),
'supplier_proposal'=>array('enabled'=>$conf->supplier_proposal->enabled , 'perms'=>1, 'label'=>'LinkToSupplierProposal', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, '' as ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."supplier_proposal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('supplier_proposal').')'),
@@ -6408,8 +6433,7 @@ class Form
{
$objp = $this->db->fetch_object($resqllist);
- $var = ! $var;
- print '
';
+ print '
';
print '
';
print '';
print '
';
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index e01e1f2ad65..25a3973cbd8 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -48,7 +48,6 @@ class FormActions
function __construct($db)
{
$this->db = $db;
- return 1;
}
diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php
index 22fa73741ce..8d8e65e5130 100644
--- a/htdocs/core/class/html.formadmin.class.php
+++ b/htdocs/core/class/html.formadmin.class.php
@@ -41,7 +41,6 @@ class FormAdmin
function __construct($db)
{
$this->db = $db;
- return 1;
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
diff --git a/htdocs/core/class/html.formbarcode.class.php b/htdocs/core/class/html.formbarcode.class.php
index c2c408801c4..eb08aab6de7 100644
--- a/htdocs/core/class/html.formbarcode.class.php
+++ b/htdocs/core/class/html.formbarcode.class.php
@@ -48,7 +48,6 @@ class FormBarCode
function __construct($db)
{
$this->db = $db;
- return 1;
}
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index 5c39bc0cef4..273a84cbc94 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -49,8 +49,6 @@ class FormCompany
function __construct($db)
{
$this->db = $db;
-
- return 1;
}
diff --git a/htdocs/core/class/html.formcron.class.php b/htdocs/core/class/html.formcron.class.php
index 496d77f1f68..94747481cb0 100644
--- a/htdocs/core/class/html.formcron.class.php
+++ b/htdocs/core/class/html.formcron.class.php
@@ -46,7 +46,6 @@ class FormCron extends Form
function __construct($db)
{
$this->db = $db;
- return 1;
}
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index c1bc479fc73..4a59e28f044 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -54,7 +54,6 @@ class FormFile
{
$this->db = $db;
$this->numoffiles=0;
- return 1;
}
@@ -128,11 +127,12 @@ class FormFile
if (preg_match('/g$/i',$maxphp)) $maxphp=$maxphp*1024*1024;
if (preg_match('/t$/i',$maxphp)) $maxphp=$maxphp*1024*1024*1024;
// Now $max and $maxphp are in Kb
- if ($maxphp > 0) $max=min($max,$maxphp);
+ $maxmin = $max;
+ if ($maxphp > 0) $maxmin=min($max,$maxphp);
- if ($max > 0)
+ if ($maxmin > 0)
{
- $out .= '';
+ $out .= '';
}
$out .= 'load('link');
$title = $langs->trans("LinkANewFile");
$out .= load_fiche_titre($title, null, null);
@@ -213,19 +213,18 @@ class FormFile
$out .= '';
$out .= '';
$out .= ' ';
- $parameters = array('socid'=>(isset($GLOBALS['socid'])?$GLOBALS['socid']:''),'id'=>(isset($GLOBALS['id'])?$GLOBALS['id']:''), 'url'=>$url, 'perm'=>$perm);
- $res = $hookmanager->executeHooks('formattachOptions',$parameters,$object);
- $out .= "\n\n";
+ $out .= "\n\n";
}
+ $parameters = array('socid'=>(isset($GLOBALS['socid'])?$GLOBALS['socid']:''), 'id'=>(isset($GLOBALS['id'])?$GLOBALS['id']:''), 'url'=>$url, 'perm'=>$perm);
+ $res = $hookmanager->executeHooks('formattachOptions',$parameters,$object);
if (empty($res))
{
print '
';
print $out;
print '
';
}
-
print $hookmanager->resPrint;
return 1;
@@ -916,7 +915,7 @@ class FormFile
if (! empty($file_list))
{
$out='
';
print '';
print '';
- print '
';
- print '
';
- print '