';
foreach ($object->fields as $key => $val)
{
- $cssforfield = '';
- if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
- if (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
- if ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
- if (!empty($arrayfields['t.'.$key]['checked'])) print ' | ';
+ $cssforfield = (empty($val['css']) ? '' : $val['css']);
+ if ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
+ elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
+ elseif (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+ elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') $cssforfield .= ($cssforfield ? ' ' : '').'right';
+ if (!empty($arrayfields['t.'.$key]['checked']))
+ {
+ print '';
+ if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
+ elseif (strpos($val['type'], 'integer:') === 0) {
+ print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
+ } elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '';
+ print ' | ';
+ }
}
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
@@ -389,11 +420,12 @@ print ''."\n";
print '';
foreach ($object->fields as $key => $val)
{
- $cssforfield = '';
- if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
- if (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
- if ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
- if (!empty($arrayfields['t.'.$key]['checked']))
+ $cssforfield = (empty($val['css']) ? '' : $val['css']);
+ if ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
+ elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
+ elseif (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+ elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') $cssforfield .= ($cssforfield ? ' ' : '').'right';
+ if (!empty($arrayfields['t.'.$key]['checked']))
{
print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
}
@@ -404,6 +436,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
+// Action column
print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
print '
'."\n";
@@ -423,52 +456,46 @@ if (is_array($extrafields->attributes[$object->table_element]['computed']) && co
// --------------------------------------------------------------------
$i = 0;
$totalarray = array();
-while ($i < min($num, $limit))
+while ($i < ($limit ? min($num, $limit) : $num))
{
$obj = $db->fetch_object($resql);
if (empty($obj)) break; // Should not happen
// Store properties in $object
- $object->id = $obj->rowid;
- foreach ($object->fields as $key => $val)
- {
- if (property_exists($obj, $key)) $object->$key = $obj->$key;
- }
+ $object->setVarsFromFetchObj($obj);
// Show here line of result
print '';
foreach ($object->fields as $key => $val)
{
- $cssforfield = '';
- if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
+ $cssforfield = (empty($val['css']) ? '' : $val['css']);
+ if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
elseif ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
if (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
elseif ($key == 'ref') $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+ if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status'))) $cssforfield .= ($cssforfield ? ' ' : '').'right';
+ //if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
+
if (!empty($arrayfields['t.'.$key]['checked']))
{
- print '';
- print $object->showOutputField($val, $key, $obj->$key, '');
- print '';
- if (!$i) $totalarray['nbfield']++;
- if (!empty($val['isameasure']))
- {
- if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
- $totalarray['val']['t.'.$key] += $obj->$key;
- }
+ print '';
+ if ($key == 'status') print $object->getLibStatut(5);
+ else print $object->showOutputField($val, $key, $object->$key, '');
+ print '';
+ if (!$i) $totalarray['nbfield']++;
+ if (!empty($val['isameasure']))
+ {
+ if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
+ $totalarray['val']['t.'.$key] += $object->$key;
+ }
}
}
// 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, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Action column
@@ -476,13 +503,13 @@ while ($i < min($num, $limit))
if ($massactionbutton || $massaction) // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
{
$selected = 0;
- if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
- print '';
+ if (in_array($object->id, $arrayofselected)) $selected = 1;
+ print '';
}
print '';
if (!$i) $totalarray['nbfield']++;
- print '
';
+ print ''."\n";
$i++;
}
@@ -524,8 +551,8 @@ if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $n
$urlsource .= str_replace('&', '&', $param);
$filedir = $diroutputmassaction;
- $genallowed = $user->rights->emailcollector->read;
- $delallowed = $user->rights->emailcollector->create;
+ $genallowed = $permissiontoread;
+ $delallowed = $permissiontoadd;
print $formfile->showdocuments('massfilesarea_emailcollector', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index f6a5c172c0a..1404578d59a 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -7735,7 +7735,7 @@ function dol_getmypid()
* If param $mode is 2, can contains a list of int id separated by comma like "1,3,4"
* If param $mode is 3, can contains a list of string separated by comma like "a,b,c"
* @param integer $mode 0=value is list of keyword strings, 1=value is a numeric test (Example ">5.5 <10"), 2=value is a list of ID separated with comma (Example '1,3,4')
- * 3=value is list of string separated with comma (Example 'text 1,text 2'), 4=value is a list of ID separated with comma (Example '1,3,4') for search into a multiselect string ('1,2')
+ * 3=value is list of string separated with comma (Example 'text 1,text 2'), 4=value is a list of ID separated with comma (Example '2,7') to be used to search into a multiselect string '1,2,3,4'
* @param integer $nofirstand 1=Do not output the first 'AND'
* @return string $res The statement to append to the SQL query
*/
@@ -7760,22 +7760,22 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
$res = '';
if (!is_array($fields)) $fields = array($fields);
- $nboffields = count($fields);
- $end2 = count($crits);
$j = 0;
foreach ($crits as $crit)
{
+
$i = 0; $i2 = 0;
$newres = '';
foreach ($fields as $field)
{
+ $crit = trim($crit);
if ($mode == 1)
{
$operator = '=';
- $newcrit = preg_replace('/([<>=]+)/', '', trim($crit));
+ $newcrit = preg_replace('/([<>=]+)/', '', $crit);
$reg = array();
- preg_match('/([<>=]+)/', trim($crit), $reg);
+ preg_match('/([<>=]+)/', $crit, $reg);
if ($reg[1])
{
$operator = $reg[1];
@@ -7785,7 +7785,7 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
$numnewcrit = price2num($newcrit);
if (is_numeric($numnewcrit))
{
- $newres .= ($i2 > 0 ? ' OR ' : '').$field.' '.$operator.' '.$numnewcrit;
+ $newres .= ($i2 > 0 ? ' OR ' : '').$field.' '.$operator.' '.$db->sanitize($numnewcrit); // should be a numeric
} else {
$newres .= ($i2 > 0 ? ' OR ' : '').'1 = 2'; // force false
}
@@ -7793,41 +7793,45 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
}
} elseif ($mode == 2 || $mode == -2)
{
- $newres .= ($i2 > 0 ? ' OR ' : '').$field." ".($mode == -2 ? 'NOT ' : '')."IN (".$db->escape(trim($crit)).")";
+ $crit = preg_replace('/[^0-9,]/', '', $crit); // ID are always integer
+ $newres .= ($i2 > 0 ? ' OR ' : '').$field." ".($mode == -2 ? 'NOT ' : '');
+ $newres .= $crit ? "IN (".$db->sanitize($db->escape($crit)).")" : "IN (0)";
if ($mode == -2) $newres .= ' OR '.$field.' IS NULL';
$i2++; // a criteria was added to string
} elseif ($mode == 3 || $mode == -3)
{
- $tmparray = explode(',', trim($crit));
+ $tmparray = explode(',', $crit);
if (count($tmparray))
{
$listofcodes = '';
foreach ($tmparray as $val)
{
+ $val = trim($val);
if ($val)
{
$listofcodes .= ($listofcodes ? ',' : '');
- $listofcodes .= "'".$db->escape(trim($val))."'";
+ $listofcodes .= "'".$db->escape($val)."'";
}
}
- $newres .= ($i2 > 0 ? ' OR ' : '').$field." ".($mode == -3 ? 'NOT ' : '')."IN (".$listofcodes.")";
+ $newres .= ($i2 > 0 ? ' OR ' : '').$field." ".($mode == -3 ? 'NOT ' : '')."IN (".$db->sanitize($listofcodes).")";
$i2++; // a criteria was added to string
}
if ($mode == -3) $newres .= ' OR '.$field.' IS NULL';
} elseif ($mode == 4)
{
- $tmparray = explode(',', trim($crit));
+ $tmparray = explode(',', $crit);
if (count($tmparray))
{
$listofcodes = '';
foreach ($tmparray as $val)
{
+ $val = trim($val);
if ($val)
{
- $newres .= ($i2 > 0 ? ' OR (' : '(').$field.' LIKE \''.$db->escape(trim($val)).',%\'';
- $newres .= ' OR '.$field.' = \''.$db->escape(trim($val)).'\'';
- $newres .= ' OR '.$field.' LIKE \'%,'.$db->escape(trim($val)).'\'';
- $newres .= ' OR '.$field.' LIKE \'%,'.$db->escape(trim($val)).',%\'';
+ $newres .= ($i2 > 0 ? ' OR (' : '(').$field.' LIKE \''.$db->escape($val).',%\'';
+ $newres .= ' OR '.$field.' = \''.$db->escape($val).'\'';
+ $newres .= ' OR '.$field.' LIKE \'%,'.$db->escape($val).'\'';
+ $newres .= ' OR '.$field.' LIKE \'%,'.$db->escape($val).',%\'';
$newres .= ')';
$i2++;
}
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index f0703d6b83f..66e94d461a4 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -166,11 +166,11 @@ $arrayfields = array(
'country.code_iso'=>array('label'=>$langs->trans("Country"), 'checked'=>0),
'typent.code'=>array('label'=>$langs->trans("ThirdPartyType"), 'checked'=>$checkedtypetiers),
'f.fk_mode_reglement'=>array('label'=>$langs->trans("PaymentMode"), 'checked'=>1),
- 'f.total_ht'=>array('label'=>$langs->trans("AmountHT"), 'checked'=>1),
- 'f.total_vat'=>array('label'=>$langs->trans("AmountVAT"), 'checked'=>0),
- 'f.total_localtax1'=>array('label'=>$langs->transcountry("AmountLT1", $mysoc->country_code), 'checked'=>0, 'enabled'=>$mysoc->localtax1_assuj == "1"),
- 'f.total_localtax2'=>array('label'=>$langs->transcountry("AmountLT2", $mysoc->country_code), 'checked'=>0, 'enabled'=>$mysoc->localtax2_assuj == "1"),
- 'f.total_ttc'=>array('label'=>$langs->trans("AmountTTC"), 'checked'=>0),
+ 'f.total_ht'=>array('label'=>$langs->trans("AmountHT"), 'checked'=>1, 'position'=>105),
+ 'f.total_vat'=>array('label'=>$langs->trans("AmountVAT"), 'checked'=>0, 'position'=>110),
+ 'f.total_localtax1'=>array('label'=>$langs->transcountry("AmountLT1", $mysoc->country_code), 'checked'=>0, 'enabled'=>$mysoc->localtax1_assuj == "1", 'position'=>95),
+ 'f.total_localtax2'=>array('label'=>$langs->transcountry("AmountLT2", $mysoc->country_code), 'checked'=>0, 'enabled'=>$mysoc->localtax2_assuj == "1", 'position'=>100),
+ 'f.total_ttc'=>array('label'=>$langs->trans("AmountTTC"), 'checked'=>0, 'position'=>115),
'u.login'=>array('label'=>"Author", 'checked'=>1),
'dynamount_payed'=>array('label'=>$langs->trans("Payed"), 'checked'=>0),
'rtp'=>array('label'=>$langs->trans("Rest"), 'checked'=>0),
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index f28c6953d82..a8b2caa59c1 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -777,7 +777,7 @@ class Societe extends CommonObject
* $this->code_client = -1 and $this->code_fournisseur = -1 means automatic assignement.
*
* @param User $user Object of user that ask creation
- * @return int >= 0 if OK, < 0 if KO
+ * @return int >=0 if OK, <0 if KO
*/
public function create(User $user)
{
@@ -969,7 +969,10 @@ class Societe extends CommonObject
} elseif ($rescode == -4)
{
$this->errors[] = 'ErrorPrefixRequired';
+ } else {
+ $this->errors[] = 'ErrorUnknownOnCustomerCodeCheck';
}
+
$result = -3;
}
}
@@ -988,9 +991,11 @@ class Societe extends CommonObject
} elseif ($rescode == -3)
{
$this->errors[] = 'ErrorSupplierCodeAlreadyUsed';
- } elseif ($rescode == -5)
+ } elseif ($rescode == -4)
{
$this->errors[] = 'ErrorPrefixRequired';
+ } else {
+ $this->errors[] = 'ErrorUnknownOnSupplierCodeCheck';
}
$result = -3;
}
@@ -2989,6 +2994,10 @@ class Societe extends CommonObject
dol_syslog(get_class($this)."::check_codeclient code_client=".$this->code_client." module=".$module);
$result = $mod->verif($this->db, $this->code_client, $this, 0);
+ if ($result) { // If error
+ $this->error = $mod->error;
+ $this->errors = $mod->errors;
+ }
return $result;
} else {
return 0;
@@ -3024,6 +3033,10 @@ class Societe extends CommonObject
dol_syslog(get_class($this)."::check_codefournisseur code_fournisseur=".$this->code_fournisseur." module=".$module);
$result = $mod->verif($this->db, $this->code_fournisseur, $this, 1);
+ if ($result) { // If error
+ $this->error = $mod->error;
+ $this->errors = $mod->errors;
+ }
return $result;
} else {
return 0;