'.$langs->trans("CurrentTimeZone").' '; // Timezone server PHP
$a = getServerTimeZoneInt('now');
diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php
index 3627daab7d9..c5d3e2d7b7e 100644
--- a/htdocs/admin/system/phpinfo.php
+++ b/htdocs/admin/system/phpinfo.php
@@ -137,7 +137,7 @@ print '';
print '';
@@ -154,7 +154,6 @@ $name = "GD";
print "";
print "".$name." ";
-//print getTableColumn($name, $activatedExtensions);
print getTableColumn($name, $loadedExtensions);
print getTableColumnFunction($functions);
print getResultColumn($name, $activatedExtensions, $loadedExtensions, $functions);
@@ -165,7 +164,6 @@ $name = "Curl";
print " ";
print "".$name." ";
-//print getTableColumn($name, $activatedExtensions);
print getTableColumn($name, $loadedExtensions);
print getTableColumnFunction($functions);
print getResultColumn($name, $activatedExtensions, $loadedExtensions, $functions);
@@ -178,7 +176,6 @@ if (empty($_SERVER["SERVER_ADMIN"]) || $_SERVER["SERVER_ADMIN"] != 'doliwamp@loc
print " ";
print "".$name." ";
- //print getTableColumn($name, $activatedExtensions);
print getTableColumn($name, $loadedExtensions);
print getTableColumnFunction($functions);
print getResultColumn($name, $activatedExtensions, $loadedExtensions, $functions);
@@ -191,7 +188,6 @@ $name = "xDebug";
print " ";
print "".$name." ";
-//print getTableColumn($name, $activatedExtensions);
print getTableColumn($name, $loadedExtensions);
print getTableColumnFunction($functions);
print getResultColumn($name, $activatedExtensions, $loadedExtensions, $functions);
@@ -221,7 +217,7 @@ foreach ($phparray as $key => $value)
print ''.$keyparam.' ';
$valtoshow = $keyvalue;
if ($keyparam == 'X-ChromePhp-Data') $valtoshow = dol_trunc($keyvalue, 80);
- print '';
+ print ' ';
if ($keyparam == 'Path') $valtoshow = implode('; ', explode(';', trim($valtoshow)));
if ($keyparam == 'PATH') $valtoshow = implode('; ', explode(';', trim($valtoshow)));
if ($keyparam == '_SERVER["PATH"]') $valtoshow = implode('; ', explode(';', trim($valtoshow)));
@@ -232,7 +228,7 @@ foreach ($phparray as $key => $value)
else
{
print ' ';
- print ''.$keyparam.' ';
+ print ''.$keyparam.' ';
$i = 0;
foreach ($keyvalue as $keyparam2 => $keyvalue2)
{
@@ -256,78 +252,6 @@ foreach ($phparray as $key => $value)
llxFooter();
$db->close();
-/**
- * Return all list with all activated, but possible not loaded PHP extensions
- *
- * @return array
- */
-function getActivatedExtensions()
-{
- $file = getConfigFilePath();
- $handle = fopen(GetConfigFilePath(), "r");
- $content = fread($handle, filesize($file));
-
- fclose($handle);
-
- $configLines = explode("\r", $content);
-
- $extensions = array();
- $lastLine = "";
-
- foreach ($configLines as $line)
- {
- $line = trim($line);
-
- // ignore comment lines
- if (substr($line, 0, 1) === ";")
- {
- continue;
- }
-
- // extension
- if (substr($line, 0, 9) === "extension" && substr($line, 0, 10) !== "extension_")
- {
- $value = trim(end(explode("=", $line)));
-
- $extensions[] = $value === "gd2" ? "gd" : $value;
- }
-
- // zend_extension
- if (substr($line, 0, 14) === "zend_extension")
- {
- $extensions[] = str_replace("[", "", str_replace("]", "", $lastLine));
- }
-
- $lastLine = $line;
- }
-
- return array_unique($extensions);
-}
-
-/**
- * Return the path to the current used php config file
- *
- * @return string
- */
-function getConfigFilePath()
-{
- $phparray = phpinfo_array();
-
- foreach ($phparray as $value)
- {
- foreach ($value as $keyparam => $keyvalue)
- {
- if (strtolower($keyparam) !== "loaded configuration file")
- {
- continue;
- }
-
- return $keyvalue;
- }
- }
-
- return "";
-}
/**
* Return a table column with a indicator (okay or warning), based on the given name and list
@@ -400,7 +324,7 @@ function getTableColumnFunction(array $functions)
* Return a result column with a translated result text
*
* @param string $name The name of the PHP extension
- * @param array $activated A list with all activated PHP extensions
+ * @param array $activated A list with all activated PHP extensions. Deprecated.
* @param array $loaded A list with all loaded PHP extensions
* @param array $functions A list with all PHP functions to check
*
diff --git a/htdocs/admin/tools/export_files.php b/htdocs/admin/tools/export_files.php
index de10759c92d..587750d129e 100644
--- a/htdocs/admin/tools/export_files.php
+++ b/htdocs/admin/tools/export_files.php
@@ -34,7 +34,7 @@ $action = GETPOST('action', 'alpha');
$what = GETPOST('what', 'alpha');
$export_type = GETPOST('export_type', 'alpha');
$file = trim(GETPOST('zipfilename_template', 'alpha'));
-$compression = GETPOST('compression');
+$compression = GETPOST('compression', 'aZ09');
$file = dol_sanitizeFileName($file);
$file = preg_replace('/(\.zip|\.tar|\.tgz|\.gz|\.tar\.gz|\.bz2)$/i', '', $file);
diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php
index 60cbadcdd3a..8fc375e376d 100644
--- a/htdocs/admin/user.php
+++ b/htdocs/admin/user.php
@@ -6,6 +6,7 @@
* Copyright (C) 2004 Benoit Mortier
* Copyright (C) 2005-2011 Regis Houssin
* Copyright (C) 2015 Juanjo Menent
+ * Copyright (C) 2020 Frédéric France
*
* 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
@@ -42,6 +43,8 @@ $action = GETPOST('action', 'alpha');
$backtopage = GETPOST('backtopage', 'alpha');
$value = GETPOST('value', 'alpha');
+$label = GETPOST('label', 'alpha');
+$scandir = GETPOST('scandir', 'alpha');
$type = 'user';
diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php
index 48bd82b9326..cd8a718279e 100644
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -157,7 +157,7 @@ print ' ';
// Description
print '';
print ''.$langs->trans("Description").' ';
-print '';
+print ' ';
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
$doleditor = new DolEditor('description', $object->description, '', 200, 'dolibarr_notes', '', false, true, $conf->fckeditor->enabled, ROWS_6, '90%');
$doleditor->Create();
@@ -166,7 +166,7 @@ print ' ';
// Color
print '';
print ''.$langs->trans("Color").' ';
-print '';
+print ' ';
print $formother->selectColor($object->color, 'color');
print ' ';
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 129696a60d9..fcb33bd544a 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -445,8 +445,8 @@ if (empty($reshook) && $action == 'update')
$object->fetch_userassigned();
$object->oldcopy = clone $object;
- $datep = dol_mktime($fulldayevent ? '00' : $aphour, $fulldayevent ? '00' : $apmin, 0, $_POST["apmonth"], $_POST["apday"], $_POST["apyear"]);
- $datef = dol_mktime($fulldayevent ? '23' : $p2hour, $fulldayevent ? '59' : $p2min, $fulldayevent ? '59' : '0', $_POST["p2month"], $_POST["p2day"], $_POST["p2year"]);
+ $datep = dol_mktime($fulldayevent ? '00' : $aphour, $fulldayevent ? '00' : $apmin, 0, GETPOST("apmonth", 'int'), GETPOST("apday", 'int'), GETPOST("apyear", 'int'));
+ $datef = dol_mktime($fulldayevent ? '23' : $p2hour, $fulldayevent ? '59' : $p2min, $fulldayevent ? '59' : '0', GETPOST("p2month", 'int'), GETPOST("p2day", 'int'), GETPOST("p2year", 'int'));
$object->type_id = dol_getIdFromCode($db, GETPOST("actioncode", 'aZ09'), 'c_actioncomm');
$object->label = GETPOST("label", "alphanohtml");
@@ -469,7 +469,6 @@ if (empty($reshook) && $action == 'update')
$object->note_private = trim(GETPOST("note", "none"));
$object->fk_element = GETPOST("fk_element", "int");
$object->elementtype = GETPOST("elementtype", "alphanohtml");
-
if (!$datef && $percentage == 100)
{
$error++; $donotclearsession = 1;
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 3c060ffdc39..7355040e00c 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -983,7 +983,7 @@ class ActionComm extends CommonObject
// Clean parameters
$this->label = trim($this->label);
- $this->note_private = dol_htmlcleanlastbr(trim(empty($this->note_private) ? $this->note : $this->note_private));
+ $this->note_private = dol_htmlcleanlastbr(trim(!isset($this->note_private) ? $this->note : $this->note_private));
if (empty($this->percentage)) $this->percentage = 0;
if (empty($this->priority) || !is_numeric($this->priority)) $this->priority = 0;
if (empty($this->transparency)) $this->transparency = 0;
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index d48c897d6bb..8b1ab0f4ac8 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -269,7 +269,10 @@ if ($object->id > 0)
print '';
print $langs->trans('CustomerCode').' ';
print $object->code_client;
- if ($object->check_codeclient() <> 0) print ' ('.$langs->trans("WrongCustomerCode").') ';
+ $tmpcheck = $object->check_codeclient();
+ if ($tmpcheck != 0 && $tmpcheck != -5) {
+ print ' ('.$langs->trans("WrongCustomerCode").') ';
+ }
print ' ';
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index e3cb5a9ad97..80692c1384d 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -346,7 +346,7 @@ if (empty($reshook))
if (!empty($conf->global->MAILING_DELAY))
{
dol_syslog("Wait a delay of MAILING_DELAY=".$conf->global->MAILING_DELAY);
- sleep($conf->global->MAILING_DELAY);
+ usleep((float) $conf->global->MAILING_DELAY * 1000000);
}
//test if CHECK READ change statut prospect contact
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index d8d9873b88b..8bfa82260b9 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -481,11 +481,27 @@ if ($object->fetch($id) >= 0)
$sql .= " mc.source_url, mc.source_id, mc.source_type, mc.error_text";
$sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
$sql .= " WHERE mc.fk_mailing=".$object->id;
- if ($search_lastname) $sql .= natural_search("mc.lastname", $search_lastname);
- if ($search_firstname) $sql .= natural_search("mc.firstname", $search_firstname);
- if ($search_email) $sql .= natural_search("mc.email", $search_email);
- if ($search_other) $sql .= natural_search("mc.other", $search_other);
- if ($search_dest_status != '' && $search_dest_status >= -1) $sql .= " AND mc.statut=".$db->escape($search_dest_status)." ";
+ $asearchcriteriahasbeenset = 0;
+ if ($search_lastname) {
+ $sql .= natural_search("mc.lastname", $search_lastname);
+ $asearchcriteriahasbeenset++;
+ }
+ if ($search_firstname) {
+ $sql .= natural_search("mc.firstname", $search_firstname);
+ $asearchcriteriahasbeenset++;
+ }
+ if ($search_email) {
+ $sql .= natural_search("mc.email", $search_email);
+ $asearchcriteriahasbeenset++;
+ }
+ if ($search_other) {
+ $sql .= natural_search("mc.other", $search_other);
+ $asearchcriteriahasbeenset++;
+ }
+ if ($search_dest_status != '' && $search_dest_status >= -1) {
+ $sql .= " AND mc.statut=".$db->escape($search_dest_status)." ";
+ $asearchcriteriahasbeenset++;
+ }
$sql .= $db->order($sortfield, $sortorder);
// Count total nb of records
@@ -499,6 +515,18 @@ if ($object->fetch($id) >= 0)
$page = 0;
$offset = 0;
}
+
+ // Fix/update nbemail on emailing record if it differs (may happen if user edit lines from database directly)
+ if (empty($asearchcriteriahasbeenset)) {
+ if ($nbtotalofrecords != $object->email) {
+ dol_syslog("We found a difference in nb of record in target table and the property ->nbemail, we fix ->nbemail");
+ //print "nbemail=".$object->nbemail." nbtotalofrecords=".$nbtotalofrecords;
+ $resultrefresh = $object->refreshNbOfTargets();
+ if ($resultrefresh < 0) {
+ dol_print_error($db, $object->error, $object->errors);
+ }
+ }
+ }
}
//$nbtotalofrecords=$object->nbemail; // nbemail is a denormalized field storing nb of targets
diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php
index 56a115a2fea..75efe1f07b2 100644
--- a/htdocs/comm/mailing/class/mailing.class.php
+++ b/htdocs/comm/mailing/class/mailing.class.php
@@ -461,6 +461,8 @@ class Mailing extends CommonObject
$resql = $this->db->query($sql);
if ($resql)
{
+ $this->refreshNbOfTargets();
+
return 1;
}
else
@@ -532,6 +534,38 @@ class Mailing extends CommonObject
return 0;
}
+ /**
+ * Refresh denormalized value ->nbemail into emailing record
+ * Note: There is also the method update_nb into modules_mailings that is used for this.
+ *
+ * @return int <0 if KO, >0 if OK
+ */
+ public function refreshNbOfTargets()
+ {
+ $sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."mailing_cibles";
+ $sql .= " WHERE fk_mailing = ".$this->id;
+
+ $resql = $this->db->query($sql);
+ if ($resql) {
+ $obj = $this->db->fetch_object($resql);
+ if ($obj) {
+ $nbforupdate = $obj->nb;
+
+ $sql = 'UPDATE '.MAIN_DB_PREFIX.'mailing SET nbemail = '.((int) $nbforupdate);
+ $sql .= ' WHERE rowid = '.$this->id;
+
+ $resqlupdate = $this->db->query($sql);
+ if (! $resqlupdate) {
+ $this->error = $this->db->lasterror();
+ return -1;
+ }
+ }
+ } else {
+ $this->error = $this->db->lasterror();
+ return -1;
+ }
+ return 1;
+ }
/**
* Return a link to the object card (with optionally the picto)
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index c6d6f18e109..9d6b6c201c5 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -602,6 +602,7 @@ class Propal extends CommonObject
// Clean vat code
$vat_src_code = '';
+ $reg = array();
if (preg_match('/\((.*)\)/', $txtva, $reg))
{
$vat_src_code = $reg[1];
@@ -779,7 +780,9 @@ class Propal extends CommonObject
$qty = price2num($qty);
$pu = price2num($pu);
$pu_ht_devise = price2num($pu_ht_devise);
- $txtva = price2num($txtva);
+ if (!preg_match('/\((.*)\)/', $txtva)) {
+ $txtva = price2num($txtva); // $txtva can have format '5.0(XXX)' or '5'
+ }
$txlocaltax1 = price2num($txlocaltax1);
$txlocaltax2 = price2num($txlocaltax2);
$pa_ht = price2num($pa_ht);
@@ -1344,7 +1347,6 @@ class Propal extends CommonObject
// Load source object
$object->fetch($this->id);
- $object->fetch_lines();
$objsoc = new Societe($this->db);
@@ -1738,7 +1740,7 @@ class Propal extends CommonObject
$sql = 'SELECT d.rowid, d.fk_propal, d.fk_parent_line, d.label as custom_label, d.description, d.price, d.vat_src_code, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.localtax1_type, d.localtax2_type, d.qty, d.fk_remise_except, d.remise_percent, d.subprice, d.fk_product,';
$sql .= ' d.info_bits, d.total_ht, d.total_tva, d.total_localtax1, d.total_localtax2, d.total_ttc, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht, d.special_code, d.rang, d.product_type,';
$sql .= ' d.fk_unit,';
- $sql .= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label, p.tobatch as product_batch,';
+ $sql .= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label, p.tobatch as product_tobatch, p.barcode as product_barcode,';
$sql .= ' p.weight, p.weight_units, p.volume, p.volume_units,';
$sql .= ' d.date_start, d.date_end,';
$sql .= ' d.fk_multicurrency, d.multicurrency_code, d.multicurrency_subprice, d.multicurrency_total_ht, d.multicurrency_total_tva, d.multicurrency_total_ttc';
@@ -1800,11 +1802,14 @@ class Propal extends CommonObject
$line->fk_product = $objp->fk_product;
$line->ref = $objp->product_ref; // deprecated
- $line->product_ref = $objp->product_ref;
$line->libelle = $objp->product_label; // deprecated
+
+ $line->product_ref = $objp->product_ref;
$line->product_label = $objp->product_label;
$line->product_desc = $objp->product_desc; // Description produit
$line->product_tobatch = $objp->product_tobatch;
+ $line->product_barcode = $objp->product_barcode;
+
$line->fk_product_type = $objp->fk_product_type; // deprecated
$line->fk_unit = $objp->fk_unit;
$line->weight = $objp->weight;
@@ -3924,6 +3929,18 @@ class PropaleLigne extends CommonObjectLine
*/
public $product_desc;
+ /**
+ * Product use lot
+ * @var string
+ */
+ public $product_tobatch;
+
+ /**
+ * Product barcode
+ * @var string
+ */
+ public $product_barcode;
+
public $localtax1_tx; // Local tax 1
public $localtax2_tx; // Local tax 2
public $localtax1_type; // Local tax 1 type
diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php
index add31f13f08..da3c24f6f01 100644
--- a/htdocs/comm/propal/stats/index.php
+++ b/htdocs/comm/propal/stats/index.php
@@ -37,11 +37,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
$WIDTH = DolGraph::getDefaultGraphSizeForStats('width');
$HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
-$mode = GETPOST("mode") ?GETPOST("mode") : 'customer';
+$mode = GETPOSTISSET("mode") ? GETPOST("mode", 'aZ09') : 'customer';
if ($mode == 'customer' && !$user->rights->propale->lire) accessforbidden();
if ($mode == 'supplier' && !$user->rights->supplier_proposal->lire) accessforbidden();
-$object_status = GETPOST('object_status');
+$object_status = GETPOST('object_status', 'intcomma');
$typent_id = GETPOST('typent_id', 'int');
$categ_id = GETPOST('categ_id', 'categ_id');
@@ -55,7 +55,7 @@ if ($user->socid > 0)
}
$nowyear = strftime("%Y", dol_now());
-$year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear;
+$year = GETPOST('year') > 0 ? GETPOST('year', 'int') : $nowyear;
//$startyear=$year-2;
$startyear = $year - 1;
$endyear = $year;
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index ed1f27e3c82..36f9705aabc 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -460,26 +460,15 @@ if (empty($reshook))
if (!$error)
{
$object_id = $object->create($user);
-
- // If some invoice's lines already known
- $NBLINES = 8;
- for ($i = 1; $i <= $NBLINES; $i++) {
- if ($_POST['idprod'.$i]) {
- $xid = 'idprod'.$i;
- $xqty = 'qty'.$i;
- $xremise = 'remise_percent'.$i;
- $object->add_product($_POST[$xid], $_POST[$xqty], $_POST[$xremise]);
- }
- }
}
}
// Insert default contacts if defined
if ($object_id > 0)
{
- if (GETPOST('contactid'))
+ if (GETPOST('contactid', 'int'))
{
- $result = $object->add_contact(GETPOST('contactid'), 'CUSTOMER', 'external');
+ $result = $object->add_contact(GETPOST('contactid', 'int'), 'CUSTOMER', 'external');
if ($result < 0) {
setEventMessages($langs->trans("ErrorFailedToAddContact"), null, 'errors');
$error++;
@@ -681,8 +670,8 @@ if (empty($reshook))
$tva_tx = '';
}
- $qty = GETPOST('qty'.$predef);
- $remise_percent = (GETPOST('remise_percent'.$predef) != '' ? GETPOST('remise_percent'.$predef) : 0);
+ $qty = price2num(GETPOST('qty'.$predef, 'alpha'));
+ $remise_percent = (GETPOSTISSET('remise_percent'.$predef) ? price2num(GETPOST('remise_percent'.$predef, 'alpha')) : 0);
// Extrafields
$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);
@@ -964,6 +953,7 @@ if (empty($reshook))
if ($result > 0) {
$ret = $object->fetch($object->id); // Reload to get new records
+ $object->fetch_thirdparty();
if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
// Define output language
@@ -1772,7 +1762,7 @@ if ($action == 'create' && $usercancreate)
$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action);
print $hookmanager->resPrint;
if (empty($reshook)) {
- if (!empty($conf->global->THIRDPARTY_PROPAGATE_EXTRAFIELDS_TO_ORDER)) {
+ if (!empty($conf->global->THIRDPARTY_PROPAGATE_EXTRAFIELDS_TO_ORDER) && !empty($soc->id)) {
// copy from thirdparty
$tpExtrafields = new Extrafields($db);
$tpExtrafieldLabels = $tpExtrafields->fetch_name_optionals_label($soc->table_element);
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 07f483da931..49f8005980f 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -2033,7 +2033,7 @@ class Commande extends CommonOrder
$sql .= ' l.total_ht, l.total_ttc, l.total_tva, l.total_localtax1, l.total_localtax2, l.date_start, l.date_end,';
$sql .= ' l.fk_unit,';
$sql .= ' l.fk_multicurrency, l.multicurrency_code, l.multicurrency_subprice, l.multicurrency_total_ht, l.multicurrency_total_tva, l.multicurrency_total_ttc,';
- $sql .= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label, p.tobatch as product_tobatch,';
+ $sql .= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label, p.tobatch as product_tobatch, p.barcode as product_barcode,';
$sql .= ' p.weight, p.weight_units, p.volume, p.volume_units';
$sql .= ' FROM '.MAIN_DB_PREFIX.'commandedet as l';
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON (p.rowid = l.fk_product)';
@@ -2091,11 +2091,14 @@ class Commande extends CommonOrder
$line->fk_parent_line = $objp->fk_parent_line;
$line->ref = $objp->product_ref;
- $line->product_ref = $objp->product_ref;
$line->libelle = $objp->product_label;
+
+ $line->product_ref = $objp->product_ref;
$line->product_label = $objp->product_label;
$line->product_desc = $objp->product_desc;
$line->product_tobatch = $objp->product_tobatch;
+ $line->product_barcode = $objp->product_barcode;
+
$line->fk_product_type = $objp->fk_product_type; // Produit ou service
$line->fk_unit = $objp->fk_unit;
@@ -3117,7 +3120,9 @@ class Commande extends CommonOrder
$pu = price2num($pu);
$pa_ht = price2num($pa_ht);
$pu_ht_devise = price2num($pu_ht_devise);
- $txtva = price2num($txtva);
+ if (!preg_match('/\((.*)\)/', $txtva)) {
+ $txtva = price2num($txtva); // $txtva can have format '5.0(XXX)' or '5'
+ }
$txlocaltax1 = price2num($txlocaltax1);
$txlocaltax2 = price2num($txlocaltax2);
@@ -3132,6 +3137,7 @@ class Commande extends CommonOrder
// Clean vat code
$vat_src_code = '';
+ $reg = array();
if (preg_match('/\((.*)\)/', $txtva, $reg))
{
$vat_src_code = $reg[1];
diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
index 4e7ed481882..d89559af113 100644
--- a/htdocs/commande/stats/index.php
+++ b/htdocs/commande/stats/index.php
@@ -38,11 +38,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
$WIDTH = DolGraph::getDefaultGraphSizeForStats('width');
$HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
-$mode = GETPOST("mode") ?GETPOST("mode") : 'customer';
+$mode = GETPOSTISSET("mode") ? GETPOST("mode", 'aZ09') : 'customer';
if ($mode == 'customer' && !$user->rights->commande->lire) accessforbidden();
if ($mode == 'supplier' && !$user->rights->fournisseur->commande->lire) accessforbidden();
-$object_status = GETPOST('object_status');
+$object_status = GETPOST('object_status', 'intcomma');
$typent_id = GETPOST('typent_id', 'int');
$categ_id = GETPOST('categ_id', 'categ_id');
@@ -308,11 +308,11 @@ if ($mode == 'customer')
Commande::STATUS_CLOSED=>$langs->trans("StatusOrderDelivered"),
Commande::STATUS_CANCELED=>$langs->trans("StatusOrderCanceled")
);
- print $form->selectarray('object_status', $liststatus, GETPOST('object_status', 'int'), -4);
+ print $form->selectarray('object_status', $liststatus, GETPOST('object_status', 'intcomma'), -4);
}
if ($mode == 'supplier')
{
- $formorder->selectSupplierOrderStatus((strstr($object_status, ',') ?-1 : $object_status), 0, 'object_status');
+ $formorder->selectSupplierOrderStatus((strstr($object_status, ',') ? -1 : $object_status), 0, 'object_status');
}
print ' ';
// Year
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 593893878e0..1403ecc66b8 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -907,7 +907,7 @@ else
print ''.$langs->trans("BalanceMinimalDesired").' ';
- print ''.$langs->trans("Web").' ';
diff --git a/htdocs/compta/bank/categ.php b/htdocs/compta/bank/categ.php
index 308dad5dbca..d24b49ce426 100644
--- a/htdocs/compta/bank/categ.php
+++ b/htdocs/compta/bank/categ.php
@@ -135,7 +135,7 @@ if ($result)
}
else
{
- print "".$objp->label." ";
+ print "".$objp->label." ";
print '';
print ''.img_edit().' ';
print ''.img_delete().' ';
diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php
index aec104028c0..348c24acd83 100644
--- a/htdocs/compta/bank/class/paymentvarious.class.php
+++ b/htdocs/compta/bank/class/paymentvarious.class.php
@@ -137,7 +137,7 @@ class PaymentVarious extends CommonObject
$sql .= " datev='".$this->db->idate($this->datev)."',";
$sql .= " sens=".(int) $this->sens.",";
$sql .= " amount=".price2num($this->amount).",";
- $sql .= " fk_typepayment=".(int) $this->fk_typepayment.",";
+ $sql .= " fk_typepayment=".(int) $this->type_payment.",";
$sql .= " num_payment='".$this->db->escape($this->num_payment)."',";
$sql .= " label='".$this->db->escape($this->label)."',";
$sql .= " note='".$this->db->escape($this->note)."',";
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index ddad89e22fc..0e3c80a6ef8 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -392,7 +392,7 @@ if ($action == 'create')
// Subledger account
if (!empty($conf->accounting->enabled))
{
- print ' '.$langs->trans("SubledgerAccount").'aaaa ';
+ print ''.$langs->trans("SubledgerAccount").' ';
print '';
if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
{
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 93ce8bc0f5f..0970aff1b45 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -345,15 +345,6 @@ if (empty($reshook))
}
}
- elseif ($action == 'set_thirdparty' && $usercancreate)
- {
- $object->fetch($id);
- $object->setValueFrom('fk_soc', $socid, '', null, 'int', '', $user, 'BILL_MODIFY');
-
- header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$id);
- exit();
- }
-
elseif ($action == 'classin' && $usercancreate)
{
$object->fetch($id);
@@ -2543,7 +2534,7 @@ if (empty($reshook))
{
$object->fetch($id, '', '', '', true);
- if ($object->statut == Facture::STATUS_VALIDATED
+ if (in_array($object->statut, array(Facture::STATUS_CLOSED, Facture::STATUS_VALIDATED))
&& $object->type == Facture::TYPE_SITUATION
&& $usercancreate
&& !$objectidnext
@@ -3572,7 +3563,7 @@ if ($action == 'create')
$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
if (empty($reshook)) {
- if (!empty($conf->global->THIRDPARTY_PROPAGATE_EXTRAFIELDS_TO_INVOICE)) {
+ if (!empty($conf->global->THIRDPARTY_PROPAGATE_EXTRAFIELDS_TO_INVOICE) && !empty($soc->id)) {
// copy from thirdparty
$tpExtrafields = new Extrafields($db);
$tpExtrafieldLabels = $tpExtrafields->fetch_name_optionals_label($soc->table_element);
@@ -3881,7 +3872,7 @@ elseif ($id > 0 || !empty($ref))
$label = $langs->trans("ConfirmOuting");
$formquestion = array();
// remove situation from cycle
- if ($object->statut == Facture::STATUS_VALIDATED
+ if (in_array($object->statut, array(Facture::STATUS_CLOSED, Facture::STATUS_VALIDATED))
&& $usercancreate
&& !$objectidnext
&& $object->is_last_in_cycle()
@@ -4857,7 +4848,15 @@ elseif ($id > 0 || !empty($ref))
print ' ';
print $paymentstatic->getNomUrl(1);
print ' ';
- print ''.dol_print_date($db->jdate($objp->dp), 'dayhour').' ';
+ print '';
+ $dateofpayment = $db->jdate($objp->dp);
+ $tmparray = dol_getdate($dateofpayment);
+ if ($tmparray['seconds'] == 0 && $tmparray['minutes'] == 0 && ($tmparray['hours'] == 0 || $tmparray['hours'] == 12)) { // We set hours to 0:00 or 12:00 because we don't know it
+ print dol_print_date($dateofpayment, 'day');
+ } else { // Hours was set to real date of payment (special case for POS for example)
+ print dol_print_date($dateofpayment, 'dayhour', 'tzuser');
+ }
+ print ' ';
$label = ($langs->trans("PaymentType".$objp->payment_code) != ("PaymentType".$objp->payment_code)) ? $langs->trans("PaymentType".$objp->payment_code) : $objp->payment_label;
print ''.$label.' '.$objp->num_payment.' ';
if (!empty($conf->banque->enabled))
@@ -5396,7 +5395,7 @@ elseif ($id > 0 || !empty($ref))
}
// Remove situation from cycle
- if ($object->statut > Facture::STATUS_DRAFT
+ if (in_array($object->statut, array(Facture::STATUS_CLOSED, Facture::STATUS_VALIDATED))
&& $object->type == Facture::TYPE_SITUATION
&& $usercancreate
&& !$objectidnext
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index c5bd8a987ac..85ecb3f969d 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -849,7 +849,9 @@ class FactureRec extends CommonInvoice
$qty = price2num($qty);
$pu_ht = price2num($pu_ht);
$pu_ttc = price2num($pu_ttc);
- $txtva = price2num($txtva);
+ if (!preg_match('/\((.*)\)/', $txtva)) {
+ $txtva = price2num($txtva); // $txtva can have format '5.0(XXX)' or '5'
+ }
$txlocaltax1 = price2num($txlocaltax1);
$txlocaltax2 = price2num($txlocaltax2);
if (empty($txtva)) $txtva = 0;
@@ -1031,8 +1033,10 @@ class FactureRec extends CommonInvoice
$pu_ht = price2num($pu_ht);
$pu_ttc = price2num($pu_ttc);
$pu_ht_devise = price2num($pu_ht_devise);
- $txtva = price2num($txtva);
- $txlocaltax1 = price2num($txlocaltax1);
+ if (!preg_match('/\((.*)\)/', $txtva)) {
+ $txtva = price2num($txtva); // $txtva can have format '5.0(XXX)' or '5'
+ }
+ $txlocaltax1 = price2num($txlocaltax1);
$txlocaltax2 = price2num($txlocaltax2);
if (empty($txlocaltax1)) $txlocaltax1 = 0;
if (empty($txlocaltax2)) $txlocaltax2 = 0;
@@ -1059,6 +1063,7 @@ class FactureRec extends CommonInvoice
// Clean vat code
$vat_src_code = '';
+ $reg = array();
if (preg_match('/\((.*)\)/', $txtva, $reg))
{
$vat_src_code = $reg[1];
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 8a2c75037ba..392817b0368 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -3311,7 +3311,9 @@ class Facture extends CommonInvoice
$pu = price2num($pu);
$pu_ht_devise = price2num($pu_ht_devise);
$pa_ht = price2num($pa_ht);
- $txtva = price2num($txtva);
+ if (!preg_match('/\((.*)\)/', $txtva)) {
+ $txtva = price2num($txtva); // $txtva can have format '5.0(XXX)' or '5'
+ }
$txlocaltax1 = price2num($txlocaltax1);
$txlocaltax2 = price2num($txlocaltax2);
@@ -3326,6 +3328,7 @@ class Facture extends CommonInvoice
// Clean vat code
$vat_src_code = '';
+ $reg = array();
if (preg_match('/\((.*)\)/', $txtva, $reg))
{
$vat_src_code = $reg[1];
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index 284186b73ce..49f9be88ac6 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -44,7 +44,7 @@ $mode = GETPOST("mode") ?GETPOST("mode") : 'customer';
if ($mode == 'customer' && !$user->rights->facture->lire) accessforbidden();
if ($mode == 'supplier' && !$user->rights->fournisseur->facture->lire) accessforbidden();
-$object_status = GETPOST('object_status');
+$object_status = GETPOST('object_status', 'intcomma');
$typent_id = GETPOST('typent_id', 'int');
$categ_id = GETPOST('categ_id', 'categ_id');
@@ -59,7 +59,7 @@ if ($user->socid > 0)
}
$nowyear = strftime("%Y", dol_now());
-$year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear;
+$year = GETPOST('year') > 0 ? GETPOST('year', 'int') : $nowyear;
if(!empty($conf->global->INVOICE_STATS_GRAPHS_SHOW_2_YEARS)) $startyear=$year-2;
else $startyear=$year-1;
$endyear = $year;
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 7a759dde543..4583f0376ae 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -1201,7 +1201,16 @@ class Paiement extends CommonObject
$result = '';
$label = ''.$langs->trans("ShowPayment").' '.$langs->trans("Ref").': '.$this->ref;
- if ($this->datepaye ? $this->datepaye : $this->date) $label .= ''.$langs->trans("Date").': '.dol_print_date($this->datepaye ? $this->datepaye : $this->date, 'dayhour');
+ $dateofpayment = ($this->datepaye ? $this->datepaye : $this->date);
+ if ($dateofpayment) {
+ $label .= ''.$langs->trans("Date").': ';
+ $tmparray = dol_getdate($dateofpayment);
+ if ($tmparray['seconds'] == 0 && $tmparray['minutes'] == 0 && ($tmparray['hours'] == 0 || $tmparray['hours'] == 12)) { // We set hours to 0:00 or 12:00 because we don't know it
+ $label .= dol_print_date($dateofpayment, 'day');
+ } else { // Hours was set to real date of payment (special case for POS for example)
+ $label .= dol_print_date($dateofpayment, 'dayhour', 'tzuser');
+ }
+ }
if ($mode == 'withlistofinvoices')
{
$arraybill = $this->getBillsArray();
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 843a894a0fd..295e63c9606 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -76,7 +76,7 @@ $search_no_email = GETPOST("search_no_email", 'int');
if (!empty($conf->socialnetworks->enabled)) {
foreach ($socialnetworks as $key => $value) {
if ($value['active']) {
- $search_{$key} = GETPOST("search_".$key, 'alpha');
+ ${"search_".$key} = GETPOST("search_".$key, 'alpha');
}
}
}
@@ -259,7 +259,7 @@ if (empty($reshook))
if (!empty($conf->socialnetworks->enabled)) {
foreach ($socialnetworks as $key => $value) {
if ($value['active']) {
- $search_{$key} = "";
+ ${"search_".$key} = "";
}
}
}
@@ -363,8 +363,8 @@ if (strlen($search_phone_mobile)) $sql .= natural_search('p.phone_mobile', $se
if (strlen($search_fax)) $sql .= natural_search('p.fax', $search_fax);
if (!empty($conf->socialnetworks->enabled)) {
foreach ($socialnetworks as $key => $value) {
- if ($value['active'] && strlen($search_{$key})) {
- $sql .= ' AND p.socialnetworks LIKE \'%"'.$key.'":"'.$search_{$key}.'%\'';
+ if ($value['active'] && strlen(${"search_".$key})) {
+ $sql .= ' AND p.socialnetworks LIKE \'%"'.$key.'":"'.${"search_".$key}.'%\'';
}
}
}
@@ -674,7 +674,7 @@ if (!empty($conf->socialnetworks->enabled)) {
if (!empty($arrayfields['p.'.$key]['checked']))
{
print '';
- print ' ';
}
}
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 96fcc7f899a..e788640ee30 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -6,7 +6,7 @@
* Copyright (C) 2010-2017 Juanjo Menent
* Copyright (C) 2013 Christophe Battarel
* Copyright (C) 2013-2014 Florian Henry
- * Copyright (C) 2014-2018 Ferran Marcet
+ * Copyright (C) 2014-2020 Ferran Marcet
* Copyright (C) 2014-2016 Marcos García
* Copyright (C) 2015 Jean-François Ferry
* Copyright (C) 2018-2020 Frédéric France
@@ -2110,7 +2110,7 @@ else
// Send
if (empty($user->socid)) {
if ($object->statut == 1) {
- if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->commande->order_advance->send)) {
+ if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->contrat->creer)) {
print '';
} else
print '';
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 31730353ea1..13f0ba644d0 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -1502,11 +1502,10 @@ class Contrat extends CommonObject
$vat_src_code = $reg[1];
$txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
}
-
$txtva = price2num($txtva);
-
$txlocaltax1 = price2num($txlocaltax1);
$txlocaltax2 = price2num($txlocaltax2);
+
$remise_percent = price2num($remise_percent);
$qty = price2num($qty);
if (empty($qty)) $qty = 1;
diff --git a/htdocs/core/boxes/box_birthdays.php b/htdocs/core/boxes/box_birthdays.php
index 17dd29057b3..8d446a10320 100644
--- a/htdocs/core/boxes/box_birthdays.php
+++ b/htdocs/core/boxes/box_birthdays.php
@@ -89,6 +89,7 @@ class box_birthdays extends ModeleBoxes
$sql = "SELECT u.rowid, u.firstname, u.lastname, u.birth";
$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
$sql .= " WHERE u.entity IN (".getEntity('user').")";
+ $sql.= " AND u.statut = 1";
$sql .= dolSqlDateFilter('u.birth', 0, $tmparray['mon'], 0);
$sql .= " ORDER BY u.birth ASC";
$sql .= $this->db->plimit($max, 0);
diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php
index 374e9ab1bae..2ea6bee4e68 100644
--- a/htdocs/core/boxes/box_produits.php
+++ b/htdocs/core/boxes/box_produits.php
@@ -87,6 +87,11 @@ class box_produits extends ModeleBoxes
if ($user->rights->produit->lire || $user->rights->service->lire)
{
$sql = "SELECT p.rowid, p.label, p.ref, p.price, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.fk_price_expression, p.entity";
+ $sql .= ", p.accountancy_code_sell";
+ $sql .= ", p.accountancy_code_sell_intra";
+ $sql .= ", p.accountancy_code_sell_export";
+ $sql .= ", p.accountancy_code_buy";
+ $sql .= ', p.barcode';
$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
$sql .= ' WHERE p.entity IN ('.getEntity($productstatic->element).')';
if (empty($user->rights->produit->lire)) $sql .= ' AND p.fk_product_type != 0';
@@ -133,6 +138,13 @@ class box_produits extends ModeleBoxes
$productstatic->type = $objp->fk_product_type;
$productstatic->label = $objp->label;
$productstatic->entity = $objp->entity;
+ $productstatic->status = $objp->tosell;
+ $productstatic->status_buy = $objp->tobuy;
+ $productstatic->barcode = $objp->barcode;
+ $productstatic->accountancy_code_sell = $objp->accountancy_code_sell;
+ $productstatic->accountancy_code_sell_intra = $objp->accountancy_code_sell_intra;
+ $productstatic->accountancy_code_sell_export = $objp->accountancy_code_sell_export;
+ $productstatic->accountancy_code_buy = $objp->accountancy_code_buy;
$this->info_box_contents[$line][] = array(
'td' => 'class="tdoverflowmax100 maxwidth100onsmartphone"',
diff --git a/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php b/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
index 86a2b7b3086..6c3b906cb0f 100644
--- a/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
+++ b/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
@@ -96,7 +96,7 @@ class box_supplier_orders_awaiting_reception extends ModeleBoxes
if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql .= " WHERE c.fk_soc = s.rowid";
$sql .= " AND c.entity IN (".getEntity('supplier_order').")";
- $sql .= " AND c.fk_statut = ".CommandeFournisseur::STATUS_ORDERSENT;
+ $sql .= " AND c.fk_statut IN (".CommandeFournisseur::STATUS_ORDERSENT.", ".CommandeFournisseur::STATUS_RECEIVED_PARTIALLY.")";
if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY c.date_commande DESC, c.ref DESC ";
diff --git a/htdocs/core/boxes/box_task.php b/htdocs/core/boxes/box_task.php
index 4239e6f1b28..b9c40a9098c 100644
--- a/htdocs/core/boxes/box_task.php
+++ b/htdocs/core/boxes/box_task.php
@@ -139,7 +139,7 @@ class box_task extends ModeleBoxes
$boxcontent .= '';
}
$this->info_box_contents[0][] = array(
- 'tr'=>'class="nohover showiffilter'.$this->boxcode.' hideobject"',
+ 'tr' => 'class="nohover showiffilter'.$this->boxcode.' hideobject"',
'td' => 'class="nohover"',
'textnoformat' => $boxcontent,
);
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 544cc105416..aa8cb7a1301 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -529,10 +529,13 @@ abstract class CommonDocGenerator
$resarray = array(
'line_pos' => $linenumber,
'line_fulldesc'=>doc_getlinedesc($line, $outputlangs),
- 'line_product_ref'=>$line->product_ref,
- 'line_product_ref_fourn'=>$line->ref_fourn, // for supplier doc lines
- 'line_product_label'=>$line->product_label,
- 'line_product_type'=>$line->product_type,
+
+ '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_desc'=>$line->desc,
'line_vatrate'=>vatrate($line->tva_tx, true, $line->info_bits),
'line_localtax1_rate'=>vatrate($line->localtax1_tx),
@@ -687,8 +690,14 @@ abstract class CommonDocGenerator
$array_shipment = $this->fill_substitutionarray_with_extrafields($object, $array_shipment, $extrafields, $array_key, $outputlangs);
}
- return $array_shipment;
- }
+ // Add infor from $object->xxx where xxx has been loaded by fetch_origin() of shipment
+ if (!empty($object->commande) && is_object($object->commande)) {
+ $array_shipment['order_ref'] = $object->commande->ref;
+ $array_shipment['order_ref_customer'] = $object->commande->ref_customer;
+ }
+
+ return $array_shipment;
+ }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -1344,7 +1353,7 @@ abstract class CommonDocGenerator
if ($itemsInRow > 0) {
// close table row and empty cols
for ($i = $itemsInRow; $i <= $maxItemsInRow; $i++) {
- $html .= " '."\n";
@@ -6247,6 +6241,12 @@ class Form
}
$out .= ' '."\n";
+
+ if (!$forcecombo)
+ {
+ include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+ $out .= ajax_combobox($htmlname, null, $conf->global->$confkeyforautocompletemode);
+ }
}
else
{
diff --git a/htdocs/core/class/html.formorder.class.php b/htdocs/core/class/html.formorder.class.php
index d3dbe27ceac..32fd279b8e1 100644
--- a/htdocs/core/class/html.formorder.class.php
+++ b/htdocs/core/class/html.formorder.class.php
@@ -62,7 +62,10 @@ class FormOrder extends Form
$options[$value] = $tmpsupplierorder->getLibStatut($short);
}
- print Form::selectarray($hmlname, $options, $selected, 1);
+ if (is_array($selected)) $selectedarray = $selected;
+ else $selectedarray = explode(',', $selected);
+
+ print Form::multiselectarray($hmlname, $options, $selectedarray, 0);
}
/**
diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php
index 4199e51cb68..3f542f845b9 100644
--- a/htdocs/core/class/interfaces.class.php
+++ b/htdocs/core/class/interfaces.class.php
@@ -212,7 +212,7 @@ class Interfaces
if ($result < 0)
{
// Action KO
- //dol_syslog("Error in trigger ".$action." - Nb of error string returned = ".count($objMod->errors), LOG_ERR);
+ //dol_syslog("Error in trigger ".$action." - result = ".$result." - Nb of error strings returned = ".count($objMod->errors), LOG_ERR);
$nbtotal++;
$nbko++;
if (!empty($objMod->errors)) $this->errors = array_merge($this->errors, $objMod->errors);
diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index 837946ce706..8f2a9dc315e 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -89,7 +89,7 @@ abstract class DoliDB implements Database
*/
public function idate($param)
{
- // TODO GMT $param should be gmt, so we should add tzouptut to 'gmt'
+ // TODO $param should be gmt, so we should add tzouptut to 'gmt' instead of default 'tzserver'
return dol_print_date($param, "%Y-%m-%d %H:%M:%S");
}
@@ -285,7 +285,7 @@ abstract class DoliDB implements Database
*/
public function jdate($string, $gm = false)
{
- // TODO GMT must set param gm to true by default
+ // TODO $string should be converted into a GMT timestamp, so param gm should be set to true by default instead of false
if ($string == 0 || $string == "0000-00-00 00:00:00") return '';
$string = preg_replace('/([^0-9])/i', '', $string);
$tmp = $string.'000000';
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 7b3d66f9003..8fddc46cca3 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -1380,9 +1380,14 @@ function complete_elementList_with_modules(&$elementList)
$dirmod[$i] = $dir;
//print "x".$modName." ".$orders[$i]."\n'.$langs->trans("Status").' ';
$liststatus = $tmpexpensereport->statuts;
-print $form->selectarray('object_status', $liststatus, GETPOST('object_status', 'int'), -4, 0, 0, '', 1);
+print $form->selectarray('object_status', $liststatus, GETPOST('object_status', 'intcomma'), -4, 0, 0, '', 1);
print ' ';
diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index 978a3059ace..6b939dca247 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -102,6 +102,7 @@ class Export
// Search module files
while (($file = readdir($handle)) !== false)
{
+ $reg = array();
if (is_readable($dir.$file) && preg_match("/^(mod.*)\.class\.php$/i", $file, $reg))
{
$modulename = $reg[1];
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index 6543747d1f7..541c43f1149 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -39,6 +39,7 @@ $langs->loadlangs(array('admin', 'exports', 'other', 'users', 'companies', 'proj
//if (! $user->admin)
// accessforbidden();
+// Map icons, array duplicated in import.php, was not synchronized, TODO put it somewhere only once
$entitytoicon = array(
'invoice' => 'bill',
'invoice_line' => 'bill',
@@ -54,13 +55,13 @@ $entitytoicon = array(
'payment' => 'payment',
'tax' => 'generic',
'tax_type' => 'generic',
- 'stock' => 'generic',
'other' => 'generic',
'account' => 'account',
'product' => 'product',
'virtualproduct'=>'product',
'subproduct' => 'product',
'product_supplier_ref' => 'product',
+ 'stock' => 'stock',
'warehouse' => 'stock',
'batch' => 'stock',
'stockbatch' => 'stock',
@@ -78,7 +79,7 @@ $entitytoicon = array(
'bomline' => 'bom'
);
-// Translation code
+// Translation code, array duplicated in import.php, was not synchronized, TODO put it somewhere only once
$entitytolang = array(
'user' => 'User',
'company' => 'Company',
@@ -459,15 +460,14 @@ if ($step == 1 || !$datatoexport)
$sortedarrayofmodules = dol_sort_array($objexport->array_export_module, 'module_position', 'asc', 0, 0, 1);
foreach ($sortedarrayofmodules as $key => $value)
{
+ //var_dump($objexport->array_import_code[$key]);
print ' ';
- //print img_object($objexport->array_export_module[$key]->getName(),$export->array_export_module[$key]->picto).' ';
- print $objexport->array_export_module[$key]->getName();
+ print $objexport->array_export_module[$key]->getName();
print ' ';
- $icon = preg_replace('/:.*$/', '', $objexport->array_export_icon[$key]);
- $label = $objexport->array_export_label[$key];
- //print $value.'-'.$icon.'-'.$label." ';
if ($objexport->array_export_perms[$key])
{
@@ -522,11 +522,10 @@ if ($step == 2 && $datatoexport)
// Lot de donnees a exporter
print ' '.$langs->trans("DatasetToExport").' ';
print '';
- $icon = preg_replace('/:.*$/', '', $objexport->array_export_icon[0]);
- $label = $objexport->array_export_label[0];
- //print $value.'-'.$icon.'-'.$label."
';
@@ -728,11 +727,10 @@ if ($step == 3 && $datatoexport)
// Lot de donnees a exporter
print '