'.$langs->trans("Status").' ';
print $form->selectarray('status', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), $object->status);
diff --git a/htdocs/adherents/type_translation.php b/htdocs/adherents/type_translation.php
index e661bde6ea7..f2c3b785160 100644
--- a/htdocs/adherents/type_translation.php
+++ b/htdocs/adherents/type_translation.php
@@ -37,6 +37,7 @@ $langs->loadLangs(array('members', 'languages'));
$id = GETPOST('rowid', 'int');
$action = GETPOST('action', 'aZ09');
$cancel = GETPOST('cancel', 'alpha');
+$ref = GETPOST('ref', 'alphanohtml');
// Security check
$fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : ''));
@@ -67,15 +68,17 @@ if ($action == 'vadd' && $cancel != $langs->trans("Cancel") && $user->rights->ad
$object->fetch($id);
$current_lang = $langs->getDefaultLang();
+ $forcelangprod = GETPOST("forcelangprod", 'aZ09');
+
// update of object
- if ($_POST["forcelangprod"] == $current_lang) {
- $object->label = $_POST["libelle"];
- $object->description = dol_htmlcleanlastbr($_POST["desc"]);
- $object->other = dol_htmlcleanlastbr($_POST["other"]);
+ if ($forcelangprod == $current_lang) {
+ $object->label = GETPOST("libelle", 'alphanohtml');
+ $object->description = dol_htmlcleanlastbr(GETPOST("desc", 'restricthtml'));
+ $object->other = dol_htmlcleanlastbr(GETPOST("other", 'restricthtml'));
} else {
- $object->multilangs[$_POST["forcelangprod"]]["label"] = $_POST["libelle"];
- $object->multilangs[$_POST["forcelangprod"]]["description"] = dol_htmlcleanlastbr($_POST["desc"]);
- $object->multilangs[$_POST["forcelangprod"]]["other"] = dol_htmlcleanlastbr($_POST["other"]);
+ $object->multilangs[$forcelangprod]["label"] = GETPOST("libelle", 'alphanohtml');
+ $object->multilangs[$forcelangprod]["description"] = dol_htmlcleanlastbr(GETPOST("desc", 'restricthtml'));
+ $object->multilangs[$forcelangprod]["other"] = dol_htmlcleanlastbr(GETPOST("other", 'restricthtml'));
}
// backup into database
@@ -95,13 +98,13 @@ if ($action == 'vedit' && $cancel != $langs->trans("Cancel") && $user->rights->a
foreach ($object->multilangs as $key => $value) { // saving new values in the object
if ($key == $current_lang) {
- $object->label = $_POST["libelle-".$key];
- $object->description = dol_htmlcleanlastbr($_POST["desc-".$key]);
- $object->other = dol_htmlcleanlastbr($_POST["other-".$key]);
+ $object->label = GETPOST("libelle-".$key, 'alphanohtml');
+ $object->description = dol_htmlcleanlastbr(GETPOST("desc-".$key, 'restricthtml'));
+ $object->other = dol_htmlcleanlastbr(GETPOST("other-".$key, 'restricthtml'));
} else {
- $object->multilangs[$key]["label"] = $_POST["libelle-".$key];
- $object->multilangs[$key]["description"] = dol_htmlcleanlastbr($_POST["desc-".$key]);
- $object->multilangs[$key]["other"] = dol_htmlcleanlastbr($_POST["other-".$key]);
+ $object->multilangs[$key]["label"] = GETPOST("libelle-".$key, 'alphanohtml');
+ $object->multilangs[$key]["description"] = dol_htmlcleanlastbr(GETPOST("desc-".$key, 'restricthtml'));
+ $object->multilangs[$key]["other"] = dol_htmlcleanlastbr(GETPOST("other-".$key, 'restricthtml'));
}
}
@@ -205,7 +208,7 @@ if ($action == 'edit') {
print '
';
print '';
- print ''.$langs->trans('Label').' '.$langs->trans('Label').' '.$langs->trans('Description').' ';
$doleditor = new DolEditor("desc-$key", $object->multilangs[$key]["description"], '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_3, '90%');
$doleditor->Create();
@@ -264,7 +267,7 @@ if ($action == 'add' && $user->rights->adherent->configurer) {
print ' '.$langs->trans('Language').' ';
print $formadmin->select_language('', 'forcelangprod', 0, $object->multilangs, 1);
print ' '.$langs->trans('Label').' '.$langs->trans('Label').' '.$langs->trans('Description').' ';
$doleditor = new DolEditor('desc', '', '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_3, '90%');
$doleditor->Create();
diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 2ffbf15d7ce..c1f77f4995e 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -292,7 +292,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
print $form->textwithpicto('', $htmltooltip, 1, 0);
print ' ';
print '';
- print ''.img_object($langs->trans("Preview"), 'order').' ';
+ print ''.img_object($langs->trans("Preview"), 'pdf').' ';
print ' ';
print "';
if ($module->type == 'pdf') {
- print ''.img_object($langs->trans("Preview"), 'bill').' ';
+ print ''.img_object($langs->trans("Preview"), 'pdf').' ';
} else {
print img_object($langs->trans("PreviewNotAvailable"), 'generic');
}
diff --git a/htdocs/admin/bom.php b/htdocs/admin/bom.php
index db3bc348716..34c3af89c53 100644
--- a/htdocs/admin/bom.php
+++ b/htdocs/admin/bom.php
@@ -232,8 +232,10 @@ foreach ($dirmodels as $reldir)
// Show example of numbering model
print ' ';
$tmp = $module->getExample();
- if (preg_match('/^Error/', $tmp)) print ''.$langs->trans($tmp).'
';
- elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+ if (preg_match('/^Error/', $tmp)) {
+ $langs->load("errors");
+ print ''.$langs->trans($tmp).'
';
+ } elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
else print $tmp;
print ' '."\n";
@@ -412,7 +414,7 @@ foreach ($dirmodels as $reldir)
print '';
if ($module->type == 'pdf')
{
- print ''.img_object($langs->trans("Preview"), 'bill').' ';
+ print ''.img_object($langs->trans("Preview"), 'pdf').' ';
} else {
print img_object($langs->trans("PreviewNotAvailable"), 'generic');
}
diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index 19450905c23..4fc1ad28da7 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -54,19 +54,18 @@ if ($action == 'addconst')
if ($action == 'add') {
$error = 0;
+ $boxids = GETPOST('boxid', 'array');
+
$db->begin();
- if (isset($_POST['boxid']) && is_array($_POST['boxid']))
- {
- foreach ($_POST['boxid'] as $boxid)
- {
+ if (is_array($boxids)) {
+ foreach ($boxids as $boxid) {
if (is_numeric($boxid['pos']) && $boxid['pos'] >= 0) // 0=Home, 1=...
{
$pos = $boxid['pos'];
// Initialize distinct fk_user with all already existing values of fk_user (user that use a personalized view of boxes for page "pos")
$distinctfkuser = array();
- if (!$error)
- {
+ if (!$error) {
$sql = "SELECT fk_user";
$sql .= " FROM ".MAIN_DB_PREFIX."user_param";
$sql .= " WHERE param = 'MAIN_BOXES_".$db->escape($pos)."' AND value = '1'";
@@ -146,7 +145,7 @@ if ($action == 'add') {
if ($action == 'delete')
{
$sql = "SELECT box_id FROM ".MAIN_DB_PREFIX."boxes";
- $sql .= " WHERE rowid=".$rowid;
+ $sql .= " WHERE rowid=".((int) $rowid);
$resql = $db->query($sql);
$obj = $db->fetch_object($resql);
diff --git a/htdocs/admin/chequereceipts.php b/htdocs/admin/chequereceipts.php
index 4fee30d274e..8c2acb5dc8b 100644
--- a/htdocs/admin/chequereceipts.php
+++ b/htdocs/admin/chequereceipts.php
@@ -168,8 +168,10 @@ foreach ($dirmodels as $reldir)
// Show example of numbering module
print ' ';
$tmp = $module->getExample();
- if (preg_match('/^Error/', $tmp)) print ''.$langs->trans($tmp).'
';
- elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+ if (preg_match('/^Error/', $tmp)) {
+ $langs->load("errors");
+ print ''.$langs->trans($tmp).'
';
+ } elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
else print $tmp;
print ' '."\n";
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 594052500ca..25a220e8e2d 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -297,8 +297,10 @@ foreach ($dirmodels as $reldir)
// Show example of numbering model
print '';
$tmp = $module->getExample();
- if (preg_match('/^Error/', $tmp)) print ''.$langs->trans($tmp).'
';
- elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+ if (preg_match('/^Error/', $tmp)) {
+ $langs->load("errors");
+ print ''.$langs->trans($tmp).'
';
+ } elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
else print $tmp;
print ' '."\n";
@@ -482,7 +484,7 @@ foreach ($dirmodels as $reldir)
print '';
if ($module->type == 'pdf')
{
- print ''.img_object($langs->trans("Preview"), 'bill').' ';
+ print ''.img_object($langs->trans("Preview"), 'pdf').' ';
} else {
print img_object($langs->trans("PreviewNotAvailable"), 'generic');
}
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 8b900f552c8..75dcb9b179f 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -406,11 +406,12 @@ print ' '.$langs->trans("CompanyAddress").' ';
print ' '."\n";
+// Zip
print ''.$langs->trans("CompanyZip").' ';
-print ' '.$langs->trans("CompanyTown").' ';
-print ' '.$langs->trans("Country").' ';
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index bfdff79cc1f..b5e4c0ddf45 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -229,7 +229,11 @@ foreach ($dirmodels as $reldir)
// Show example of numbering model
print ' ';
$tmp = $module->getExample();
- if (preg_match('/^Error/', $tmp)) { $langs->load("errors"); print ''.$langs->trans($tmp).'
'; } elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+ if (preg_match('/^Error/', $tmp)) {
+ $langs->load("errors");
+ print ''.$langs->trans($tmp).'
';
+ }
+ elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
else print $tmp;
print ' '."\n";
@@ -410,7 +414,7 @@ foreach ($dirmodels as $reldir)
print '';
if ($module->type == 'pdf')
{
- print ''.img_object($langs->trans("Preview"), 'contract').' ';
+ print ''.img_object($langs->trans("Preview"), 'pdf').' ';
} else {
print img_object($langs->trans("PreviewNotAvailable"), 'generic');
}
diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index 5ff7f022ba4..d605f75c511 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -188,7 +188,7 @@ if ($action == 'update')
if (!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $plus = '_PERCENTAGE';
// Update values
for ($i = 0; $i < 4; $i++) {
- if (isset($_POST['MAIN_METEO'.$plus.'_LEVEL'.$i])) dolibarr_set_const($db, 'MAIN_METEO'.$plus.'_LEVEL'.$i, GETPOST('MAIN_METEO'.$plus.'_LEVEL'.$i, 'int'), 'chaine', 0, '', $conf->entity);
+ if (GETPOSTISSET('MAIN_METEO'.$plus.'_LEVEL'.$i)) dolibarr_set_const($db, 'MAIN_METEO'.$plus.'_LEVEL'.$i, GETPOST('MAIN_METEO'.$plus.'_LEVEL'.$i, 'int'), 'chaine', 0, '', $conf->entity);
}
}
diff --git a/htdocs/admin/delivery.php b/htdocs/admin/delivery.php
index d9c1b2ebe17..b1606268205 100644
--- a/htdocs/admin/delivery.php
+++ b/htdocs/admin/delivery.php
@@ -229,7 +229,8 @@ foreach ($dirmodels as $reldir)
print ' ';
$tmp = $module->getExample();
if (preg_match('/^Error/', $tmp)) {
- $langs->load("errors"); print ''.$langs->trans($tmp).'
';
+ $langs->load("errors");
+ print ''.$langs->trans($tmp).'
';
} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
else print $tmp;
print ' '."\n";
@@ -397,7 +398,7 @@ foreach ($dirmodels as $reldir)
print '';
if ($module->type == 'pdf')
{
- print ''.img_object($langs->trans("Preview"), 'sending').' ';
+ print ''.img_object($langs->trans("Preview"), 'pdf').' ';
} else {
print img_object($langs->trans("PreviewNotAvailable"), 'generic');
}
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index a185071c227..d06f8a2ce31 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -682,7 +682,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
{
// Discard check of mandatory fields for country for some tables
if ($value == 'country_id' && in_array($tablib[$id], array('DictionaryPublicHolidays', 'DictionaryVAT', 'DictionaryRegion', 'DictionaryCompanyType', 'DictionaryHolidayTypes', 'DictionaryRevenueStamp', 'DictionaryAccountancysystem', 'DictionaryAccountancyCategory'))) continue; // For some pages, country is not mandatory
- if ($value == 'country' && in_array($tablib[$id], array('DictionaryPublicHolidays', 'DictionaryCanton', 'DictionaryCompanyType', 'DictionaryRevenueStamp'))) continue; // For some pages, country is not mandatory
+ if ($value == 'country' && in_array($tablib[$id], array('DictionaryPublicHolidays', 'DictionaryCanton', 'DictionaryCompanyType', 'DictionaryHolidayTypes', 'DictionaryRevenueStamp'))) continue; // For some pages, country is not mandatory
// Discard check of mandatory fiedls for other fields
if ($value == 'localtax1' && empty($_POST['localtax1_type'])) continue;
if ($value == 'localtax2' && empty($_POST['localtax2_type'])) continue;
@@ -690,7 +690,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
if ($value == 'formula' && empty($_POST['formula'])) continue;
if ($value == 'dayrule' && empty($_POST['dayrule'])) continue;
if ($value == 'sortorder') continue; // For a column name 'sortorder', we use the field name 'position'
- if ((!isset($_POST[$value]) || $_POST[$value] == '')
+ if ((!GETPOSTISSET($value) || GETPOST($value) == '')
&& (!in_array($listfield[$f], array('decalage', 'module', 'accountancy_code', 'accountancy_code_sell', 'accountancy_code_buy', 'tracking', 'picto')) // Fields that are not mandatory
&& (!($id == 10 && $listfield[$f] == 'code')) // Code is mandatory fir table 10
)
@@ -719,7 +719,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
}
}
// Other checks
- if (GETPOST('actionadd') && $tabname[$id] == MAIN_DB_PREFIX."c_actioncomm" && isset($_POST["type"]) && in_array($_POST["type"], array('system', 'systemauto'))) {
+ if (GETPOST('actionadd') && $tabname[$id] == MAIN_DB_PREFIX."c_actioncomm" && GETPOSTISSET("type") && in_array(GETPOST("type"), array('system', 'systemauto'))) {
$ok = 0;
setEventMessages($langs->transnoentities('ErrorReservedTypeSystemSystemAuto'), null, 'errors');
}
@@ -757,7 +757,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
if ($_POST["accountancy_code"] <= 0) $_POST["accountancy_code"] = ''; // If empty, we force to null
if ($_POST["accountancy_code_sell"] <= 0) $_POST["accountancy_code_sell"] = ''; // If empty, we force to null
if ($_POST["accountancy_code_buy"] <= 0) $_POST["accountancy_code_buy"] = ''; // If empty, we force to null
- if ($id == 10 && isset($_POST["code"])) // Spaces are not allowed into code
+ if ($id == 10 && GETPOSTISSET("code")) // Spaces are not allowed into code
{
$_POST["code"] = preg_replace('/\s/', '', $_POST["code"]);
}
diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php
index fd3361515fb..9e8b957d541 100644
--- a/htdocs/admin/emailcollector_card.php
+++ b/htdocs/admin/emailcollector_card.php
@@ -223,21 +223,6 @@ $help_url = "EN:Module_EMail_Collector|FR:Module_Collecteur_de_courrier_électro
llxHeader('', 'EmailCollector', $help_url);
-// Example : Adding jquery code
-print '';
-
// Part to create
if ($action == 'create') {
print load_fiche_titre($langs->trans("NewEmailCollector", $langs->transnoentitiesnoconv("EmailCollector")));
@@ -433,6 +418,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
if (!$connection)
{
$morehtml .= 'Failed to open IMAP connection '.$connectstringsource;
+ $morehtml .= ' ';
$tmp = $module->getExample();
if (preg_match('/^Error/', $tmp)) {
- $langs->load("errors"); print ''.$langs->trans($tmp).'
';
+ $langs->load("errors");
+ print ''.$langs->trans($tmp).'
';
} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
else print $tmp;
print ' '."\n";
@@ -414,7 +415,7 @@ foreach ($dirmodels as $reldir)
print '';
if ($module->type == 'pdf')
{
- print 'scandir.'&label='.urlencode($module->name).'">'.img_object($langs->trans("Preview"), 'sending').' ';
+ print 'scandir.'&label='.urlencode($module->name).'">'.img_object($langs->trans("Preview"), 'pdf').' ';
} else {
print img_object($langs->trans("PreviewNotAvailable"), 'generic');
}
diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index f572226c379..a93f5c3c608 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -238,8 +238,10 @@ foreach ($dirmodels as $reldir)
// Show example of numbering model
print ' ';
$tmp = $module->getExample();
- if (preg_match('/^Error/', $tmp)) print ''.$langs->trans($tmp).'
';
- elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+ if (preg_match('/^Error/', $tmp)) {
+ $langs->load("errors");
+ print ''.$langs->trans($tmp).'
';
+ } elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
else print $tmp;
print ' '."\n";
@@ -409,7 +411,7 @@ foreach ($dirmodels as $reldir)
print '';
if ($module->type == 'pdf')
{
- print ''.img_object($langs->trans("Preview"), 'intervention').' ';
+ print ''.img_object($langs->trans("Preview"), 'pdf').' ';
} else {
print img_object($langs->trans("PreviewNotAvailable"), 'generic');
}
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 35dd1002b12..00dcb7c3180 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -313,8 +313,10 @@ foreach ($dirmodels as $reldir)
// Show example of numbering module
print ' ';
$tmp = $module->getExample();
- if (preg_match('/^Error/', $tmp)) print ''.$langs->trans($tmp).'
';
- elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+ if (preg_match('/^Error/', $tmp)) {
+ $langs->load("errors");
+ print ''.$langs->trans($tmp).'
';
+ } elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
else print $tmp;
print ' '."\n";
@@ -547,7 +549,7 @@ foreach ($dirmodels as $reldir)
print '';
if ($module->type == 'pdf')
{
- print ''.img_object($langs->trans("Preview"), 'bill').' ';
+ print ''.img_object($langs->trans("Preview"), 'pdf').' ';
} else {
print img_object($langs->trans("PreviewNotAvailable"), 'generic');
}
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index 64660b67365..e3178d946a0 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -291,8 +291,10 @@ foreach ($dirmodels as $reldir)
// Show example of numbering model
print ' ';
$tmp = $module->getExample();
- if (preg_match('/^Error/', $tmp)) print ''.$langs->trans($tmp).'
';
- elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+ if (preg_match('/^Error/', $tmp)) {
+ $langs->load("errors");
+ print ''.$langs->trans($tmp).'
';
+ } elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
else print $tmp;
print ' '."\n";
@@ -465,7 +467,7 @@ foreach ($dirmodels as $reldir)
print '';
if ($module->type == 'pdf')
{
- print ''.img_object($langs->trans("Preview"), 'intervention').' ';
+ print ''.img_object($langs->trans("Preview"), 'pdf').' ';
} else {
print img_object($langs->trans("PreviewNotAvailable"), 'generic');
}
diff --git a/htdocs/admin/holiday.php b/htdocs/admin/holiday.php
index be09a062703..eca8319d661 100644
--- a/htdocs/admin/holiday.php
+++ b/htdocs/admin/holiday.php
@@ -229,7 +229,10 @@ foreach ($dirmodels as $reldir)
// Show example of numbering model
print ' ';
$tmp = $module->getExample();
- if (preg_match('/^Error/', $tmp)) { $langs->load("errors"); print ''.$langs->trans($tmp).'
'; } elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+ if (preg_match('/^Error/', $tmp)) {
+ $langs->load("errors");
+ print ''.$langs->trans($tmp).'
';
+ } elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
else print $tmp;
print ' '."\n";
@@ -423,7 +426,7 @@ foreach ($dirmodels as $reldir)
print '';
if ($module->type == 'pdf')
{
- print ''.img_object($langs->trans("Preview"), 'contract').' ';
+ print ''.img_object($langs->trans("Preview"), 'pdf').' ';
} else {
print img_object($langs->trans("PreviewNotAvailable"), 'generic');
}
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index ec6ab640125..ad2cd408471 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -241,8 +241,8 @@ print '';
-print ''.$langs->trans("Language").' ';
+print ''.img_picto('', 'language').' '.$langs->trans("Language").' ';
- if (!$conf->use_javascript_ajax && $linuxlike && $conf->global->MAIN_MAIL_SENDMODE == 'mail')
- {
+ print ' ';
+ if (!$conf->use_javascript_ajax && $linuxlike && $conf->global->MAIN_MAIL_SENDMODE == 'mail') {
+ print '';
print $langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike");
print ' ';
print ''.$langs->trans("SeeLocalSendMailSetup").' ';
+ print ' ';
} else {
+ print '';
$mainserver = (!empty($conf->global->MAIN_MAIL_SMTP_SERVER) ? $conf->global->MAIN_MAIL_SMTP_SERVER : '');
$smtpserver = ini_get('SMTP') ?ini_get('SMTP') : $langs->transnoentities("Undefined");
if ($linuxlike) print $langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike");
@@ -333,17 +338,19 @@ if ($action == 'edit')
// SuperAdministrator access only
if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity))
{
- print ''.$langs->trans("SeeLocalSendMailSetup").' ';
+ print ' '.$langs->trans("SeeLinkToOnlineDocumentation").' ';
} else {
$text = !empty($mainserver) ? $mainserver : $smtpserver;
$htmltext = $langs->trans("ContactSuperAdminForChange");
print $form->textwithpicto($text, $htmltext, 1, 'superadmin');
print ' ';
}
- print ' ';
+ print '';
// Port
print '';
@@ -856,8 +863,8 @@ if ($action == 'edit')
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
$formmail = new FormMail($db);
$formmail->trackid = (($action == 'testhtml') ? "testhtml" : "test");
- $formmail->fromname = (isset($_POST['fromname']) ? $_POST['fromname'] : $conf->global->MAIN_MAIL_EMAIL_FROM);
- $formmail->frommail = (isset($_POST['frommail']) ? $_POST['frommail'] : $conf->global->MAIN_MAIL_EMAIL_FROM);
+ $formmail->fromname = (GETPOSTISSET('fromname') ? $_POST['fromname'] : $conf->global->MAIN_MAIL_EMAIL_FROM);
+ $formmail->frommail = (GETPOSTISSET('frommail') ? $_POST['frommail'] : $conf->global->MAIN_MAIL_EMAIL_FROM);
$formmail->fromid = $user->id;
$formmail->fromalsorobot = 1;
$formmail->fromtype = (GETPOSTISSET('fromtype') ?GETPOST('fromtype', 'aZ09') : (!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE) ? $conf->global->MAIN_MAIL_DEFAULT_FROMTYPE : 'user'));
@@ -865,13 +872,13 @@ if ($action == 'edit')
$formmail->withsubstit = 1;
$formmail->withfrom = 1;
$formmail->witherrorsto = 1;
- $formmail->withto = (!empty($_POST['sendto']) ? $_POST['sendto'] : ($user->email ? $user->email : 1));
- $formmail->withtocc = (!empty($_POST['sendtocc']) ? $_POST['sendtocc'] : 1); // ! empty to keep field if empty
- $formmail->withtoccc = (!empty($_POST['sendtoccc']) ? $_POST['sendtoccc'] : 1); // ! empty to keep field if empty
- $formmail->withtopic = (isset($_POST['subject']) ? $_POST['subject'] : $langs->trans("Test"));
+ $formmail->withto = (!empty($_POST['sendto']) ? GETPOST('sendto', 'restricthtml') : ($user->email ? $user->email : 1));
+ $formmail->withtocc = (!empty($_POST['sendtocc']) ? GETPOST('sendtocc', 'restricthtml') : 1); // ! empty to keep field if empty
+ $formmail->withtoccc = (!empty($_POST['sendtoccc']) ? GETPOST('sendtoccc', 'restricthtml') : 1); // ! empty to keep field if empty
+ $formmail->withtopic = (GETPOSTISSET('subject') ? GETPOST('subject') : $langs->trans("Test"));
$formmail->withtopicreadonly = 0;
$formmail->withfile = 2;
- $formmail->withbody = (isset($_POST['message']) ? $_POST['message'] : ($action == 'testhtml' ? $langs->transnoentities("PredefinedMailTestHtml") : $langs->transnoentities("PredefinedMailTest")));
+ $formmail->withbody = (GETPOSTISSET('message') ? GETPOST('message', 'restricthtml') : ($action == 'testhtml' ? $langs->transnoentities("PredefinedMailTestHtml") : $langs->transnoentities("PredefinedMailTest")));
$formmail->withbodyreadonly = 0;
$formmail->withcancel = 1;
$formmail->withdeliveryreceipt = 1;
diff --git a/htdocs/admin/mails_emailing.php b/htdocs/admin/mails_emailing.php
index faa72f4fc7c..84cc97d86d4 100644
--- a/htdocs/admin/mails_emailing.php
+++ b/htdocs/admin/mails_emailing.php
@@ -564,20 +564,20 @@ if ($action == 'edit')
// Cree l'objet formulaire mail
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
$formmail = new FormMail($db);
- $formmail->fromname = (isset($_POST['fromname']) ? $_POST['fromname'] : $conf->global->MAIN_MAIL_EMAIL_FROM);
- $formmail->frommail = (isset($_POST['frommail']) ? $_POST['frommail'] : $conf->global->MAIN_MAIL_EMAIL_FROM);
+ $formmail->fromname = (GETPOSTISSET('fromname') ? GETPOST('fromname', 'restricthtml') : $conf->global->MAIN_MAIL_EMAIL_FROM);
+ $formmail->frommail = (GETPOSTISSET('frommail') ? GETPOST('frommail', 'restricthtml') : $conf->global->MAIN_MAIL_EMAIL_FROM);
$formmail->trackid = (($action == 'testhtml') ? "testhtml" : "test");
$formmail->withfromreadonly = 0;
$formmail->withsubstit = 0;
$formmail->withfrom = 1;
$formmail->witherrorsto = 1;
- $formmail->withto = (!empty($_POST['sendto']) ? $_POST['sendto'] : ($user->email ? $user->email : 1));
- $formmail->withtocc = (!empty($_POST['sendtocc']) ? $_POST['sendtocc'] : 1); // ! empty to keep field if empty
- $formmail->withtoccc = (!empty($_POST['sendtoccc']) ? $_POST['sendtoccc'] : 1); // ! empty to keep field if empty
- $formmail->withtopic = (isset($_POST['subject']) ? $_POST['subject'] : $langs->trans("Test"));
+ $formmail->withto = (!GETPOST('sendto') ? GETPOST('sendto', 'restricthtml') : ($user->email ? $user->email : 1));
+ $formmail->withtocc = (!GETPOST(['sendtocc']) ? GETPOST('sendtocc', 'restricthtml') : 1); // ! empty to keep field if empty
+ $formmail->withtoccc = (!GETPOST(['sendtoccc']) ? GETPOST('sendtoccc', 'restricthtml') : 1); // ! empty to keep field if empty
+ $formmail->withtopic = (GETPOSTISSET('subject') ? GETPOST('subject') : $langs->trans("Test"));
$formmail->withtopicreadonly = 0;
$formmail->withfile = 2;
- $formmail->withbody = (isset($_POST['message']) ? $_POST['message'] : ($action == 'testhtml' ? $langs->transnoentities("PredefinedMailTestHtml") : $langs->transnoentities("PredefinedMailTest")));
+ $formmail->withbody = (GETPOSTISSET('message') ? GETPOST('message', 'restricthtml') : ($action == 'testhtml' ? $langs->transnoentities("PredefinedMailTestHtml") : $langs->transnoentities("PredefinedMailTest")));
$formmail->withbodyreadonly = 0;
$formmail->withcancel = 1;
$formmail->withdeliveryreceipt = 1;
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 872c0d414eb..de98c42b35a 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -271,7 +271,7 @@ if (empty($reshook)) {
// Rename some POST variables into a generic name
if (GETPOST('actionmodify', 'alpha') && $value == 'topic') $_POST['topic'] = $_POST['topic-'.$rowid];
- if ((!isset($_POST[$value]) || $_POST[$value] == '' || $_POST[$value] == '-1') && $value != 'lang' && $value != 'fk_user' && $value != 'position')
+ if ((!GETPOSTISSET($value) || GETPOST($value) == '' || GETPOST($value) == '-1') && $value != 'lang' && $value != 'fk_user' && $value != 'position')
{
$ok = 0;
$fieldnamekey = $listfield[$f];
diff --git a/htdocs/admin/mails_ticket.php b/htdocs/admin/mails_ticket.php
index 49dc61a270a..1e1c3db3fad 100644
--- a/htdocs/admin/mails_ticket.php
+++ b/htdocs/admin/mails_ticket.php
@@ -530,20 +530,20 @@ if ($action == 'edit')
// Cree l'objet formulaire mail
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
$formmail = new FormMail($db);
- $formmail->fromname = (isset($_POST['fromname']) ? $_POST['fromname'] : $conf->global->MAIN_MAIL_EMAIL_FROM);
- $formmail->frommail = (isset($_POST['frommail']) ? $_POST['frommail'] : $conf->global->MAIN_MAIL_EMAIL_FROM);
+ $formmail->fromname = (GETPOSTISSET('fromname') ? $_POST['fromname'] : $conf->global->MAIN_MAIL_EMAIL_FROM);
+ $formmail->frommail = (GETPOSTISSET('frommail') ? $_POST['frommail'] : $conf->global->MAIN_MAIL_EMAIL_FROM);
$formmail->trackid = (($action == 'testhtml') ? "testhtml" : "test");
$formmail->withfromreadonly = 0;
$formmail->withsubstit = 0;
$formmail->withfrom = 1;
$formmail->witherrorsto = 1;
- $formmail->withto = (!empty($_POST['sendto']) ? $_POST['sendto'] : ($user->email ? $user->email : 1));
- $formmail->withtocc = (!empty($_POST['sendtocc']) ? $_POST['sendtocc'] : 1); // ! empty to keep field if empty
- $formmail->withtoccc = (!empty($_POST['sendtoccc']) ? $_POST['sendtoccc'] : 1); // ! empty to keep field if empty
- $formmail->withtopic = (isset($_POST['subject']) ? $_POST['subject'] : $langs->trans("Test"));
+ $formmail->withto = (!empty($_POST['sendto']) ? GETPOST('sendto', 'restricthtml') : ($user->email ? $user->email : 1));
+ $formmail->withtocc = (!empty($_POST['sendtocc']) ? GETPOST('sendtocc', 'restricthtml') : 1); // ! empty to keep field if empty
+ $formmail->withtoccc = (!empty($_POST['sendtoccc']) ? GETPOST('sendtoccc', 'restricthtml') : 1); // ! empty to keep field if empty
+ $formmail->withtopic = (GETPOSTISSET('subject') ? GETPOST('subject') : $langs->trans("Test"));
$formmail->withtopicreadonly = 0;
$formmail->withfile = 2;
- $formmail->withbody = (isset($_POST['message']) ? $_POST['message'] : ($action == 'testhtml' ? $langs->transnoentities("PredefinedMailTestHtml") : $langs->transnoentities("PredefinedMailTest")));
+ $formmail->withbody = (GETPOSTISSET('message') ? GETPOST('message', 'restricthtml') : ($action == 'testhtml' ? $langs->transnoentities("PredefinedMailTestHtml") : $langs->transnoentities("PredefinedMailTest")));
$formmail->withbodyreadonly = 0;
$formmail->withcancel = 1;
$formmail->withdeliveryreceipt = 1;
diff --git a/htdocs/admin/mrp.php b/htdocs/admin/mrp.php
index 837a77fe2a7..af6210eee1f 100644
--- a/htdocs/admin/mrp.php
+++ b/htdocs/admin/mrp.php
@@ -233,8 +233,10 @@ foreach ($dirmodels as $reldir)
// Show example of numbering model
print ' ';
$tmp = $module->getExample();
- if (preg_match('/^Error/', $tmp)) print ''.$langs->trans($tmp).'
';
- elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+ if (preg_match('/^Error/', $tmp)) {
+ $langs->load("errors");
+ print ''.$langs->trans($tmp).'
';
+ } elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
else print $tmp;
print ' '."\n";
@@ -413,7 +415,7 @@ foreach ($dirmodels as $reldir)
print '';
if ($module->type == 'pdf')
{
- print ''.img_object($langs->trans("Preview"), 'bill').' ';
+ print ''.img_object($langs->trans("Preview"), 'pdf').' ';
} else {
print img_object($langs->trans("PreviewNotAvailable"), 'generic');
}
diff --git a/htdocs/admin/payment.php b/htdocs/admin/payment.php
index d92704c211b..378e1b4fe68 100644
--- a/htdocs/admin/payment.php
+++ b/htdocs/admin/payment.php
@@ -171,8 +171,10 @@ foreach ($dirmodels as $reldir)
// Show example of numbering module
print ' ';
$tmp = $module->getExample();
- if (preg_match('/^Error/', $tmp)) print ''.$langs->trans($tmp).'
';
- elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+ if (preg_match('/^Error/', $tmp)) {
+ $langs->load("errors");
+ print ''.$langs->trans($tmp).'
';
+ } elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
else print $tmp;
print ' '."\n";
diff --git a/htdocs/admin/paymentbybanktransfer.php b/htdocs/admin/paymentbybanktransfer.php
index 0ea8db95aec..cd0db2a1def 100644
--- a/htdocs/admin/paymentbybanktransfer.php
+++ b/htdocs/admin/paymentbybanktransfer.php
@@ -340,7 +340,7 @@ foreach ($dirmodels as $reldir)
print '';
if ($module->type == 'pdf')
{
- print ''.img_object($langs->trans("Preview"),'bill').' ';
+ print ''.img_object($langs->trans("Preview"), 'pdf').' ';
}
else
{
diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php
index 97a45c77a42..72e116ab3a7 100644
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@@ -347,7 +347,7 @@ foreach ($dirmodels as $reldir)
print ' ';
if ($module->type == 'pdf')
{
- print ''.img_object($langs->trans("Preview"),'bill').' ';
+ print ''.img_object($langs->trans("Preview"), 'pdf').' ';
}
else
{
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index e75a06a78ad..78c22e7b397 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -256,8 +256,10 @@ foreach ($dirmodels as $reldir)
// Show example of numbering module
print ' ';
$tmp = $module->getExample();
- if (preg_match('/^Error/', $tmp)) print ''.$langs->trans($tmp).'
';
- elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+ if (preg_match('/^Error/', $tmp)) {
+ $langs->load("errors");
+ print ''.$langs->trans($tmp).'
';
+ } elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
else print $tmp;
print ' '."\n";
@@ -442,7 +444,7 @@ foreach ($dirmodels as $reldir)
print '';
if ($module->type == 'pdf')
{
- print ''.img_object($langs->trans("Preview"), 'bill').' ';
+ print ''.img_object($langs->trans("Preview"), 'pdf').' ';
} else {
print img_object($langs->trans("PreviewNotAvailable"), 'generic');
}
diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php
index 71bd50ef5ce..0349f8a3435 100644
--- a/htdocs/admin/proxy.php
+++ b/htdocs/admin/proxy.php
@@ -135,7 +135,7 @@ print ' ';
print ''.$langs->trans("ConnectionTimeout").' ';
print ' ';
print '';
-print ' ';
print ' ';
diff --git a/htdocs/admin/receiptprinter.php b/htdocs/admin/receiptprinter.php
index 73db1bfa040..3c878c5c664 100644
--- a/htdocs/admin/receiptprinter.php
+++ b/htdocs/admin/receiptprinter.php
@@ -420,7 +420,7 @@ if ($mode == 'template' && $user->admin) {
print ''.$printer->listprinterstemplates[$line]['name'].' ';
- print ''.nl2br(htmlentities($printer->listprinterstemplates[$line]['template'])).' ';
+ print ''.dol_htmlentitiesbr($printer->listprinterstemplates[$line]['template']).' ';
// edit icon
print '';
print img_picto($langs->trans("Edit"), 'edit');
diff --git a/htdocs/admin/reception_setup.php b/htdocs/admin/reception_setup.php
index 6c5d9916225..5da0dd84630 100644
--- a/htdocs/admin/reception_setup.php
+++ b/htdocs/admin/reception_setup.php
@@ -240,7 +240,8 @@ foreach ($dirmodels as $reldir)
print ' ';
$tmp = $module->getExample();
if (preg_match('/^Error/', $tmp)) {
- $langs->load("errors"); print ''.$langs->trans($tmp).'
';
+ $langs->load("errors");
+ print ''.$langs->trans($tmp).'
';
} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
else print $tmp;
print ' '."\n";
@@ -423,7 +424,7 @@ foreach ($dirmodels as $reldir)
print '';
if ($module->type == 'pdf')
{
- print 'scandir.'&label='.urlencode($module->name).'">'.img_object($langs->trans("Preview"), 'reception').' ';
+ print 'scandir.'&label='.urlencode($module->name).'">'.img_object($langs->trans("Preview"), 'pdf').' ';
} else {
print img_object($langs->trans("PreviewNotAvailable"), 'generic');
}
diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index fc479522a8b..30085d3f1f1 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -256,7 +256,10 @@ foreach ($arrayhandler as $key => $module)
// Show example of numbering module
print ' ';
$tmp = $module->getExample();
- if (preg_match('/^Error/', $tmp)) { $langs->load("errors"); print ''.$langs->trans($tmp).'
'; } elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+ if (preg_match('/^Error/', $tmp)) {
+ $langs->load("errors");
+ print ''.$langs->trans($tmp).'
';
+ } elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
else print $tmp;
print ' '."\n";
diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index 134aeb663b4..031b0ef102f 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -638,7 +638,7 @@ foreach ($dirmodels as $reldir)
print '';
if ($module->type == 'pdf')
{
- print ''.img_object($langs->trans("Preview"), 'bill').' ';
+ print ''.img_object($langs->trans("Preview"), 'pdf').' ';
} else {
print img_object($langs->trans("PreviewNotAvailable"), 'generic');
}
diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index 779f7ab472a..8df357df07e 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -251,7 +251,8 @@ foreach ($dirmodels as $reldir)
print ' ';
$tmp = $module->getExample();
if (preg_match('/^Error/', $tmp)) {
- $langs->load("errors"); print ''.$langs->trans($tmp).'
';
+ $langs->load("errors");
+ print ''.$langs->trans($tmp).'
';
} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
else print $tmp;
print ' '."\n";
@@ -425,7 +426,7 @@ foreach ($dirmodels as $reldir)
print $form->textwithpicto('', $htmltooltip, 1, 0);
print '';
print '';
- print ''.img_object($langs->trans("Preview"), 'order').' ';
+ print ''.img_object($langs->trans("Preview"), 'pdf').' ';
print ' ';
print "\n";
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index 60c2c4da56e..e2433c5348b 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -274,7 +274,8 @@ foreach ($dirmodels as $reldir)
print '';
$tmp = $module->getExample();
if (preg_match('/^Error/', $tmp)) {
- $langs->load("errors"); print ''.$langs->trans($tmp).'
';
+ $langs->load("errors");
+ print ''.$langs->trans($tmp).'
';
} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
else print $tmp;
print ' '."\n";
@@ -438,7 +439,7 @@ foreach ($dirmodels as $reldir)
print $form->textwithpicto('', $htmltooltip, 1, 0);
print '';
print '';
- print ''.img_object($langs->trans("Preview"), 'order').' ';
+ print ''.img_object($langs->trans("Preview"), 'pdf').' ';
print ' ';
print "\n";
diff --git a/htdocs/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php
index 217b7d7c44a..3408496de31 100644
--- a/htdocs/admin/supplier_payment.php
+++ b/htdocs/admin/supplier_payment.php
@@ -256,8 +256,10 @@ foreach ($dirmodels as $reldir)
// Show example of numbering module
print '';
$tmp = $module->getExample();
- if (preg_match('/^Error/', $tmp)) print ''.$langs->trans($tmp).'
';
- elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+ if (preg_match('/^Error/', $tmp)) {
+ $langs->load("errors");
+ print ''.$langs->trans($tmp).'
';
+ } elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
else print $tmp;
print ' '."\n";
@@ -410,7 +412,7 @@ foreach ($dirmodels as $reldir)
print $form->textwithpicto('', $htmltooltip, 1, 0);
print '';
print '';
- print ''.img_object($langs->trans("Preview"), 'order').' ';
+ print ''.img_object($langs->trans("Preview"), 'pdf').' ';
print ' ';
print "\n";
diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index 38a6d9e3ff5..0855a41cf8f 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -251,8 +251,10 @@ foreach ($dirmodels as $reldir)
// Show example of numbering module
print '';
$tmp = $module->getExample();
- if (preg_match('/^Error/', $tmp)) print ''.$langs->trans($tmp).'
';
- elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+ if (preg_match('/^Error/', $tmp)) {
+ $langs->load("errors");
+ print ''.$langs->trans($tmp).'
';
+ } elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
else print $tmp;
print ' '."\n";
@@ -435,7 +437,7 @@ foreach ($dirmodels as $reldir)
print '';
if ($module->type == 'pdf')
{
- print ''.img_object($langs->trans("Preview"), 'bill').' ';
+ print ''.img_object($langs->trans("Preview"), 'pdf').' ';
} else {
print img_object($langs->trans("PreviewNotAvailable"), 'generic');
}
diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php
index 6d84b4a0e2d..45500843aed 100644
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.php
@@ -85,7 +85,7 @@ if ($action == 'set')
$db->begin();
$newActiveModules = array();
- $selectedModules = (isset($_POST['SYSLOG_HANDLERS']) ? $_POST['SYSLOG_HANDLERS'] : array());
+ $selectedModules = (GETPOSTISSET('SYSLOG_HANDLERS') ? GETPOST('SYSLOG_HANDLERS') : array());
// Save options of handler
foreach ($syslogModules as $syslogHandler)
@@ -97,11 +97,10 @@ if ($action == 'set')
if (in_array($syslogHandler, $selectedModules)) $newActiveModules[] = $syslogHandler;
foreach ($module->configure() as $option)
{
- if (isset($_POST[$option['constant']]))
+ if (GETPOSTISSET($option['constant']))
{
- $_POST[$option['constant']] = trim($_POST[$option['constant']]);
dolibarr_del_const($db, $option['constant'], -1);
- dolibarr_set_const($db, $option['constant'], $_POST[$option['constant']], 'chaine', 0, '', 0);
+ dolibarr_set_const($db, $option['constant'], trim(GETPOST($option['constant'])), 'chaine', 0, '', 0);
}
}
}
@@ -229,7 +228,7 @@ foreach ($syslogModules as $moduleName)
$tmpoption = $option['constant'];
if (!empty($tmpoption))
{
- if (isset($_POST[$tmpoption])) $value = $_POST[$tmpoption];
+ if (GETPOSTISSET($tmpoption)) $value = GETPOST($tmpoption);
elseif (!empty($conf->global->$tmpoption)) $value = $conf->global->$tmpoption;
} else $value = (isset($option['default']) ? $option['default'] : '');
@@ -240,7 +239,7 @@ foreach ($syslogModules as $moduleName)
{
$filelogparam = ' (';
$filelogparam .= $langs->trans('Download');
- $filelogparam .= $filelog.' )';
+ $filelogparam .= ' '.basename($value).')';
print $filelogparam;
}
}
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index a9726bd7baf..37aadd8c2ad 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -85,31 +85,37 @@ if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE))
if (DOL_VERSION != $conf->global->MAIN_VERSION_LAST_UPGRADE) print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired", DOL_VERSION, $conf->global->MAIN_VERSION_LAST_UPGRADE));
}
+$version = DOL_VERSION;
+if (preg_match('/[a-z]+/i', $version)) $version = 'develop'; // If version contains text, it is not an official tagged version, so we use the full change log.
+print ' '.$langs->trans("SeeChangeLog").' ';
+
+$newversion = '';
if (function_exists('curl_init'))
{
- $conf->global->MAIN_USE_RESPONSE_TIMEOUT = 10;
- print ' - ';
- if ($action == 'getlastversion')
- {
- if ($sfurl)
- {
- while (!empty($sfurl->channel[0]->item[$i]->title) && $i < 10000)
- {
- $title = $sfurl->channel[0]->item[$i]->title;
- if (preg_match('/([0-9]+\.([0-9\.]+))/', $title, $reg))
- {
- $newversion = $reg[1];
- $newversionarray = explode('.', $newversion);
- $versionarray = explode('.', $version);
- //var_dump($newversionarray);var_dump($versionarray);
- if (versioncompare($newversionarray, $versionarray) > 0) $version = $newversion;
- }
- $i++;
- }
+ $conf->global->MAIN_USE_RESPONSE_TIMEOUT = 10;
+ print ' - ';
+ if ($action == 'getlastversion') {
+ if ($sfurl) {
+ $i = 0;
+ while (!empty($sfurl->channel[0]->item[$i]->title) && $i < 10000) {
+ $title = $sfurl->channel[0]->item[$i]->title;
+ $reg = array();
+ if (preg_match('/([0-9]+\.([0-9\.]+))/', $title, $reg)) {
+ $newversion = $reg[1];
+ $newversionarray = explode('.', $newversion);
+ $versionarray = explode('.', $version);
+ //var_dump($newversionarray);var_dump($versionarray);
+ if (versioncompare($newversionarray, $versionarray) > 0) $version = $newversion;
+ }
+ $i++;
+ }
// Show version
print $langs->trans("LastStableVersion").' : '.(($version != '0.0') ? $version : $langs->trans("Unknown")).' ';
- } else {
+ if ($version != '0.0') {
+ print ' '.$langs->trans("SeeChangeLog").' ';
+ }
+ } else {
print $langs->trans("LastStableVersion").' : '.$langs->trans("UpdateServerOffline").' ';
}
} else {
@@ -118,12 +124,11 @@ if (function_exists('curl_init'))
}
// Now show link to the changelog
-print ' - ';
+//print ' - ';
$version = DOL_VERSION;
if (preg_match('/[a-z]+/i', $version)) $version = 'develop'; // If version contains text, it is not an official tagged version, so we use the full change log.
-print ''.$langs->trans("SeeChangeLog").' ';
print ' '."\n";
print ''.$langs->trans("VersionLastUpgrade").' ('.$langs->trans("Database").') '.$conf->global->MAIN_VERSION_LAST_UPGRADE.' '.$langs->trans("VersionLastInstall").' '.$conf->global->MAIN_VERSION_LAST_INSTALL.' GET and POST support ';
-if (!isset($_GET["testget"]) && !isset($_POST["testpost"]) && !isset($_GET["mainmenu"]))
+if (!isset($_GET["testget"]) && !isset($_POST["testpost"]) && !isset($_GET["mainmenu"])) // We must keep $_GET and $_POST here
{
print ''.$langs->trans("Recheck").' )';
@@ -126,7 +124,7 @@ print '
';
print '';
@@ -165,7 +163,6 @@ $name = "GD";
print "";
print "".$name." ";
-//print getTableColumn($name, $activatedExtensions);
print getTableColumn($name, $loadedExtensions);
print getTableColumnFunction($functions);
print getResultColumn($name, $activatedExtensions, $loadedExtensions, $functions);
@@ -176,7 +173,6 @@ $name = "Curl";
print " ";
print "".$name." ";
-//print getTableColumn($name, $activatedExtensions);
print getTableColumn($name, $loadedExtensions);
print getTableColumnFunction($functions);
print getResultColumn($name, $activatedExtensions, $loadedExtensions, $functions);
@@ -189,7 +185,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);
@@ -201,7 +196,6 @@ $name = "xDebug";
print " ";
print "".$name." ";
-//print getTableColumn($name, $activatedExtensions);
print getTableColumn($name, $loadedExtensions);
print getTableColumnFunction($functions);
print getResultColumn($name, $activatedExtensions, $loadedExtensions, $functions);
@@ -240,7 +234,7 @@ foreach ($phparray as $key => $value)
print ' ';
} else {
print '';
- print ''.$keyparam.' ';
+ print ''.$keyparam.' ';
$i = 0;
foreach ($keyvalue as $keyparam2 => $keyvalue2)
{
@@ -264,85 +258,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 = trim(getConfigFilePath());
- $handle = fopen($file, "r");
- $content = fread($handle, filesize($file));
-
- fclose($handle);
-
- $configLines = explode("\r", $content);
-
- // For compatibility with LF (Line Feed)
- if (empty($configLines) || count($configLines) < 2) {
- $configLines = explode("\n", $content);
- }
-
- $extensions = array();
- $lastLine = "";
-
- foreach ($configLines as $line)
- {
- $line = trim($line);
-
- // ignore comment lines
- if (substr($line, 0, 1) === ";" || empty($line))
- {
- continue;
- }
-
- // var_dump($line);
-
- // 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
@@ -411,7 +326,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/ticket.php b/htdocs/admin/ticket.php
index 0614df0dd61..c1546f1da2c 100644
--- a/htdocs/admin/ticket.php
+++ b/htdocs/admin/ticket.php
@@ -240,6 +240,7 @@ foreach ($dirmodels as $reldir) {
print '';
$tmp = $module->getExample();
if (preg_match('/^Error/', $tmp)) {
+ $langs->load("errors");
print ''.$langs->trans($tmp).'
';
} elseif ($tmp == 'NotConfigured') {
print $langs->trans($tmp);
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index f4d50cb6f8d..76cae0443b3 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -363,7 +363,7 @@ if ($mode == 'overwrite')
if ($mode == 'searchkey')
{
- $langcode = GETPOST('langcode') ?GETPOST('langcode') : $langs->defaultlang;
+ $langcode = GETPOSTISSET('langcode') ? GETPOST('langcode') : $langs->defaultlang;
$newlang = new Translate('', $conf);
$newlang->setDefaultLang($langcode);
@@ -384,8 +384,7 @@ if ($mode == 'searchkey')
if (empty($langcode) || $langcode == '-1') $nbempty++;
if (empty($transkey)) $nbempty++;
if (empty($transvalue)) $nbempty++;
- if ($action == 'search' && ($nbempty > 999)) // 999 to disable this
- {
+ if ($action == 'search' && ($nbempty > 999)) { // 999 to disable this
setEventMessages($langs->trans("WarningAtLeastKeyOrTranslationRequired"), null, 'warnings');
} else {
// Search into dir of modules (the $modulesdir is already a list that loop on $conf->file->dol_document_root)
diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php
index ea39cc1dce9..ea6cdf2b6f8 100644
--- a/htdocs/admin/user.php
+++ b/htdocs/admin/user.php
@@ -312,7 +312,7 @@ foreach ($dirmodels as $reldir)
print ' ';
if ($module->type == 'pdf')
{
- print ''.img_object($langs->trans("Preview"), 'contract').' ';
+ print ''.img_object($langs->trans("Preview"), 'pdf').' ';
} else {
print img_object($langs->trans("PreviewNotAvailable"), 'generic');
}
diff --git a/htdocs/admin/usergroup.php b/htdocs/admin/usergroup.php
index dd12584b276..0725cc83f18 100644
--- a/htdocs/admin/usergroup.php
+++ b/htdocs/admin/usergroup.php
@@ -241,7 +241,7 @@ foreach ($dirmodels as $reldir)
print ' ';
if ($module->type == 'pdf')
{
- print ''.img_object($langs->trans("Preview"), 'contract').' ';
+ print ''.img_object($langs->trans("Preview"), 'pdf').' ';
} else {
print img_object($langs->trans("PreviewNotAvailable"), 'generic');
}
diff --git a/htdocs/api/class/api_access.class.php b/htdocs/api/class/api_access.class.php
index e7b8ac8536b..926a51456c7 100644
--- a/htdocs/api/class/api_access.class.php
+++ b/htdocs/api/class/api_access.class.php
@@ -19,9 +19,9 @@
// Create the autoloader for Luracast
require_once DOL_DOCUMENT_ROOT.'/includes/restler/framework/Luracast/Restler/AutoLoader.php';
call_user_func(function () {
- $loader = Luracast\Restler\AutoLoader::instance();
- spl_autoload_register($loader);
- return $loader;
+ $loader = Luracast\Restler\AutoLoader::instance();
+ spl_autoload_register($loader);
+ return $loader;
});
require_once DOL_DOCUMENT_ROOT.'/includes/restler/framework/Luracast/Restler/iAuthenticate.php';
diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index 9408898a984..550d78068a4 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -475,7 +475,7 @@ class Documents extends DolibarrApi
$upload_dir = $conf->categorie->multidir_output[$object->entity].'/'.get_exdir($object->id, 2, 0, 0, $object, 'category').$object->id."/photos/".dol_sanitizeFileName($object->ref);
} elseif ($modulepart == 'ecm') {
- throw new RestException(500, 'Modulepart Ecm not implemented yet.');
+ throw new RestException(500, 'Modulepart Ecm not implemented yet.');
// // require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
// if (!DolibarrApiAccess::$user->rights->ecm->read) {
@@ -634,7 +634,7 @@ class Documents extends DolibarrApi
require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
$object = new Propal($this->db);
} else {
- // TODO Implement additional moduleparts
+ // TODO Implement additional moduleparts
throw new RestException(500, 'Modulepart '.$modulepart.' not implemented yet.');
}
diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index 4516d2e1d45..02bb5afbafd 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -111,6 +111,71 @@ class Setup extends DolibarrApi
return $list;
}
+ /**
+ * Get the list of ordering origins.
+ *
+ * @param string $sortfield Sort field
+ * @param string $sortorder Sort order
+ * @param int $limit Number of items per page
+ * @param int $page Page number {@min 0}
+ * @param int $active Payment type is active or not {@min 0} {@max 1}
+ * @param string $sqlfilters SQL criteria to filter with. Syntax example "(t.code:=:'OrderByWWW')"
+ *
+ * @url GET dictionary/ordering_origins
+ *
+ * @return array [List of ordering reasons]
+ *
+ * @throws RestException 400
+ */
+ public function getOrderingOrigins($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+ {
+ $list = array();
+
+ if (!DolibarrApiAccess::$user->rights->commande->lire) {
+ throw new RestException(401);
+ }
+
+ $sql = "SELECT rowid, code, label, module";
+ $sql .= " FROM ".MAIN_DB_PREFIX."c_input_reason as t";
+ $sql .= " WHERE t.active = ".$active;
+ // Add sql filters
+ if ($sqlfilters)
+ {
+ if (!DolibarrApi::_checkFilters($sqlfilters))
+ {
+ throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
+ }
+ $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+ $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+ }
+
+
+ $sql .= $this->db->order($sortfield, $sortorder);
+
+ if ($limit) {
+ if ($page < 0) {
+ $page = 0;
+ }
+ $offset = $limit * $page;
+
+ $sql .= $this->db->plimit($limit, $offset);
+ }
+
+ $result = $this->db->query($sql);
+
+ if ($result) {
+ $num = $this->db->num_rows($result);
+ $min = min($num, ($limit <= 0 ? $num : $limit));
+ for ($i = 0; $i < $min; $i++) {
+ $list[] = $this->db->fetch_object($result);
+ }
+ } else {
+ throw new RestException(400, $this->db->lasterror());
+ }
+
+ return $list;
+ }
+
/**
* Get the list of payments types.
*
diff --git a/htdocs/api/index.php b/htdocs/api/index.php
index 2fba9fbb554..2c85533fd11 100644
--- a/htdocs/api/index.php
+++ b/htdocs/api/index.php
@@ -46,9 +46,9 @@ if (!$res) die("Include of main fails");
require_once DOL_DOCUMENT_ROOT.'/includes/restler/framework/Luracast/Restler/AutoLoader.php';
call_user_func(function () {
- $loader = Luracast\Restler\AutoLoader::instance();
- spl_autoload_register($loader);
- return $loader;
+ $loader = Luracast\Restler\AutoLoader::instance();
+ spl_autoload_register($loader);
+ return $loader;
});
require_once DOL_DOCUMENT_ROOT.'/api/class/api.class.php';
diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php
index 1135f5df5dd..8f8c13f2556 100644
--- a/htdocs/bom/bom_list.php
+++ b/htdocs/bom/bom_list.php
@@ -383,21 +383,6 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
llxHeader('', $title, $help_url);
-// Example : Adding jquery code
-print '';
-
$arrayofselected = is_array($toselect) ? $toselect : array();
$param = '';
@@ -469,7 +454,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
-print ''; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '
';
print '
'."\n";
diff --git a/htdocs/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php
index e182a91d32a..03610100c9c 100644
--- a/htdocs/categories/class/api_categories.class.php
+++ b/htdocs/categories/class/api_categories.class.php
@@ -769,6 +769,7 @@ class Categories extends DolibarrApi
$objects = $result;
$cleaned_objects = array();
+ $objects_api = null;
if ($type == 'member') {
$objects_api = new Members();
} elseif ($type == 'customer' || $type == 'supplier') {
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 3aca92708a7..f55b3403546 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -1891,13 +1891,12 @@ class Categorie extends CommonObject
return "";
}
+ $searchCategorySqlList = array();
foreach ($searchList as $searchCategory) {
if (intval($searchCategory) == -2) {
$searchCategorySqlList[] = " cp.fk_categorie IS NULL";
} elseif (intval($searchCategory) > 0) {
- $searchCategorySqlList[] = " ".$rowIdName
- ." IN (SELECT fk_".$type." FROM ".MAIN_DB_PREFIX."categorie_".$type
- ." WHERE fk_categorie = ".$searchCategory.")";
+ $searchCategorySqlList[] = " ".$rowIdName." IN (SELECT fk_".$type." FROM ".MAIN_DB_PREFIX."categorie_".$type." WHERE fk_categorie = ".((int) $searchCategory).")";
}
}
diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php
index 49126ea1111..f634d62a6e4 100644
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -145,7 +145,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();
@@ -154,7 +154,7 @@ print ' ';
// Color
print '';
print ''.$langs->trans("Color").' ';
-print '';
+print ' ';
print $formother->selectColor($object->color, 'color');
print ' ';
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index 7f673a1ecff..864de6e2e98 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -294,7 +294,7 @@ if ($user->rights->categorie->creer)
if ($user->rights->categorie->supprimer)
{
- print 'id.'&type='.$type.'">'.$langs->trans("Delete").' ';
+ print 'id.'&type='.$type.'">'.$langs->trans("Delete").' ';
}
print "";
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 6dfdf41e679..f26ad2a36e2 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -280,7 +280,7 @@ if (empty($reshook) && $action == 'add')
}
}
}
- $object->fk_project = isset($_POST["projectid"]) ? $_POST["projectid"] : 0;
+ $object->fk_project = GETPOSTISSET("projectid") ? GETPOST("projectid", 'int') : 0;
$taskid = GETPOST('taskid', 'int');
if (!empty($taskid)) {
@@ -324,7 +324,7 @@ if (empty($reshook) && $action == 'add')
$object->note_private = trim(GETPOST("note", "restricthtml"));
- if (isset($_POST["contactid"])) $object->contact = $contact;
+ if (GETPOSTISSET("contactid")) $object->contact = $contact;
if (GETPOST('socid', 'int') > 0)
{
@@ -1051,8 +1051,8 @@ if ($action == 'create')
print ''.$langs->trans("Status").' / '.$langs->trans("Percentage").' ';
print '';
$percent = -1;
- if (isset($_GET['status']) || isset($_POST['status'])) $percent = GETPOST('status');
- elseif (isset($_GET['percentage']) || isset($_POST['percentage'])) $percent = GETPOST('percentage');
+ if (GETPOSTISSET('status')) $percent = GETPOST('status');
+ elseif (GETPOSTISSET('percentage')) $percent = GETPOST('percentage');
else {
if (GETPOST('complete') == '0' || GETPOST("afaire") == 1) $percent = '0';
elseif (GETPOST('complete') == 100 || GETPOST("afaire") == 2) $percent = 100;
@@ -1104,7 +1104,7 @@ if ($action == 'create')
// Categories
print ' '.$langs->trans("Categories").' ';
$cate_arbo = $form->select_all_categories(Categorie::TYPE_ACTIONCOMM, '', 'parent', 64, 0, 1);
- print $form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), '', 0, 'minwidth300 quatrevingtpercent', 0, 0);
+ print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), '', 0, 'minwidth300 quatrevingtpercent widthcentpercentminusx', 0, 0);
print " ';
print ' ';
}
- // Status
- if (!empty($arrayfields['c.fk_statut']['checked']))
- {
- print '';
- $liststatus = array(
- Commande::STATUS_DRAFT=>$langs->trans("StatusOrderDraftShort"),
- Commande::STATUS_VALIDATED=>$langs->trans("StatusOrderValidated"),
- Commande::STATUS_SHIPMENTONPROCESS=>$langs->trans("StatusOrderSentShort"),
- Commande::STATUS_CLOSED=>$langs->trans("StatusOrderDelivered"),
- -3=>$langs->trans("StatusOrderValidatedShort").'+'.$langs->trans("StatusOrderSentShort").'+'.$langs->trans("StatusOrderDelivered"),
- Commande::STATUS_CANCELED=>$langs->trans("StatusOrderCanceledShort")
- );
- print $form->selectarray('search_status', $liststatus, $search_status, -4, 0, 0, '', 0, 0, 0, '', 'maxwidth100', 1);
- print ' ';
- }
// Shippable
if (!empty($arrayfields['shippable']['checked']))
{
print '';
//print $form->selectyesno('search_shippable', $search_shippable, 1, 0, 1, 1);
- if (! empty($conf->global->ORDER_SHIPABLE_STATUS_DISABLED_BY_DEFAULT)) {
+ if (!empty($conf->global->ORDER_SHIPABLE_STATUS_DISABLED_BY_DEFAULT)) {
print ' ';
}
+ // Status
+ if (!empty($arrayfields['c.fk_statut']['checked']))
+ {
+ print '';
+ $liststatus = array(
+ Commande::STATUS_DRAFT=>$langs->trans("StatusOrderDraftShort"),
+ Commande::STATUS_VALIDATED=>$langs->trans("StatusOrderValidated"),
+ Commande::STATUS_SHIPMENTONPROCESS=>$langs->trans("StatusOrderSentShort"),
+ Commande::STATUS_CLOSED=>$langs->trans("StatusOrderDelivered"),
+ -3=>$langs->trans("StatusOrderValidatedShort").'+'.$langs->trans("StatusOrderSentShort").'+'.$langs->trans("StatusOrderDelivered"),
+ Commande::STATUS_CANCELED=>$langs->trans("StatusOrderCanceledShort")
+ );
+ print $form->selectarray('search_status', $liststatus, $search_status, -4, 0, 0, '', 0, 0, 0, '', 'maxwidth100', 1);
+ print ' ';
+ }
// Action column
print '';
$searchpicto = $form->showFilterButtons();
@@ -878,8 +878,8 @@ if ($resql)
print ' ';
if (!empty($arrayfields['c.ref']['checked'])) print_liste_field_titre($arrayfields['c.ref']['label'], $_SERVER["PHP_SELF"], 'c.ref', '', $param, '', $sortfield, $sortorder);
if (!empty($arrayfields['c.ref_client']['checked'])) print_liste_field_titre($arrayfields['c.ref_client']['label'], $_SERVER["PHP_SELF"], 'c.ref_client', '', $param, '', $sortfield, $sortorder);
- if (!empty($arrayfields['p.ref']['checked'])) print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
- if (!empty($arrayfields['p.title']['checked'])) print_liste_field_titre($arrayfields['p.title']['label'], $_SERVER["PHP_SELF"], "p.title", "", $param, '', $sortfield, $sortorder);
+ if (!empty($arrayfields['p.ref']['checked'])) print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
+ if (!empty($arrayfields['p.title']['checked'])) print_liste_field_titre($arrayfields['p.title']['label'], $_SERVER["PHP_SELF"], "p.title", "", $param, '', $sortfield, $sortorder);
if (!empty($arrayfields['s.nom']['checked'])) print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], 's.nom', '', $param, '', $sortfield, $sortorder);
if (!empty($arrayfields['s.town']['checked'])) print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], 's.town', '', $param, '', $sortfield, $sortorder);
if (!empty($arrayfields['s.zip']['checked'])) print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], 's.zip', '', $param, '', $sortfield, $sortorder);
@@ -909,9 +909,9 @@ if ($resql)
if (!empty($arrayfields['c.date_cloture']['checked'])) print_liste_field_titre($arrayfields['c.date_cloture']['label'], $_SERVER["PHP_SELF"], "c.date_cloture", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
if (!empty($arrayfields['c.note_public']['checked'])) print_liste_field_titre($arrayfields['c.note_public']['label'], $_SERVER["PHP_SELF"], "c.note_public", "", $param, '', $sortfield, $sortorder, 'right ');
if (!empty($arrayfields['c.note_private']['checked'])) print_liste_field_titre($arrayfields['c.note_private']['label'], $_SERVER["PHP_SELF"], "c.note_private", "", $param, '', $sortfield, $sortorder, 'right ');
- if (!empty($arrayfields['c.fk_statut']['checked'])) print_liste_field_titre($arrayfields['c.fk_statut']['label'], $_SERVER["PHP_SELF"], "c.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');
if (!empty($arrayfields['shippable']['checked'])) print_liste_field_titre($arrayfields['shippable']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
if (!empty($arrayfields['c.facture']['checked'])) print_liste_field_titre($arrayfields['c.facture']['label'], $_SERVER["PHP_SELF"], 'c.facture', '', $param, '', $sortfield, $sortorder, 'center ');
+ if (!empty($arrayfields['c.fk_statut']['checked'])) print_liste_field_titre($arrayfields['c.fk_statut']['label'], $_SERVER["PHP_SELF"], "c.fk_statut", "", $param, '', $sortfield, $sortorder, 'center ');
print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'maxwidthsearch center ');
print ' '."\n";
@@ -950,7 +950,7 @@ if ($resql)
$generic_commande->statut = $obj->fk_statut;
$generic_commande->billed = $obj->billed;
$generic_commande->date = $db->jdate($obj->date_commande);
- $generic_commande->date_livraison = $db->jdate($obj->date_delivery); // deprecated
+ $generic_commande->date_livraison = $db->jdate($obj->date_delivery); // deprecated
$generic_commande->delivery_date = $db->jdate($obj->date_delivery);
$generic_commande->ref_client = $obj->ref_client;
$generic_commande->total_ht = $obj->total_ht;
@@ -1218,13 +1218,6 @@ if ($resql)
if (!$i) $totalarray['nbfield']++;
}
- // Status
- if (!empty($arrayfields['c.fk_statut']['checked']))
- {
- print ''.$generic_commande->LibStatut($obj->fk_statut, $obj->billed, 5, 1).' ';
- if (!$i) $totalarray['nbfield']++;
- }
-
// Show shippable Icon (this creates subloops, so may be slow)
if (!empty($arrayfields['shippable']['checked']))
{
@@ -1242,7 +1235,7 @@ if ($resql)
// Get local and virtual stock and store it into cache
if (empty($productstat_cache[$generic_commande->lines[$lig]->fk_product])) {
- $generic_product->load_stock('nobatch'); // ->load_virtual_stock() is already included into load_stock()
+ $generic_product->load_stock('nobatch'); // ->load_virtual_stock() is already included into load_stock()
$productstat_cache[$generic_commande->lines[$lig]->fk_product]['stock_reel'] = $generic_product->stock_reel;
$productstat_cachevirtual[$generic_commande->lines[$lig]->fk_product]['stock_reel'] = $generic_product->stock_theorique;
} else {
@@ -1252,9 +1245,9 @@ if ($resql)
if (empty($conf->global->SHIPPABLE_ORDER_ICON_IN_LIST)) // Default code. Default should be this case.
{
- $text_info .= $generic_commande->lines[$lig]->qty . ' X ' . $generic_commande->lines[$lig]->product_ref . ' ' . dol_trunc($generic_commande->lines[$lig]->product_label, 25);
- $text_info .= ' - ' . $langs->trans("Stock") . ': ' . $generic_product->stock_reel . ' ';
- $text_info .= ' - ' . $langs->trans("VirtualStock") . ': ' . $generic_product->stock_theorique . ' ';
+ $text_info .= $generic_commande->lines[$lig]->qty.' X '.$generic_commande->lines[$lig]->product_ref.' '.dol_trunc($generic_commande->lines[$lig]->product_label, 25);
+ $text_info .= ' - '.$langs->trans("Stock").': '.$generic_product->stock_reel.' ';
+ $text_info .= ' - '.$langs->trans("VirtualStock").': '.$generic_product->stock_theorique.' ';
$text_info .= '' . $langs->trans('Available') . ' : ' . $text_stock_reel . ' ';
+ $text_warning .= ''.$langs->trans('Available').' : '.$text_stock_reel.' ';
}
if ($generic_product->stock_reel < $generic_commande->lines[$lig]->qty) {
$notshippable++;
- $text_info .= '' . $langs->trans('Available') . ' : ' . $text_stock_reel . ' ';
+ $text_info .= ''.$langs->trans('Available').' : '.$text_stock_reel.' ';
} else {
- $text_info .= '' . $langs->trans('Available') . ' : ' . $text_stock_reel . ' ';
+ $text_info .= ''.$langs->trans('Available').' : '.$text_stock_reel.' ';
}
if (!empty($conf->fournisseur->enabled)) {
- $text_info .= ' ' . $langs->trans('SupplierOrder') . ' : ' . $stock_order_supplier . ''.$generic_commande->LibStatut($obj->fk_statut, $obj->billed, 5, 1).' ';
+ if (!$i) $totalarray['nbfield']++;
+ }
+
// Action column
print '';
if ($massactionbutton || $massaction) // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
index 54846a32852..6e5e022c651 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');
@@ -302,11 +302,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/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index 02c89772e94..902a96ec16c 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -225,17 +225,16 @@ if ((GETPOST('confirm_savestatement', 'alpha') || GETPOST('confirm_reconcile', '
if ($num_releve)
{
$bankline = new AccountLine($db);
- if (isset($_POST['rowid']) && is_array($_POST['rowid']))
- {
- foreach ($_POST['rowid'] as $row)
- {
- if ($row > 0)
- {
+
+ $rowids = GETPOST('rowid', 'array');
+
+ if (!empty($rowids) && is_array($rowids)) {
+ foreach ($rowids as $row) {
+ if ($row > 0) {
$result = $bankline->fetch($row);
$bankline->num_releve = $num_releve; //$_POST["num_releve"];
$result = $bankline->update_conciliation($user, GETPOST("cat"), GETPOST('confirm_reconcile', 'alpha') ? 1 : 0); // If we confirm_reconcile, we set flag 'rappro' to 1.
- if ($result < 0)
- {
+ if ($result < 0) {
setEventMessages($bankline->error, $bankline->errors, 'errors');
$error++;
break;
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index be938d3bf70..30e483fdfa9 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -346,7 +346,7 @@ if ($action == 'create')
// Type
print ''.$langs->trans("AccountType").' ';
print '';
- $formbank->selectTypeOfBankAccount(isset($_POST["type"]) ? $_POST["type"] : Account::TYPE_CURRENT, "type");
+ $formbank->selectTypeOfBankAccount(GETPOSTISSET("type") ? GETPOST("type") : Account::TYPE_CURRENT, "type");
print ' ';
$selectedcode = $object->currency_code;
if (!$selectedcode) $selectedcode = $conf->currency;
- print $form->selectCurrency((isset($_POST["account_currency_code"]) ? $_POST["account_currency_code"] : $selectedcode), 'account_currency_code');
+ print $form->selectCurrency((GETPOSTISSET("account_currency_code") ? GETPOST("account_currency_code") : $selectedcode), 'account_currency_code');
//print $langs->trans("Currency".$conf->currency);
//print ' ';
@@ -367,9 +367,8 @@ if ($action == 'create')
// Country
$selectedcode = '';
- if (isset($_POST["account_country_id"]))
- {
- $selectedcode = $_POST["account_country_id"] ? $_POST["account_country_id"] : $object->country_code;
+ if (GETPOSTISSET("account_country_id")) {
+ $selectedcode = GETPOST("account_country_id") ? GETPOST("account_country_id") : $object->country_code;
} elseif (empty($selectedcode)) $selectedcode = $mysoc->country_code;
$object->country_code = getCountry($selectedcode, 2); // Force country code on account to have following field on bank fields matching country rules
@@ -383,7 +382,7 @@ if ($action == 'create')
print ''.$langs->trans('State').' ';
if ($selectedcode)
{
- $formcompany->select_departement(isset($_POST["account_state_id"]) ? $_POST["account_state_id"] : '', $selectedcode, 'account_state_id');
+ $formcompany->select_departement(GETPOSTISSET("account_state_id") ? GETPOST("account_state_id") : '', $selectedcode, 'account_state_id');
} else {
print $countrynotdefined;
}
@@ -408,7 +407,7 @@ if ($action == 'create')
$arrayselected[] = $cat->id;
}
}
- print $form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, '100%');
+ print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
print " '.$langs->trans("Ref").' ';
- print ''.$langs->trans("Label").' ';
- print ''.$langs->trans("AccountType").' ';
print '';
- $formbank->selectTypeOfBankAccount((isset($_POST["type"]) ? $_POST["type"] : $object->type), "type");
+ $formbank->selectTypeOfBankAccount((GETPOSTISSET("type") ? GETPOST("type") : $object->type), "type");
print ' ';
$selectedcode = $object->currency_code;
if (!$selectedcode) $selectedcode = $conf->currency;
- print $form->selectCurrency((isset($_POST["account_currency_code"]) ? $_POST["account_currency_code"] : $selectedcode), 'account_currency_code');
+ print $form->selectCurrency((GETPOSTISSET("account_currency_code") ? GETPOST("account_currency_code") : $selectedcode), 'account_currency_code');
//print $langs->trans("Currency".$conf->currency);
//print ' ';
@@ -845,13 +844,13 @@ if ($action == 'create')
// Status
print ''.$langs->trans("Status").' ';
print '';
- print $form->selectarray("clos", $object->status, (isset($_POST["clos"]) ? $_POST["clos"] : $object->clos));
+ print $form->selectarray("clos", $object->status, (GETPOSTISSET("clos") ? GETPOST("clos") : $object->clos));
print ' '.$langs->trans('State').' ';
if ($selectedcode)
{
- print $formcompany->select_state(isset($_POST["account_state_id"]) ? $_POST["account_state_id"] : $object->state_id, $selectedcode, 'account_state_id');
+ print $formcompany->select_state(GETPOSTISSET("account_state_id") ? GETPOST("account_state_id") : $object->state_id, $selectedcode, 'account_state_id');
} else {
print $countrynotdefined;
}
@@ -882,14 +881,14 @@ if ($action == 'create')
// Balance
print ' '.$langs->trans("BalanceMinimalAllowed").' ';
- print ''.$langs->trans("BalanceMinimalDesired").' ';
- print ''.$langs->trans("Web").' ';
- print '';
print ''.$morehtml.' ';
if ($mode == 'showalltime')
{
- print '';
+ print ' ';
print $langs->trans("GoBack");
print ' ';
} else {
- print '';
+ print ' ';
print $langs->trans("ShowAllTimeBalance");
print ' ';
}
@@ -793,7 +793,7 @@ if ($mode == 'standard')
if ($nextmonth > 12) { $nextmonth = 1; $nextyear++; }
// For month
- $link = "".img_previous('', 'class="valignbottom"')." ".$langs->trans("Month")." ".img_next('', 'class="valignbottom"')." ";
+ $link = "".img_previous('', 'class="valignbottom"')." ".$langs->trans("Month")." ".img_next('', 'class="valignbottom"')." ";
print ''.$link.'
';
print '';
@@ -807,7 +807,7 @@ if ($mode == 'standard')
// For year
$prevyear = $year - 1; $nextyear = $year + 1;
- $link = "
".img_previous('', 'class="valignbottom"')." ".$langs->trans("Year")."
".img_next('', 'class="valignbottom"')." ";
+ $link = "
".img_previous('', 'class="valignbottom"')." ".$langs->trans("Year")."
".img_next('', 'class="valignbottom"')." ";
print '
'.$link.'
';
diff --git a/htdocs/compta/bank/line.php b/htdocs/compta/bank/line.php
index 42bddce5d28..33f7f3a0352 100644
--- a/htdocs/compta/bank/line.php
+++ b/htdocs/compta/bank/line.php
@@ -139,17 +139,17 @@ if ($user->rights->banque->modifier && $action == "update")
$sql = "UPDATE ".MAIN_DB_PREFIX."bank";
$sql .= " SET ";
// Always opened
- if (isset($_POST['value'])) $sql .= " fk_type='".$db->escape(GETPOST('value'))."',";
- if (isset($_POST['num_chq'])) $sql .= " num_chq='".$db->escape(GETPOST("num_chq"))."',";
- if (isset($_POST['banque'])) $sql .= " banque='".$db->escape(GETPOST("banque"))."',";
- if (isset($_POST['emetteur'])) $sql .= " emetteur='".$db->escape(GETPOST("emetteur"))."',";
+ if (GETPOSTISSET('value')) $sql .= " fk_type='".$db->escape(GETPOST('value'))."',";
+ if (GETPOSTISSET('num_chq')) $sql .= " num_chq='".$db->escape(GETPOST("num_chq"))."',";
+ if (GETPOSTISSET('banque')) $sql .= " banque='".$db->escape(GETPOST("banque"))."',";
+ if (GETPOSTISSET('emetteur')) $sql .= " emetteur='".$db->escape(GETPOST("emetteur"))."',";
// Blocked when conciliated
if (!$acline->rappro)
{
- if (isset($_POST['label'])) $sql .= " label = '".$db->escape(GETPOST("label"))."',";
- if (isset($_POST['amount'])) $sql .= " amount= '".$db->escape($amount)."',";
- if (isset($_POST['dateomonth'])) $sql .= " dateo = '".$db->idate($dateop)."',";
- if (isset($_POST['datevmonth'])) $sql .= " datev = '".$db->idate($dateval)."',";
+ if (GETPOSTISSET('label')) $sql .= " label = '".$db->escape(GETPOST("label"))."',";
+ if (GETPOSTISSET('amount')) $sql .= " amount= '".$db->escape($amount)."',";
+ if (GETPOSTISSET('dateomonth')) $sql .= " dateo = '".$db->idate($dateop)."',";
+ if (GETPOSTISSET('datevmonth')) $sql .= " datev = '".$db->idate($dateval)."',";
}
$sql .= " fk_account = ".$actarget->id;
$sql .= " WHERE rowid = ".$acline->id;
@@ -613,7 +613,7 @@ if ($result)
if ($user->rights->banque->consolidate)
{
print '
';
- print ' ';
} else {
print '
'.yn($objp->rappro).' ';
diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index c191c87f219..11dec142a17 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -117,6 +117,8 @@ $usercancreatewithdrarequest = $user->rights->prelevement->bons->creer;
$now = dol_now();
+$error = 0;
+
/*
* Actions
@@ -287,13 +289,21 @@ if (empty($reshook))
elseif ($action == 'setref' && $user->rights->facture->creer)
{
//var_dump(GETPOST('ref', 'alpha'));exit;
- $result = $object->setValueFrom('titre', GETPOST('ref', 'alpha'), '', null, 'text', '', $user, 'BILLREC_MODIFY');
+ $result = $object->setValueFrom('titre', $ref, '', null, 'text', '', $user, 'BILLREC_MODIFY');
if ($result > 0)
{
$object->titre = GETPOST('ref', 'alpha'); // deprecated
$object->title = GETPOST('ref', 'alpha');
$object->ref = $object->title;
- } else dol_print_error($db, $object->error, $object->errors);
+ } else {
+ $error++;
+ if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+ $langs->load("errors");
+ setEventMessages($langs->trans('ErrorRefAlreadyExists', $ref), null, 'errors');
+ } else {
+ setEventMessages($object->error, $object->errors, 'errors');
+ }
+ }
} // Set bank account
elseif ($action == 'setbankaccount' && $user->rights->facture->creer)
{
@@ -1233,7 +1243,7 @@ if ($action == 'create')
print '
';
print '
';
- print '
';
+ print '';
print ''.$langs->trans("Author").' '.$author->getFullName($langs)." ';
- print '';
+ print '';
print $langs->trans('PaymentConditionsShort');
print ' ';
if ($action != 'editconditions' && $user->rights->facture->creer)
@@ -1452,7 +1462,7 @@ if ($action == 'create')
$title = $langs->trans("Recurrence");
//print load_fiche_titre($title, '', 'calendar');
- print '';
+ print '';
print '
';
- print '';
+ print '';
// Nb of generation already done
print ''.$langs->trans("NbOfGenerationDone").' ';
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index a4def0c0b9b..110db6d8166 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -358,26 +358,23 @@ if (empty($reshook))
if ($object->retained_warranty_date_limit < $object->date) $object->retained_warranty_date_limit = $object->date;
$result = $object->update($user);
if ($result < 0) dol_print_error($db, $object->error);
- } elseif ($action == 'setretainedwarranty' && $user->rights->facture->creer)
- {
+ } elseif ($action == 'setretainedwarranty' && $user->rights->facture->creer) {
$object->fetch($id);
$result = $object->setRetainedWarranty(GETPOST('retained_warranty', 'float'));
if ($result < 0)
dol_print_error($db, $object->error);
- } elseif ($action == 'setretainedwarrantydatelimit' && $user->rights->facture->creer)
- {
+ } elseif ($action == 'setretainedwarrantydatelimit' && $user->rights->facture->creer) {
$object->fetch($id);
$result = $object->setRetainedWarrantyDateLimit(GETPOST('retained_warranty_date_limit', 'float'));
if ($result < 0)
dol_print_error($db, $object->error);
- } // Multicurrency Code
+ } // Multicurrency Code
elseif ($action == 'setmulticurrencycode' && $usercancreate) {
$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
} // Multicurrency rate
elseif ($action == 'setmulticurrencyrate' && $usercancreate) {
$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')), GETPOST('calculation_mode', 'int'));
- } elseif ($action == 'setinvoicedate' && $usercancreate)
- {
+ } elseif ($action == 'setinvoicedate' && $usercancreate) {
$object->fetch($id);
$old_date_lim_reglement = $object->date_lim_reglement;
$date = dol_mktime(12, 0, 0, $_POST['invoicedatemonth'], $_POST['invoicedateday'], $_POST['invoicedateyear']);
@@ -395,8 +392,7 @@ if (empty($reshook))
if ($result < 0) {
dol_print_error($db, $object->error);
}
- } elseif ($action == 'setdate_pointoftax' && $usercancreate)
- {
+ } elseif ($action == 'setdate_pointoftax' && $usercancreate) {
$object->fetch($id);
$date_pointoftax = dol_mktime(12, 0, 0, $_POST['date_pointoftaxmonth'], $_POST['date_pointoftaxday'], $_POST['date_pointoftaxyear']);
$object->date_pointoftax = $date_pointoftax;
@@ -2668,7 +2664,8 @@ if (empty($reshook))
if ($result > 0 && $id > 0) {
$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
- $result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
+ $typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+ $result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
}
if ($result >= 0) {
@@ -3419,7 +3416,7 @@ if ($action == 'create')
// Payment mode
print ''.$langs->trans('PaymentMode').' ';
- $form->select_types_paiements(isset($_POST['mode_reglement_id']) ? $_POST['mode_reglement_id'] : $mode_reglement_id, 'mode_reglement_id', 'CRDT');
+ $form->select_types_paiements(GETPOSTISSET('mode_reglement_id') ? GETPOST('mode_reglement_id') : $mode_reglement_id, 'mode_reglement_id', 'CRDT');
print ' '.$langs->trans('Type').' ';
+ print '';
print $object->getLibType();
+ print ' ';
if ($object->module_source) {
- print ' ('.$langs->trans("POS").' '.$object->module_source.' - '.$langs->trans("Terminal").' '.$object->pos_source.') ';
+ print ' ('.$langs->trans("POS").' '.ucfirst($object->module_source).' - '.$langs->trans("Terminal").' '.$object->pos_source.') ';
}
if ($object->type == Facture::TYPE_REPLACEMENT) {
$facreplaced = new Facture($db);
$facreplaced->fetch($object->fk_facture_source);
- print ' ('.$langs->transnoentities("ReplaceInvoice", $facreplaced->getNomUrl(1)).') ';
+ print ' ('.$langs->transnoentities("ReplaceInvoice", $facreplaced->getNomUrl(1)).') ';
}
if ($object->type == Facture::TYPE_CREDIT_NOTE && !empty($object->fk_facture_source)) {
$facusing = new Facture($db);
$facusing->fetch($object->fk_facture_source);
- print ' ('.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1)).') ';
+ print ' ('.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1)).') ';
}
$facidavoir = $object->getListIdAvoirFromInvoice();
if (count($facidavoir) > 0) {
- print ' ('.$langs->transnoentities("InvoiceHasAvoir");
+ print ' ('.$langs->transnoentities("InvoiceHasAvoir");
$i = 0;
foreach ($facidavoir as $id) {
if ($i == 0)
@@ -4105,14 +4104,16 @@ if ($action == 'create')
if ($objectidnext > 0) {
$facthatreplace = new Facture($db);
$facthatreplace->fetch($objectidnext);
- print ' ('.$langs->transnoentities("ReplacedByInvoice", $facthatreplace->getNomUrl(1)).') ';
+ print ' ('.$langs->transnoentities("ReplacedByInvoice", $facthatreplace->getNomUrl(1)).') ';
}
if ($object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT) {
$discount = new DiscountAbsolute($db);
$result = $discount->fetch(0, $object->id);
if ($result > 0) {
- print '. '.$langs->trans("CreditNoteConvertedIntoDiscount", $object->getLibType(1), $discount->getNomUrl(1, 'discount')).' ';
+ print $langs->transnoentities("CreditNoteConvertedIntoDiscount", $object->getLibType(1), $discount->getNomUrl(1, 'discount'));
+ print ' '.$langs->trans(
- "GeneratedFromTemplate",
- ''.$tmptemplate->ref.' '
- ).' ';
+ print ' ';
+ print $langs->transnoentities("GeneratedFromTemplate", ''.dol_escape_htmltag($tmptemplate->ref).' ');
+ print ' ';
}
}
print ' '.$langs->trans('Discounts');
-
print ' ';
$thirdparty = $soc;
$discount_type = 0;
$backtopage = urlencode($_SERVER["PHP_SELF"].'?facid='.$object->id);
include DOL_DOCUMENT_ROOT.'/core/tpl/object_discounts.tpl.php';
-
print ' '.dol_print_date($object->date, 'day').' ';
}
print '';
@@ -4173,7 +4171,7 @@ if ($action == 'create')
if ($action == 'editdate_pointoftax') {
$form->form_date($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->date_pointoftax, 'date_pointoftax');
} else {
- print dol_print_date($object->date_pointoftax, 'day');
+ print ''.dol_print_date($object->date_pointoftax, 'day').' ';
}
print '';
}
@@ -4213,7 +4211,7 @@ if ($action == 'create')
if ($action == 'editpaymentterm') {
$form->form_date($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->date_lim_reglement, 'paymentterm');
} else {
- print dol_print_date($object->date_lim_reglement, 'day');
+ print ''.dol_print_date($object->date_lim_reglement, 'day').' ';
if ($object->hasDelay()) {
print img_warning($langs->trans('Late'));
}
@@ -4788,10 +4786,13 @@ if ($action == 'create')
if ($object->type != Facture::TYPE_CREDIT_NOTE) {
// Total already paid
print '';
- if ($object->type != Facture::TYPE_DEPOSIT)
+ print '';
+ if ($object->type != Facture::TYPE_DEPOSIT) {
print $langs->trans('AlreadyPaidNoCreditNotesNoDeposits');
- else print $langs->trans('AlreadyPaid');
- print ' : '.price($totalpaye).' '.price($totalpaye).' ';
$resteapayeraffiche = $resteapayer;
$cssforamountpaymentcomplete = 'amountpaymentcomplete';
@@ -4812,12 +4813,14 @@ if ($action == 'create')
$obj = $db->fetch_object($resql);
$invoice->fetch($obj->fk_facture_source);
print '';
+ print '';
if ($invoice->type == Facture::TYPE_CREDIT_NOTE)
print $langs->trans("CreditNote").' ';
if ($invoice->type == Facture::TYPE_DEPOSIT)
print $langs->trans("Deposit").' ';
print $invoice->getNomUrl(0);
- print ' : ';
+ print '';
+ print '';
print ''.price($obj->amount_ttc).' ';
print '';
print 'rowid.'">'.img_delete().' ';
@@ -4835,7 +4838,9 @@ if ($action == 'create')
// Paye partiellement 'escompte'
if (($object->statut == Facture::STATUS_CLOSED || $object->statut == Facture::STATUS_ABANDONED) && $object->close_code == 'discount_vat') {
print ' ';
- print $form->textwithpicto($langs->trans("Discount").':', $langs->trans("HelpEscompte"), - 1);
+ print '';
+ print $form->textwithpicto($langs->trans("Discount"), $langs->trans("HelpEscompte"), - 1);
+ print ' ';
print ' '.price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye, 'MT')).' ';
- print $form->textwithpicto($langs->trans("Abandoned").':', $langs->trans("HelpAbandonBadCustomer"), - 1);
+ print '';
+ print $form->textwithpicto($langs->trans("Abandoned"), $langs->trans("HelpAbandonBadCustomer"), - 1);
+ print ' ';
print ' '.price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye, 'MT')).' ';
- print $form->textwithpicto($langs->trans("ProductReturned").':', $langs->trans("HelpAbandonProductReturned"), - 1);
+ print '';
+ print $form->textwithpicto($langs->trans("ProductReturned"), $langs->trans("HelpAbandonProductReturned"), - 1);
+ print ' ';
print ' '.price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye, 'MT')).' '.$langs->trans("Reason").' :'.$object->close_note;
- print $form->textwithpicto($langs->trans("Abandoned").':', $text, - 1);
+ print '';
+ print $form->textwithpicto($langs->trans("Abandoned"), $text, - 1);
+ print ' ';
print ''.price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye, 'MT')).' ';
$resteapayeraffiche = 0;
$cssforamountpaymentcomplete = 'amountpaymentneutral';
}
// Billed
- print ''.$langs->trans("Billed").' : '.price($object->total_ttc).' ';
+ print '';
+ print $langs->trans("Billed");
+ print ' '.price($object->total_ttc).' ';
+ print '';
print $langs->trans('RemainderToPay');
if ($resteapayeraffiche < 0)
print ' ('.$langs->trans('ExcessReceived').')';
- print ' : ';
+ print '';
+ print '';
print ''.price($resteapayeraffiche).' ';
print ' '.$langs->trans("Invoice").' ';
- if ($this->type == self::TYPE_REPLACEMENT) $label = ''.$langs->transnoentitiesnoconv("ReplacementInvoice").' ';
- if ($this->type == self::TYPE_CREDIT_NOTE) $label = ''.$langs->transnoentitiesnoconv("CreditNote").' ';
- if ($this->type == self::TYPE_DEPOSIT) $label = ''.$langs->transnoentitiesnoconv("Deposit").' ';
- if ($this->type == self::TYPE_SITUATION) $label = ''.$langs->transnoentitiesnoconv("InvoiceSituation").' ';
+ $label = img_picto('', $picto).' '.$langs->trans("Invoice").' ';
+ if ($this->type == self::TYPE_REPLACEMENT) $label = img_picto('', $picto).' '.$langs->transnoentitiesnoconv("ReplacementInvoice").' ';
+ if ($this->type == self::TYPE_CREDIT_NOTE) $label = img_picto('', $picto).' '.$langs->transnoentitiesnoconv("CreditNote").' ';
+ if ($this->type == self::TYPE_DEPOSIT) $label = img_picto('', $picto).' '.$langs->transnoentitiesnoconv("Deposit").' ';
+ if ($this->type == self::TYPE_SITUATION) $label = img_picto('', $picto).' '.$langs->transnoentitiesnoconv("InvoiceSituation").' ';
if (isset($this->statut) && isset($this->alreadypaid)) {
$label .= ' '.$this->getLibStatut(5, $this->alreadypaid);
}
@@ -3295,6 +3287,7 @@ class Facture extends CommonInvoice
$localtaxes_type = getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
// Clean vat code
+ $reg = array();
$vat_src_code = '';
if (preg_match('/\((.*)\)/', $txtva, $reg))
{
diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php
index 57532174db7..6b8758bc472 100644
--- a/htdocs/compta/facture/contact.php
+++ b/htdocs/compta/facture/contact.php
@@ -62,7 +62,8 @@ if ($action == 'addcontact' && $user->rights->facture->creer)
if ($result > 0 && $id > 0)
{
$contactid = (GETPOST('userid') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
- $result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
+ $typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+ $result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
}
if ($result >= 0)
diff --git a/htdocs/compta/facture/index.php b/htdocs/compta/facture/index.php
index eb73132c69f..e96371ad4f4 100644
--- a/htdocs/compta/facture/index.php
+++ b/htdocs/compta/facture/index.php
@@ -192,10 +192,10 @@ function getPieChart($socid = 0)
{
$dolgraph = new DolGraph();
$dolgraph->SetData($dataseries);
- $dolgraph->setShowLegend(1);
+ $dolgraph->setShowLegend(2);
$dolgraph->setShowPercent(1);
$dolgraph->SetType(['pie']);
- $dolgraph->setWidth('100%');
+ $dolgraph->setHeight('200');
$dolgraph->draw('idgraphthirdparties');
$result .= '';
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index b693238924f..c61bfdf6819 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -128,7 +128,7 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
$sortfield = GETPOST("sortfield", 'alpha');
$sortorder = GETPOST("sortorder", 'alpha');
$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1 || !empty($search_btn) || !empty($search_remove_btn) || (empty($toselect) && $massaction === '0')) { $page = 0; } // If $page is not defined, or '' or -1
+if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) { $page = 0; } // If $page is not defined, or '' or -1 or if we click on clear filters
$offset = $limit * $page;
if (!$sortorder && !empty($conf->global->INVOICE_DEFAULT_UNPAYED_SORT_ORDER) && $search_status == '1') $sortorder = $conf->global->INVOICE_DEFAULT_UNPAYED_SORT_ORDER;
if (!$sortorder) $sortorder = 'DESC';
@@ -223,7 +223,7 @@ if ($conf->global->INVOICE_USE_SITUATION && $conf->global->INVOICE_USE_RETAINED_
}
// Extra fields
-include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_array_fields.tpl.php';
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
$object->fields = dol_sort_array($object->fields, 'position');
$arrayfields = dol_sort_array($arrayfields, 'position');
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 792ff73bcd3..7e852846d5c 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -632,10 +632,10 @@ if ($object->id > 0)
print "\n\n";
$buttonlabel = $langs->trans("MakeWithdrawRequest");
- $user_perms=$user->rights->prelevement->bons->creer;
+ $user_perms = $user->rights->prelevement->bons->creer;
if ($type == 'bank-transfer') {
$buttonlabel = $langs->trans("MakeBankTransferOrder");
- $user_perms=$user->rights->paymentbybanktransfer->create;
+ $user_perms = $user->rights->paymentbybanktransfer->create;
}
// Add a transfer request
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index 9cbd826b4a1..13378979932 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_charge.php b/htdocs/compta/paiement_charge.php
index b9aa625c06d..299cdf9a6c3 100644
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -222,21 +222,21 @@ if ($action == 'create')
print '
'.$langs->trans("RemainderToPay").' '.price($total-$sumpaid,0,$outputlangs,1,-1,-1,$conf->currency).' '.$langs->trans("Date").' ';
- $datepaye = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
- $datepayment = empty($conf->global->MAIN_AUTOFILL_DATE) ? (empty($_POST["remonth"]) ?-1 : $datepaye) : 0;
+ $datepaye = dol_mktime(12, 0, 0, GETPOST("remonth", 'int'), GETPOST("reday", 'int'), GETPOST("reyear", 'int'));
+ $datepayment = empty($conf->global->MAIN_AUTOFILL_DATE) ? (GETPOSTISSET("remonth") ? $datepaye : -1) : 0;
print $form->selectDate($datepayment, '', '', '', 0, "add_payment", 1, 1, 0, '', '', $charge->date_ech, '', 1, $langs->trans("DateOfSocialContribution"));
print " ";
print ''.$langs->trans("PaymentMode").' ';
- $form->select_types_paiements(isset($_POST["paiementtype"]) ? $_POST["paiementtype"] : $charge->paiementtype, "paiementtype");
+ $form->select_types_paiements(GETPOSTISSET("paiementtype") ? GETPOST("paiementtype") : $charge->paiementtype, "paiementtype");
print " \n";
print '';
print ''.$langs->trans('AccountToDebit').' ';
print '';
- $form->select_comptes(isset($_POST["accountid"]) ? $_POST["accountid"] : $charge->accountid, "accountid", 0, '', 2); // Show opend bank account list
+ $form->select_comptes(GETPOSTISSET("accountid") ? GETPOST("accountid") : $charge->accountid, "accountid", 0, '', 2); // Show opend bank account list
print ' ';
// Number
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 21bf795079a..fb2f114b579 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -164,12 +164,12 @@ class BonPrelevement extends CommonObject
$result = 0;
} else {
$result = -1;
- $this->errors[] = get_class($this)."::AddFacture " . $this->db->lasterror;
+ $this->errors[] = get_class($this)."::AddFacture ".$this->db->lasterror;
dol_syslog(get_class($this)."::AddFacture Error $result");
}
} else {
$result = -2;
- $this->errors[]=get_class($this)."::AddFacture linedid Empty";
+ $this->errors[] = get_class($this)."::AddFacture linedid Empty";
dol_syslog(get_class($this)."::AddFacture Error $result");
}
} else {
@@ -247,7 +247,7 @@ class BonPrelevement extends CommonObject
$line_id = $this->db->last_insert_id(MAIN_DB_PREFIX."prelevement_lignes");
$result = 0;
} else {
- $this->errors[]=get_class($this)."::addline Error -2 " .$this->db->lasterror;
+ $this->errors[] = get_class($this)."::addline Error -2 ".$this->db->lasterror;
dol_syslog(get_class($this)."::addline Error -2");
$result = -2;
}
@@ -1124,7 +1124,7 @@ class BonPrelevement extends CommonObject
if (!$resql)
{
$error++;
- $this->errors[]=$this->db->lasterror();
+ $this->errors[] = $this->db->lasterror();
dol_syslog(__METHOD__."::Update Error=".$this->db->lasterror(), LOG_ERR);
}
}
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index bd97f88ff65..752bdc4d642 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -893,7 +893,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
*/
// We set country_id, and country_code label of the chosen country
- if (isset($_POST["country_id"]) || $object->country_id)
+ if (GETPOSTISSET("country_id") || $object->country_id)
{
$tmparray = getCountry($object->country_id, 'all');
$object->country_code = $tmparray['code'];
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 59423ec2b42..6c6133e906a 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -805,19 +805,16 @@ class Contact extends CommonObject
}
// Mis a jour alerte birthday
- if ($this->birthday_alert)
- {
+ if (!empty($this->birthday_alert)) {
//check existing
$sql_check = "SELECT rowid FROM ".MAIN_DB_PREFIX."user_alert WHERE type=1 AND fk_contact=".$this->db->escape($id)." AND fk_user=".$user->id;
$result_check = $this->db->query($sql_check);
- if (!$result_check || ($this->db->num_rows($result_check) < 1))
- {
+ if (!$result_check || ($this->db->num_rows($result_check) < 1)) {
//insert
$sql = "INSERT INTO ".MAIN_DB_PREFIX."user_alert(type,fk_contact,fk_user) ";
$sql .= "VALUES (1,".$this->db->escape($id).",".$user->id.")";
$result = $this->db->query($sql);
- if (!$result)
- {
+ if (!$result) {
$error++;
$this->error = $this->db->lasterror();
}
@@ -828,23 +825,20 @@ class Contact extends CommonObject
$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_alert ";
$sql .= "WHERE type=1 AND fk_contact=".$this->db->escape($id)." AND fk_user=".$user->id;
$result = $this->db->query($sql);
- if (!$result)
- {
+ if (!$result) {
$error++;
$this->error = $this->db->lasterror();
}
}
- if (!$error && !$notrigger)
- {
+ if (!$error && !$notrigger) {
// Call trigger
$result = $this->call_trigger('CONTACT_MODIFY', $user);
if ($result < 0) { $error++; }
// End call triggers
}
- if (!$error)
- {
+ if (!$error) {
$this->db->commit();
return 1;
} else {
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 16f7ea82f36..5b8c708b1b2 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -203,7 +203,7 @@ if (!empty($conf->socialnetworks->enabled)) {
}
// Extra fields
-include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_array_fields.tpl.php';
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
$object->fields = dol_sort_array($object->fields, 'position');
$arrayfields = dol_sort_array($arrayfields, 'position');
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 68582d2fb33..a92ac8a1e73 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -946,7 +946,8 @@ if (empty($reshook))
if ($action == 'addcontact')
{
$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
- $result = $object->add_contact($contactid, GETPOST('type'), GETPOST('source'));
+ $typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+ $result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
if ($result >= 0)
{
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 99544b1037d..9e277fd706b 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -1469,9 +1469,9 @@ class Contrat extends CommonObject
}
$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/contrat/contact.php b/htdocs/contrat/contact.php
index 24b0ff54bf6..c837769819a 100644
--- a/htdocs/contrat/contact.php
+++ b/htdocs/contrat/contact.php
@@ -63,7 +63,8 @@ if ($action == 'addcontact' && $user->rights->contrat->creer)
if ($result > 0 && $id > 0)
{
$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
- $result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
+ $typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+ $result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
}
if ($result >= 0)
diff --git a/htdocs/core/actions_addupdatedelete.inc.php b/htdocs/core/actions_addupdatedelete.inc.php
index ad36a6e5ee7..80f16cb037d 100644
--- a/htdocs/core/actions_addupdatedelete.inc.php
+++ b/htdocs/core/actions_addupdatedelete.inc.php
@@ -62,7 +62,7 @@ if ($action == 'add' && !empty($permissiontoadd))
// Ignore special fields
if (in_array($key, array('rowid', 'entity', 'import_key'))) continue;
if (in_array($key, array('date_creation', 'tms', 'fk_user_creat', 'fk_user_modif'))) {
- if (!in_array(abs($val['visible']), array(1, 3))) continue; // Only 1 and 3 that are case to create
+ if (!in_array(abs($val['visible']), array(1, 3))) continue; // Only 1 and 3 that are case to create
}
// Set value to insert
@@ -146,7 +146,7 @@ if ($action == 'update' && !empty($permissiontoadd))
// Ignore special fields
if (in_array($key, array('rowid', 'entity', 'import_key'))) continue;
if (in_array($key, array('date_creation', 'tms', 'fk_user_creat', 'fk_user_modif'))) {
- if (!in_array(abs($val['visible']), array(1, 3, 4))) continue; // Only 1 and 3 and 4 that are case to update
+ if (!in_array(abs($val['visible']), array(1, 3, 4))) continue; // Only 1 and 3 and 4 that are case to update
}
// Set value to update
diff --git a/htdocs/core/actions_extrafields.inc.php b/htdocs/core/actions_extrafields.inc.php
index 9ad3ce1e92e..d5936a6dadb 100644
--- a/htdocs/core/actions_extrafields.inc.php
+++ b/htdocs/core/actions_extrafields.inc.php
@@ -40,7 +40,7 @@ if ($type == 'select') $extrasize = '';
// Add attribute
if ($action == 'add')
{
- if ($_POST["button"] != $langs->trans("Cancel"))
+ if (GETPOST("button") != $langs->trans("Cancel"))
{
// Check values
if (!$type)
@@ -132,11 +132,28 @@ if ($action == 'add')
}
}
- if (!$error)
- {
+ if (!$error) {
+ if (strlen(GETPOST('attrname', 'aZ09')) < 3) {
+ $error++;
+ $langs->load("errors");
+ $mesg[] = $langs->trans("ErrorValueLength", $langs->transnoentitiesnoconv("AttributeCode"), 3);
+ $action = 'create';
+ }
+ }
+
+ // Check reserved keyword with more than 3 characters
+ if (!$error) {
+ if (in_array(GETPOST('attrname', 'aZ09'), array('and', 'keyword', 'table', 'index', 'integer', 'float', 'double', 'position'))) {
+ $error++;
+ $langs->load("errors");
+ $mesg[] = $langs->trans("ErrorReservedKeyword", GETPOST('attrname', 'aZ09'));
+ $action = 'create';
+ }
+ }
+
+ if (!$error) {
// attrname must be alphabetical and lower case only
- if (isset($_POST["attrname"]) && preg_match("/^[a-z0-9-_]+$/", $_POST['attrname']) && !is_numeric($_POST["attrname"]))
- {
+ if (GETPOSTISSET("attrname") && preg_match("/^[a-z0-9-_]+$/", GETPOST('attrname', 'aZ09')) && !is_numeric(GETPOST('attrname', 'aZ09'))) {
// Construct array for parameter (value of select list)
$default_value = GETPOST('default_value', 'alpha');
$parameters = $param;
@@ -148,7 +165,7 @@ if ($action == 'add')
$params['options'] = array($parameters=>null);
}
} else {
- //Esle it's separated key/value and coma list
+ // Else it's separated key/value and coma list
foreach ($parameters_array as $param_ligne)
{
list($key, $value) = explode(',', $param_ligne);
@@ -161,7 +178,7 @@ if ($action == 'add')
if ($type == 'separate') $visibility = 3;
$result = $extrafields->addExtraField(
- GETPOST('attrname', 'alpha'),
+ GETPOST('attrname', 'aZ09'),
GETPOST('label', 'alpha'),
$type,
GETPOST('pos', 'int'),
@@ -208,7 +225,7 @@ if ($action == 'add')
// Rename field
if ($action == 'update')
{
- if ($_POST["button"] != $langs->trans("Cancel"))
+ if (GETPOST("button") != $langs->trans("Cancel"))
{
// Check values
if (!$type)
@@ -293,9 +310,28 @@ if ($action == 'update')
}
}
+ if (!$error) {
+ if (strlen(GETPOST('attrname', 'aZ09')) < 3 && empty($conf->global->MAIN_DISABLE_EXTRAFIELDS_CHECK_FOR_UPDATE)) {
+ $error++;
+ $langs->load("errors");
+ $mesg[] = $langs->trans("ErrorValueLength", $langs->transnoentitiesnoconv("AttributeCode"), 3);
+ $action = 'edit';
+ }
+ }
+
+ // Check reserved keyword with more than 3 characters
+ if (!$error) {
+ if (in_array(GETPOST('attrname', 'aZ09'), array('and', 'keyword', 'table', 'index', 'integer', 'float', 'double', 'position')) && empty($conf->global->MAIN_DISABLE_EXTRAFIELDS_CHECK_FOR_UPDATE)) {
+ $error++;
+ $langs->load("errors");
+ $mesg[] = $langs->trans("ErrorReservedKeyword", GETPOST('attrname', 'aZ09'));
+ $action = 'edit';
+ }
+ }
+
if (!$error)
{
- if (isset($_POST["attrname"]) && preg_match("/^\w[a-zA-Z0-9-_]*$/", $_POST['attrname']))
+ if (GETPOSTISSET("attrname") && preg_match("/^\w[a-zA-Z0-9-_]*$/", GETPOST('attrname', 'aZ09')) && !is_numeric(GETPOST('attrname', 'aZ09')))
{
$pos = GETPOST('pos', 'int');
// Construct array for parameter (value of select list)
@@ -321,7 +357,7 @@ if ($action == 'update')
if ($type == 'separate') $visibility = 3;
$result = $extrafields->update(
- GETPOST('attrname', 'alpha'),
+ GETPOST('attrname', 'aZ09'),
GETPOST('label', 'alpha'),
$type,
$extrasize,
@@ -338,12 +374,11 @@ if ($action == 'update')
GETPOST('computed_value', 'alpha'),
(GETPOST('entitycurrentorall', 'alpha') ? 0 : ''),
GETPOST('langfile'),
- GETPOST('enabled', 'alpha'),
+ GETPOST('enabled', 'alpha'),
(GETPOST('totalizable', 'alpha') ? 1 : 0),
GETPOST('printable', 'alpha')
);
- if ($result > 0)
- {
+ if ($result > 0) {
setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
header("Location: ".$_SERVER["PHP_SELF"]);
exit;
@@ -365,13 +400,10 @@ if ($action == 'update')
}
// Delete attribute
-if ($action == 'delete')
-{
- if (isset($_GET["attrname"]) && preg_match("/^\w[a-zA-Z0-9-_]*$/", $_GET["attrname"]))
- {
- $result = $extrafields->delete($_GET["attrname"], $elementtype);
- if ($result >= 0)
- {
+if ($action == 'delete') {
+ if (GETPOSTISSET("attrname") && preg_match("/^\w[a-zA-Z0-9-_]*$/", GETPOST("attrname", 'aZ09'))) {
+ $result = $extrafields->delete(GETPOST("attrname", 'aZ09'), $elementtype);
+ if ($result >= 0) {
header("Location: ".$_SERVER["PHP_SELF"]);
exit;
} else $mesg = $extrafields->error;
diff --git a/htdocs/core/boxes/box_birthdays.php b/htdocs/core/boxes/box_birthdays.php
index 7c33ace20ab..dcb3fefe13a 100644
--- a/htdocs/core/boxes/box_birthdays.php
+++ b/htdocs/core/boxes/box_birthdays.php
@@ -89,7 +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 .= " 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_customers_outstanding_bill_reached.php b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
new file mode 100644
index 00000000000..f4f4d5015cc
--- /dev/null
+++ b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
@@ -0,0 +1,193 @@
+
+ * Copyright (C) 2004-2010 Laurent Destailleur
+ * Copyright (C) 2005-2009 Regis Houssin
+ * Copyright (C) 2015 Frederic 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
+ * 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
- * Copyright (C) 2014-2015 Frederic France
+ * Copyright (C) 2014-2020 Frederic 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
@@ -107,10 +107,10 @@ class box_lastlogin extends ModeleBoxes
* @param array $head Array with properties of box title
* @param array $contents Array with properties of box lines
* @param int $nooutput No print, only return string
- * @return void
+ * @return string
*/
public function showBox($head = null, $contents = null, $nooutput = 0)
{
- parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+ return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}
diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php
index 06808ab2518..dc7f79721d1 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_task.php b/htdocs/core/boxes/box_task.php
index f2bfd523d75..16b96e23466 100644
--- a/htdocs/core/boxes/box_task.php
+++ b/htdocs/core/boxes/box_task.php
@@ -137,7 +137,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/boxes/intracommreport_box.php b/htdocs/core/boxes/intracommreport_box.php
deleted file mode 100644
index d7c383138b6..00000000000
--- a/htdocs/core/boxes/intracommreport_box.php
+++ /dev/null
@@ -1,88 +0,0 @@
-
- * Copyright (C)
- *
- * 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 ";
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index bc1c17d417f..33ac1aba696 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -936,11 +936,11 @@ abstract class CommonObject
/**
* Add a link between element $this->element and a contact
*
- * @param int $fk_socpeople Id of thirdparty contact (if source = 'external') or id of user (if souce = 'internal') to link
- * @param int $type_contact Type of contact (code or id). Must be id or code found into table llx_c_type_contact. For example: SALESREPFOLL
- * @param string $source external=Contact extern (llx_socpeople), internal=Contact intern (llx_user)
- * @param int $notrigger Disable all triggers
- * @return int <0 if KO, >0 if OK
+ * @param int $fk_socpeople Id of thirdparty contact (if source = 'external') or id of user (if souce = 'internal') to link
+ * @param int|string $type_contact Type of contact (code or id). Must be id or code found into table llx_c_type_contact. For example: SALESREPFOLL
+ * @param string $source external=Contact extern (llx_socpeople), internal=Contact intern (llx_user)
+ * @param int $notrigger Disable all triggers
+ * @return int <0 if KO, >0 if OK
*/
public function add_contact($fk_socpeople, $type_contact, $source = 'external', $notrigger = 0)
{
@@ -1817,7 +1817,11 @@ abstract class CommonObject
return -2;
}
} else {
- $this->error = $this->db->lasterror();
+ if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+ $this->error = 'DB_ERROR_RECORD_ALREADY_EXISTS';
+ } else {
+ $this->error = $this->db->lasterror();
+ }
$this->db->rollback();
return -1;
}
@@ -5092,7 +5096,7 @@ abstract class CommonObject
global $conf, $extrafields;
if (empty($rowid)) $rowid = $this->id;
- if (empty($rowid) && isset($this->rowid)) $rowid = $this->rowid; // deprecated
+ if (empty($rowid) && isset($this->rowid)) $rowid = $this->rowid; // deprecated
// To avoid SQL errors. Probably not the better solution though
if (!$this->table_element) {
@@ -5417,26 +5421,20 @@ abstract class CommonObject
$sql .= ",".$attributeKey;
}
// We must insert a default value for fields for other entities that are mandatory to avoid not null error
- if (is_array($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities']))
- {
- foreach ($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as $tmpkey => $tmpval)
- {
- if (!isset($extrafields->attributes[$this->table_element]['type'][$tmpkey])) // If field not already added previously
- {
+ if (!empty($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities']) && is_array($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'])) {
+ foreach ($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as $tmpkey => $tmpval) {
+ if (!isset($extrafields->attributes[$this->table_element]['type'][$tmpkey])) { // If field not already added previously
$sql .= ",".$tmpkey;
}
}
}
$sql .= ") VALUES (".$this->id;
- foreach ($new_array_options as $key => $value)
- {
+ foreach ($new_array_options as $key => $value) {
$attributeKey = substr($key, 8); // Remove 'options_' prefix
// Add field of attribute
- if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator)
- {
- if ($new_array_options[$key] != '' || $new_array_options[$key] == '0')
- {
+ if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') { // Only for other type than separator)
+ if ($new_array_options[$key] != '' || $new_array_options[$key] == '0') {
$sql .= ",'".$this->db->escape($new_array_options[$key])."'";
} else {
$sql .= ",null";
@@ -5444,12 +5442,9 @@ abstract class CommonObject
}
}
// We must insert a default value for fields for other entities that are mandatory to avoid not null error
- if (is_array($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities']))
- {
- foreach ($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as $tmpkey => $tmpval)
- {
- if (!isset($extrafields->attributes[$this->table_element]['type'][$tmpkey])) // If field not already added previously
- {
+ if (!empty($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities']) && is_array($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'])) {
+ foreach ($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as $tmpkey => $tmpval) {
+ if (!isset($extrafields->attributes[$this->table_element]['type'][$tmpkey])) { // If field not already added previously
if (in_array($tmpval, array('int', 'double', 'price'))) $sql .= ", 0";
else $sql .= ", ''";
}
@@ -5939,7 +5934,7 @@ abstract class CommonObject
$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('duration'))) {
$out = $form->select_duration($keyprefix.$key.$keysuffix, $value, 0, 'text', 0, 1);
- } elseif (in_array($type, array('int', 'integer'))) {
+ } elseif (in_array($type, array('int', 'integer'))) {
$tmp = explode(',', $size);
$newsize = $tmp[0];
$out = ' >
global->MAIN_VIEW_LINE_NUMBER)) { ?>
-
select_resource_list('', 'fk_resource', '', 1, 1, 0, $events, '', 2, null);
$out .= '';
-$out .= ''.$langs->trans('Busy').' '.$form->selectyesno('busy', (isset($_POST['busy']) ? $_POST['busy'] : 1), 1).'
';
-$out .= ''.$langs->trans('Mandatory').' '.$form->selectyesno('mandatory', (isset($_POST['mandatory']) ? $_POST['mandatory'] : 0), 1).'
';
+$out .= ''.$langs->trans('Busy').' '.$form->selectyesno('busy', (GETPOSTISSET('busy') ? GETPOST('busy') : 1), 1).'
';
+$out .= ''.$langs->trans('Mandatory').' '.$form->selectyesno('mandatory', (GETPOSTISSET('mandatory') ? GETPOST('mandatory') : 0), 1).'
';
$out .= '';
$out .= '
';
diff --git a/htdocs/core/triggers/interface_20_all_Logevents.class.php b/htdocs/core/triggers/interface_20_all_Logevents.class.php
index e1bcaf85034..48c9614dea6 100644
--- a/htdocs/core/triggers/interface_20_all_Logevents.class.php
+++ b/htdocs/core/triggers/interface_20_all_Logevents.class.php
@@ -174,7 +174,7 @@ class InterfaceLogevents extends DolibarrTriggers
$event->dateevent = $date;
$event->label = $text;
$event->description = $desc;
- $event->user_agent = (empty($_SERVER["HTTP_USER_AGENT"])?'':$_SERVER["HTTP_USER_AGENT"]);
+ $event->user_agent = (empty($_SERVER["HTTP_USER_AGENT"]) ? '' : $_SERVER["HTTP_USER_AGENT"]);
$result = $event->create($user);
if ($result > 0) {
diff --git a/htdocs/delivery/class/delivery.class.php b/htdocs/delivery/class/delivery.class.php
index 3c4d53f53e7..394e86fdd78 100644
--- a/htdocs/delivery/class/delivery.class.php
+++ b/htdocs/delivery/class/delivery.class.php
@@ -102,6 +102,8 @@ class Delivery extends CommonObject
*/
public $model_pdf;
+ public $lines = array();
+
/**
* Constructor
@@ -111,8 +113,6 @@ class Delivery extends CommonObject
public function __construct($db)
{
$this->db = $db;
- $this->lines = array();
- $this->products = array();
// List of short language codes for status
$this->statuts[-1] = 'StatusDeliveryCanceled';
diff --git a/htdocs/document.php b/htdocs/document.php
index c48a0363f78..060722e8d5b 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -245,7 +245,7 @@ if (!file_exists($fullpath_original_file_osencoded))
// Hooks
if (!is_object($hookmanager)) {
- include_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
+ include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
$hookmanager = new HookManager($this->db);
}
$hookmanager->initHooks(array('document'));
@@ -254,9 +254,9 @@ $parameters = array('ecmfile' => $ecmfile, 'modulepart' => $modulepart, 'origina
'filename' => $filename, 'fullpath_original_file_osencoded' => $fullpath_original_file_osencoded);
$reshook = $hookmanager->executeHooks('downloadDocument', $parameters); // Note that $action and $object may have been
if ($reshook < 0) {
- $errors = $hookmanager->error . (is_array($hookmanager->errors) ? (!empty($hookmanager->error) ? ', ' : '') . join($separator, $hookmanager->errors) : '');
- dol_syslog("document.php - Errors when executing the hook 'downloadDocument' : " . $errors);
- print "ErrorDownloadDocumentHooks: " . $errors;
+ $errors = $hookmanager->error.(is_array($hookmanager->errors) ? (!empty($hookmanager->error) ? ', ' : '').join($separator, $hookmanager->errors) : '');
+ dol_syslog("document.php - Errors when executing the hook 'downloadDocument' : ".$errors);
+ print "ErrorDownloadDocumentHooks: ".$errors;
exit;
}
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index 0f4b2054619..c55751e913f 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -418,9 +418,9 @@ if ($action == 'create')
// Zip / Town
print '
'.$langs->trans("Zip").' / '.$langs->trans("Town").' ';
- print $formcompany->select_ziptown((isset($_POST["zipcode"]) ? $_POST["zipcode"] : $object->zip), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6);
+ print $formcompany->select_ziptown((GETPOSTISSET("zipcode") ? GETPOST("zipcode") : $object->zip), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6);
print ' ';
- print $formcompany->select_ziptown((isset($_POST["town"]) ? $_POST["town"] : $object->town), 'town', array('zipcode', 'selectcountry_id', 'state_id'));
+ print $formcompany->select_ziptown((GETPOSTISSET("town") ? GETPOST("town") : $object->town), 'town', array('zipcode', 'selectcountry_id', 'state_id'));
print ' ';
// Country
@@ -560,9 +560,9 @@ if (!empty($id) && $action == 'edit')
// Zip / Town
print '
'.$langs->trans("Zip").' / '.$langs->trans("Town").' ';
- print $formcompany->select_ziptown((isset($_POST["zipcode"]) ? $_POST["zipcode"] : $object->zip), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6);
+ print $formcompany->select_ziptown((GETPOSTISSET("zipcode") ? GETPOSTISSET("zipcode") : $object->zip), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6);
print ' ';
- print $formcompany->select_ziptown((isset($_POST["town"]) ? $_POST["town"] : $object->town), 'town', array('zipcode', 'selectcountry_id', 'state_id'));
+ print $formcompany->select_ziptown((GETPOSTISSET("town") ? GETPOST("town") : $object->town), 'town', array('zipcode', 'selectcountry_id', 'state_id'));
print ' ';
// Country
diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index f2b87382c76..ca2b9fec473 100644
--- a/htdocs/ecm/class/ecmdirectory.class.php
+++ b/htdocs/ecm/class/ecmdirectory.class.php
@@ -62,8 +62,19 @@ class EcmDirectory extends CommonObject
*/
public $description;
+ /**
+ * @var int cache nb of doc
+ */
public $cachenbofdoc = -1; // By default cache initialized with value 'not calculated'
+
+ /**
+ * @var int date_c
+ */
public $date_c;
+
+ /**
+ * @var int date_m
+ */
public $date_m;
/**
@@ -81,25 +92,31 @@ class EcmDirectory extends CommonObject
*/
public $ref;
+ /**
+ * @var array array of categories
+ */
public $cats = array();
+
+ /**
+ * @var array array of children categories
+ */
public $motherof = array();
+ /**
+ * @var array array of forbidden chars
+ */
public $forbiddenchars = array('<', '>', ':', '/', '\\', '?', '*', '|', '"');
+
+ /**
+ * @var array array of forbidden chars for dir
+ */
public $forbiddencharsdir = array('<', '>', ':', '?', '*', '|', '"');
+ /**
+ * @var int 1 if full arbo loaded
+ */
public $full_arbo_loaded;
- /**
- * @var string Error code (or message)
- */
- public $error;
-
- /**
- * @var string[] Error codes (or messages)
- */
- public $errors = array();
-
-
/**
* Constructor
*
@@ -131,13 +148,14 @@ class EcmDirectory extends CommonObject
$this->description = trim($this->description);
$this->date_c = $now;
$this->fk_user_c = $user->id;
- if ($this->fk_parent <= 0) $this->fk_parent = 0;
+ if ($this->fk_parent <= 0) {
+ $this->fk_parent = 0;
+ }
// Check if same directory does not exists with this name
$relativepath = $this->label;
- if ($this->fk_parent)
- {
+ if ($this->fk_parent) {
$parent = new EcmDirectory($this->db);
$parent->fetch($this->fk_parent);
$relativepath = $parent->getRelativePath().$relativepath;
@@ -148,19 +166,16 @@ class EcmDirectory extends CommonObject
$cat = new EcmDirectory($this->db);
$cate_arbo = $cat->get_full_arbo(1);
$pathfound = 0;
- foreach ($cate_arbo as $key => $categ)
- {
+ foreach ($cate_arbo as $key => $categ) {
$path = str_replace($this->forbiddencharsdir, '_', $categ['fullrelativename']);
//print $relativepath.' - '.$path.'
';
- if ($path == $relativepath)
- {
+ if ($path == $relativepath) {
$pathfound = 1;
break;
}
}
- if ($pathfound)
- {
+ if ($pathfound) {
$this->error = "ErrorDirAlreadyExists";
dol_syslog(get_class($this)."::create ".$this->error, LOG_WARNING);
return -1;
@@ -188,21 +203,23 @@ class EcmDirectory extends CommonObject
dol_syslog(get_class($this)."::create", LOG_DEBUG);
$resql = $this->db->query($sql);
- if ($resql)
- {
+ if ($resql) {
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."ecm_directories");
$dir = $conf->ecm->dir_output.'/'.$this->getRelativePath();
$result = dol_mkdir($dir);
- if ($result < 0) { $error++; $this->error = "ErrorFailedToCreateDir"; }
+ if ($result < 0) {
+ $error++; $this->error = "ErrorFailedToCreateDir";
+ }
// Call trigger
$result = $this->call_trigger('MYECMDIR_CREATE', $user);
- if ($result < 0) { $error++; }
+ if ($result < 0) {
+ $error++;
+ }
// End call triggers
- if (!$error)
- {
+ if (!$error) {
$this->db->commit();
return $this->id;
} else {
@@ -249,22 +266,21 @@ class EcmDirectory extends CommonObject
dol_syslog(get_class($this)."::update", LOG_DEBUG);
$resql = $this->db->query($sql);
- if (!$resql)
- {
+ if (!$resql) {
$error++;
$this->error = "Error ".$this->db->lasterror();
}
- if (!$error && !$notrigger)
- {
+ if (!$error && !$notrigger) {
// Call trigger
$result = $this->call_trigger('MYECMDIR_MODIFY', $user);
- if ($result < 0) { $error++; }
+ if ($result < 0) {
+ $error++;
+ }
// End call triggers
}
- if (!$error)
- {
+ if (!$error) {
$this->db->commit();
return 1;
} else {
@@ -284,20 +300,26 @@ class EcmDirectory extends CommonObject
{
// Update request
$sql = "UPDATE ".MAIN_DB_PREFIX."ecm_directories SET";
- if (preg_match('/[0-9]+/', $value)) $sql .= " cachenbofdoc = ".(int) $value;
- else $sql .= " cachenbofdoc = cachenbofdoc ".$value." 1";
+ if (preg_match('/[0-9]+/', $value)) {
+ $sql .= " cachenbofdoc = ".(int) $value;
+ } else {
+ $sql .= " cachenbofdoc = cachenbofdoc ".$value." 1";
+ }
$sql .= " WHERE rowid = ".$this->id;
dol_syslog(get_class($this)."::changeNbOfFiles", LOG_DEBUG);
$resql = $this->db->query($sql);
- if (!$resql)
- {
+ if (!$resql) {
$this->error = "Error ".$this->db->lasterror();
return -1;
} else {
- if (preg_match('/[0-9]+/', $value)) $this->cachenbofdoc = (int) $value;
- elseif ($value == '+') $this->cachenbofdoc++;
- elseif ($value == '-') $this->cachenbofdoc--;
+ if (preg_match('/[0-9]+/', $value)) {
+ $this->cachenbofdoc = (int) $value;
+ } elseif ($value == '+') {
+ $this->cachenbofdoc++;
+ } elseif ($value == '-') {
+ $this->cachenbofdoc--;
+ }
}
return 1;
@@ -327,11 +349,9 @@ class EcmDirectory extends CommonObject
dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
$resql = $this->db->query($sql);
- if ($resql)
- {
+ if ($resql) {
$obj = $this->db->fetch_object($resql);
- if ($obj)
- {
+ if ($obj) {
$this->id = $obj->rowid;
$this->ref = $obj->rowid;
@@ -374,7 +394,9 @@ class EcmDirectory extends CommonObject
$error = 0;
- if ($mode != 'databaseonly') $relativepath = $this->getRelativePath(1); // Ex: dir1/dir2/dir3
+ if ($mode != 'databaseonly') {
+ $relativepath = $this->getRelativePath(1); // Ex: dir1/dir2/dir3
+ }
dol_syslog(get_class($this)."::delete remove directory id=".$this->id." mode=".$mode.(($mode == 'databaseonly') ? '' : ' relativepath='.$relativepath));
@@ -385,35 +407,30 @@ class EcmDirectory extends CommonObject
dol_syslog(get_class($this)."::delete", LOG_DEBUG);
$resql = $this->db->query($sql);
- if (!$resql)
- {
+ if (!$resql) {
$this->db->rollback();
$this->error = "Error ".$this->db->lasterror();
return -2;
} else {
// Call trigger
$result = $this->call_trigger('MYECMDIR_DELETE', $user);
- if ($result < 0)
- {
+ if ($result < 0) {
$this->db->rollback();
return -2;
}
// End call triggers
}
- if ($mode != 'databaseonly')
- {
+ if ($mode != 'databaseonly') {
$file = $conf->ecm->dir_output."/".$relativepath;
- if ($deletedirrecursive)
- {
+ if ($deletedirrecursive) {
$result = @dol_delete_dir_recursive($file, 0, 0);
} else {
$result = @dol_delete_dir($file, 0);
}
}
- if ($result || !@is_dir(dol_osencode($file)))
- {
+ if ($result || !@is_dir(dol_osencode($file))) {
$this->db->commit();
} else {
$this->error = 'ErrorFailToDeleteDir';
@@ -422,8 +439,11 @@ class EcmDirectory extends CommonObject
$error++;
}
- if (!$error) return 1;
- else return -1;
+ if (!$error) {
+ return 1;
+ } else {
+ return -1;
+ }
}
@@ -465,17 +485,27 @@ class EcmDirectory extends CommonObject
$linkclose = '"'.($more ? ' '.$more : '').' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
$linkstart = '
picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
- if ($withpicto != 2) $result .= ($max ?dol_trunc($newref, $max, 'middle') : $newref);
+ if ($withpicto) {
+ $result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+ }
+ if ($withpicto != 2) {
+ $result .= ($max ?dol_trunc($newref, $max, 'middle') : $newref);
+ }
$result .= $linkend;
return $result;
@@ -497,18 +527,15 @@ class EcmDirectory extends CommonObject
do {
// Get index cursor in this->cats for id_mere
$cursorindex = -1;
- foreach ($this->cats as $key => $val)
- {
- if ($this->cats[$key]['id'] == $idtosearch)
- {
+ foreach ($this->cats as $key => $val) {
+ if ($this->cats[$key]['id'] == $idtosearch) {
$cursorindex = $key;
break;
}
}
//print "c=".$idtosearch."-".$cursorindex;
- if ($cursorindex >= 0)
- {
+ if ($cursorindex >= 0) {
// Path is label sanitized (no space and no special char) and concatenated
$ret = dol_sanitizeFileName($this->cats[$cursorindex]['label']).'/'.$ret;
@@ -541,11 +568,9 @@ class EcmDirectory extends CommonObject
dol_syslog(get_class($this)."::load_motherof", LOG_DEBUG);
$resql = $this->db->query($sql);
- if ($resql)
- {
+ if ($resql) {
// This assignment in condition is not a bug. It allows walking the results.
- while ($obj = $this->db->fetch_object($resql))
- {
+ while ($obj = $this->db->fetch_object($resql)) {
$this->motherof[$obj->id_son] = $obj->id_parent;
}
return 1;
@@ -608,8 +633,7 @@ class EcmDirectory extends CommonObject
// phpcs:enable
global $conf;
- if (empty($force) && !empty($this->full_arbo_loaded))
- {
+ if (empty($force) && !empty($this->full_arbo_loaded)) {
return $this->cats;
}
@@ -632,13 +656,11 @@ class EcmDirectory extends CommonObject
dol_syslog(get_class($this)."::get_full_arbo", LOG_DEBUG);
$resql = $this->db->query($sql);
- if ($resql)
- {
+ if ($resql) {
$this->cats = array();
$i = 0;
// This assignment in condition is not a bug. It allows walking the results.
- while ($obj = $this->db->fetch_object($resql))
- {
+ while ($obj = $this->db->fetch_object($resql)) {
$this->cats[$obj->rowid]['id'] = $obj->rowid;
$this->cats[$obj->rowid]['id_mere'] = (isset($this->motherof[$obj->rowid]) ? $this->motherof[$obj->rowid] : '');
$this->cats[$obj->rowid]['label'] = $obj->label;
@@ -648,10 +670,8 @@ class EcmDirectory extends CommonObject
$this->cats[$obj->rowid]['fk_user_c'] = $obj->fk_user_c;
$this->cats[$obj->rowid]['login_c'] = $obj->login_c;
- if (!empty($obj->rowid_fille))
- {
- if (isset($this->cats[$obj->rowid]['id_children']) && is_array($this->cats[$obj->rowid]['id_children']))
- {
+ if (!empty($obj->rowid_fille)) {
+ if (isset($this->cats[$obj->rowid]['id_children']) && is_array($this->cats[$obj->rowid]['id_children'])) {
$newelempos = count($this->cats[$obj->rowid]['id_children']);
//print "this->cats[$i]['id_children'] est deja un tableau de $newelem elements ';
$linkend = ' ';
- if ($withpicto)
- {
+ if ($withpicto) {
$result .= ($linkstart.img_object(($notooltip ? '' : $label), 'label', ($notooltip ? '' : 'class="classfortooltip"')).$linkend);
- if ($withpicto != 2) $result .= ' ';
+ if ($withpicto != 2) {
+ $result .= ' ';
+ }
}
$result .= $linkstart.$this->ref.$linkend;
return $result;
@@ -877,16 +895,16 @@ class EcmFiles extends CommonObject
global $conf, $user;
$this->id = 0;
-
+ $this->specimen = 1;
$this->label = '0a1b2c3e4f59999999';
- $this->entity = '1';
+ $this->entity = 1;
$this->filename = 'myspecimenfilefile.pdf';
$this->filepath = '/aaa/bbb';
$this->fullpath_orig = 'c:/file on my disk.pdf';
$this->description = 'This is a long description of file';
$this->keywords = 'key1,key2';
$this->cover = '1';
- $this->position = '5';
+ $this->position = 5;
$this->gen_or_uploaded = 'uploaded';
$this->extraparams = '';
$this->date_c = (dol_now() - 3600 * 24 * 10);
diff --git a/htdocs/ecm/dir_add_card.php b/htdocs/ecm/dir_add_card.php
index a2726a1ba75..8c13c377bd6 100644
--- a/htdocs/ecm/dir_add_card.php
+++ b/htdocs/ecm/dir_add_card.php
@@ -41,20 +41,22 @@ $confirm = GETPOST('confirm', 'alpha');
$module = GETPOST('module', 'alpha');
$website = GETPOST('website', 'alpha');
$pageid = GETPOST('pageid', 'int');
-if (empty($module)) $module = 'ecm';
+if (empty($module)) {
+ $module = 'ecm';
+}
// Security check
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
$action = '';
$socid = $user->socid;
}
$section = $urlsection = GETPOST('section', 'alpha');
-if (empty($urlsection)) $urlsection = 'misc';
+if (empty($urlsection)) {
+ $urlsection = 'misc';
+}
-if ($module == 'ecm')
-{
+if ($module == 'ecm') {
$upload_dir = $conf->ecm->dir_output.'/'.$urlsection;
} else // For example $module == 'medias'
{
@@ -65,19 +67,23 @@ $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
$sortfield = GETPOST("sortfield", 'alpha');
$sortorder = GETPOST("sortorder", 'alpha');
$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+ $page = 0;
+} // If $page is not defined, or '' or -1
$offset = $limit * $page;
$pageprev = $page - 1;
$pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "label";
+if (!$sortorder) {
+ $sortorder = "ASC";
+}
+if (!$sortfield) {
+ $sortfield = "label";
+}
$ecmdir = new EcmDirectory($db);
-if (!empty($section))
-{
+if (!empty($section)) {
$result = $ecmdir->fetch($section);
- if (!$result > 0)
- {
+ if (!$result > 0) {
dol_print_error($db, $ecmdir->error);
exit;
}
@@ -86,18 +92,18 @@ if (!empty($section))
// Permissions
$permtoadd = 0;
$permtoupload = 0;
-if ($module == 'ecm')
-{
+if ($module == 'ecm') {
$permtoadd = $user->rights->ecm->setup;
$permtoupload = $user->rights->ecm->upload;
}
-if ($module == 'medias')
-{
+if ($module == 'medias') {
$permtoadd = ($user->rights->mailing->creer || $user->rights->website->write);
$permtoupload = ($user->rights->mailing->creer || $user->rights->website->write);
}
-if (!$permtoadd) accessforbidden();
+if (!$permtoadd) {
+ accessforbidden();
+}
@@ -106,12 +112,9 @@ if (!$permtoadd) accessforbidden();
*/
// Action ajout d'un produit ou service
-if ($action == 'add' && $permtoadd)
-{
- if ($cancel)
- {
- if (!empty($backtopage))
- {
+if ($action == 'add' && $permtoadd) {
+ if ($cancel) {
+ if (!empty($backtopage)) {
header("Location: ".$backtopage);
exit;
} else {
@@ -120,33 +123,31 @@ if ($action == 'add' && $permtoadd)
}
}
- $ref = GETPOST("ref", 'alpha');
- $label = GETPOST("label", 'alpha');
- $desc = GETPOST("desc", 'alpha');
+ $ref = (string) GETPOST("ref", 'alpha');
+ $label = (string) GETPOST("label", 'alpha');
+ $desc = (string) GETPOST("desc", 'alpha');
$catParent = GETPOST("catParent", 'alpha'); // Can be an int (with ECM) or a string (with generic filemanager)
- if ($catParent == '-1') $catParent = 0;
+ if ($catParent == '-1') {
+ $catParent = 0;
+ }
$error = 0;
- if (empty($label))
- {
+ if (empty($label)) {
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
$action = 'create';
$error++;
}
- if (!$error)
- {
- if ($module == 'ecm')
- {
+ if (!$error) {
+ if ($module == 'ecm') {
$ecmdir->ref = $ref;
$ecmdir->label = $label;
$ecmdir->description = $desc;
$ecmdir->fk_parent = (int) $catParent;
$id = $ecmdir->create($user);
- if ($id <= 0)
- {
+ if ($id <= 0) {
$error++;
$langs->load("errors");
setEventMessages($ecmdir->error, $ecmdir->errors, 'errors');
@@ -155,22 +156,18 @@ if ($action == 'add' && $permtoadd)
} else // For example $module == 'medias'
{
$dirfornewdir = '';
- if ($module == 'medias')
- {
+ if ($module == 'medias') {
$dirfornewdir = $conf->medias->multidir_output[$conf->entity];
}
- if (empty($dirfornewdir))
- {
+ if (empty($dirfornewdir)) {
$error++;
dol_print_error('', 'Bad value for module. Not supported.');
}
- if (!$error)
- {
+ if (!$error) {
$fullpathofdir = $dirfornewdir.'/'.($catParent ? $catParent.'/' : '').$label;
$result = dol_mkdir($fullpathofdir, DOL_DATA_ROOT);
- if ($result < 0)
- {
+ if ($result < 0) {
setEventMessages($langs->trans('ErrorFailToCreateDir', $label), null, 'errors');
$error++;
} else {
@@ -180,10 +177,8 @@ if ($action == 'add' && $permtoadd)
}
}
- if (!$error)
- {
- if (!empty($backtopage))
- {
+ if (!$error) {
+ if (!empty($backtopage)) {
header("Location: ".$backtopage);
exit;
} else {
@@ -194,8 +189,7 @@ if ($action == 'add' && $permtoadd)
}
// Deleting file
-elseif ($action == 'confirm_deletesection' && $confirm == 'yes')
-{
+elseif ($action == 'confirm_deletesection' && $confirm == 'yes') {
$result = $ecmdir->delete($user);
setEventMessages($langs->trans("ECMSectionWasRemoved", $ecmdir->label), null, 'mesgs');
}
@@ -212,8 +206,7 @@ llxHeader('', $langs->trans("ECMNewSection"));
$form = new Form($db);
$formecm = new FormEcm($db);
-if ($action == 'create')
-{
+if ($action == 'create') {
//***********************
// Create
//***********************
@@ -222,8 +215,12 @@ if ($action == 'create')
print '
';
print '
';
print '
';
- if ($website) print '
';
- if ($pageid) print '
';
+ if ($website) {
+ print '
';
+ }
+ if ($pageid) {
+ print '
';
+ }
$title = $langs->trans("ECMNewSection");
print load_fiche_titre($title);
@@ -240,8 +237,7 @@ if ($action == 'create')
print '
'."\n";
// Description
- if ($module == 'ecm')
- {
+ if ($module == 'ecm') {
print ''.$langs->trans("Description").' ';
print ' ';
+ print ' '.$lines[$i]->comment.' ';
} else {
print ''.$lines[$i]->comment.' ';
}
diff --git a/htdocs/reception/class/reception.class.php b/htdocs/reception/class/reception.class.php
index d64c3c999a7..07e32b64432 100644
--- a/htdocs/reception/class/reception.class.php
+++ b/htdocs/reception/class/reception.class.php
@@ -68,7 +68,6 @@ class Reception extends CommonObject
public $brouillon;
public $entrepot_id;
- public $lines = array();
public $tracking_number;
public $tracking_url;
public $billed;
@@ -106,6 +105,8 @@ class Reception extends CommonObject
public $meths;
public $listmeths; // List of carriers
+ public $lines = array();
+
const STATUS_DRAFT = 0;
const STATUS_VALIDATED = 1;
@@ -121,8 +122,6 @@ class Reception extends CommonObject
public function __construct($db)
{
$this->db = $db;
- $this->lines = array();
- $this->products = array();
// List of long language codes for status
$this->statuts = array();
@@ -391,7 +390,7 @@ class Reception extends CommonObject
$this->ref = $obj->ref;
$this->socid = $obj->socid;
$this->ref_supplier = $obj->ref_supplier;
- $this->ref_ext = $obj->ref_ext;
+ $this->ref_ext = $obj->ref_ext;
$this->statut = $obj->fk_statut;
$this->user_author_id = $obj->fk_user_author;
$this->date_creation = $this->db->jdate($obj->date_creation);
diff --git a/htdocs/recruitment/admin/setup.php b/htdocs/recruitment/admin/setup.php
index 702fa4852f5..fdd4d83e223 100644
--- a/htdocs/recruitment/admin/setup.php
+++ b/htdocs/recruitment/admin/setup.php
@@ -308,8 +308,10 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
// Show example of numbering model
print '';
$tmp = $module->getExample();
- if (preg_match('/^Error/', $tmp)) print ''.$langs->trans($tmp).'
';
- elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+ if (preg_match('/^Error/', $tmp)) {
+ $langs->load("errors");
+ print ''.$langs->trans($tmp).'
';
+ } elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
else print $tmp;
print ' '."\n";
diff --git a/htdocs/recruitment/admin/setup_candidatures.php b/htdocs/recruitment/admin/setup_candidatures.php
index b829f27eb82..ef4454974e7 100644
--- a/htdocs/recruitment/admin/setup_candidatures.php
+++ b/htdocs/recruitment/admin/setup_candidatures.php
@@ -308,8 +308,10 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
// Show example of numbering model
print '';
$tmp = $module->getExample();
- if (preg_match('/^Error/', $tmp)) print ''.$langs->trans($tmp).'
';
- elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+ if (preg_match('/^Error/', $tmp)) {
+ $langs->load("errors");
+ print ''.$langs->trans($tmp).'
';
+ } elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
else print $tmp;
print ' '."\n";
diff --git a/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php b/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
index 6e9788c2e9f..be36b96682c 100644
--- a/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
+++ b/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
@@ -299,9 +299,9 @@ class doc_generic_recruitmentjobposition_odt extends ModelePDFRecruitmentJobPosi
$contactobject = null;
if (!empty($usecontact))
{
- // On peut utiliser le nom de la societe du contact
- if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
- else {
+ if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+ $socobject = $object->contact;
+ } else {
$socobject = $object->thirdparty;
// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
$contactobject = $object->contact;
diff --git a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
index af62344296b..cad6888f7c5 100644
--- a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
+++ b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
@@ -1002,7 +1002,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
}
// Recipient name
- /*if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+ /*if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
$thirdparty = $object->contact;
} else {
$thirdparty = $object->thirdparty;
diff --git a/htdocs/recruitment/recruitmentcandidature_card.php b/htdocs/recruitment/recruitmentcandidature_card.php
index 8c76fdbb28e..9d05674d656 100644
--- a/htdocs/recruitment/recruitmentcandidature_card.php
+++ b/htdocs/recruitment/recruitmentcandidature_card.php
@@ -247,7 +247,7 @@ if (empty($reshook))
$nuser->personal_mobile = $object->phone;
$nuser->birth = $object->date_birth;
$nuser->salary = $object->remuneration_proposed;
- $nuser->fk_user = $jobposition->fk_user_supervisor; // Supervisor
+ $nuser->fk_user = $jobposition->fk_user_supervisor; // Supervisor
$result = $nuser->create($user);
diff --git a/htdocs/recruitment/recruitmentjobposition_list.php b/htdocs/recruitment/recruitmentjobposition_list.php
index c942975a91d..1891d9ce822 100644
--- a/htdocs/recruitment/recruitmentjobposition_list.php
+++ b/htdocs/recruitment/recruitmentjobposition_list.php
@@ -269,20 +269,20 @@ $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $objec
$sql .= $hookmanager->resPrint;
/* If a group by is required */
-$sql.= " GROUP BY ";
+$sql .= " GROUP BY ";
foreach ($object->fields as $key => $val)
{
- $sql.='t.'.$key.', ';
+ $sql .= 't.'.$key.', ';
}
// Add fields from extrafields
-if (! empty($extrafields->attributes[$object->table_element]['label'])) {
- foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
+if (!empty($extrafields->attributes[$object->table_element]['label'])) {
+ foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
}
// Add where from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListGroupBy', $parameters); // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
-$sql=preg_replace('/,\s*$/', '', $sql);
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+$sql = preg_replace('/,\s*$/', '', $sql);
$sql .= $db->order($sortfield, $sortorder);
diff --git a/htdocs/resource/contact.php b/htdocs/resource/contact.php
index afce3dd9947..0330579f06c 100644
--- a/htdocs/resource/contact.php
+++ b/htdocs/resource/contact.php
@@ -55,7 +55,8 @@ if ($action == 'addcontact' && $user->rights->resource->write)
if ($result > 0 && $id > 0)
{
$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
- $result = $object->add_contact($contactid, GETPOST('type', 'int'), GETPOST('source', 'alpha'));
+ $typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+ $result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
}
if ($result >= 0)
diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index 487757ad567..7fb8427a517 100644
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -1,6 +1,6 @@
- * Copyright (C) 2014 Laurent Destailleur
+ * Copyright (C) 2014-2020 Laurent Destailleur
* Copyright (C) 2015 Jean-François Ferry
* Copyright (C) 2015 Charlie BENKE
* Copyright (C) 2018 Frédéric France
@@ -265,7 +265,7 @@ if ($action == 'create')
// Date payment
print '';
print $form->editfieldkey('DatePayment', 'datep', '', $object, 0, 'string', '', 1).' ';
- print $form->selectDate((empty($datep) ?-1 : $datep), "datep", '', '', '', 'add', 1, 1);
+ print $form->selectDate((empty($datep) ? '' : $datep), "datep", 0, 0, 0, 'add', 1, 1);
print ' '.$langs->trans("Project").' ';
- $formproject->select_projects(-1, $projectid, 'fk_project', 0, 0, 1, 1);
- print ' '.$langs->trans("Project").' ';
+ $formproject->select_projects(-1, $projectid, 'fk_project', 0, 0, 1, 1);
+ print ' '."\n";
if ($object->rappro == 0)
{
diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index 3ef6531e6fd..26477900be2 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -31,7 +31,42 @@ if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/account
// Load translation files required by the page
$langs->loadLangs(array("compta", "salaries", "bills", "hrm"));
+$action = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+$massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
+$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$confirm = GETPOST('confirm', 'alpha'); // Result of a confirmation
+$cancel = GETPOST('cancel', 'alpha'); // We click on a Cancel button
+$toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'bomlist'; // To manage different context of search
+$backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
+$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+
+// Load variable for pagination
$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) { $page = 0; } // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (!$sortfield) $sortfield = "s.datep,s.rowid";
+if (!$sortorder) $sortorder = "DESC,DESC";
+
+// Initialize technical objects
+$object = new PaymentSalary($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->user->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('salarieslist')); // Note that conf->hooks_modules contains array
+
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+
+if (!$sortfield) $sortfield = "s.datep,s.rowid";
+if (!$sortorder) $sortorder = "DESC,DESC";
+
$search_ref = GETPOST('search_ref', 'int');
$search_user = GETPOST('search_user', 'alpha');
$search_label = GETPOST('search_label', 'alpha');
@@ -40,30 +75,19 @@ $search_date_end = dol_mktime(23, 59, 59, GETPOST('search_date_endmonth', 'int')
$search_amount = GETPOST('search_amount', 'alpha');
$search_account = GETPOST('search_account', 'int');
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, or '' or -1
-$offset = $limit * $page;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-if (!$sortfield) $sortfield = "s.datep,s.rowid";
-if (!$sortorder) $sortorder = "DESC,DESC";
-$optioncss = GETPOST('optioncss', 'alpha');
-
$filtre = GETPOST("filtre", 'restricthtml');
-if (!GETPOST('typeid', 'int'))
+if (!GETPOST('search_type_id', 'int'))
{
$newfiltre = str_replace('filtre=', '', $filtre);
$filterarray = explode('-', $newfiltre);
foreach ($filterarray as $val)
{
$part = explode(':', $val);
- if ($part[0] == 's.fk_typepayment') $typeid = $part[1];
+ if ($part[0] == 's.fk_typepayment') $search_type_id = $part[1];
}
} else {
- $typeid = GETPOST('typeid', 'int');
+ $search_type_id = GETPOST('search_type_id', 'int');
}
$childids = $user->getAllChildIds(1);
@@ -73,36 +97,92 @@ $socid = GETPOST("socid", "int");
if ($user->socid) $socid = $user->socid;
$result = restrictedArea($user, 'salaries', '', '', '');
+// Initialize array of search criterias
+$search_all = GETPOST("search_all", 'alpha');
+$search = array();
+foreach ($object->fields as $key => $val)
+{
+ if (GETPOST('search_'.$key, 'alpha') !== '') $search[$key] = GETPOST('search_'.$key, 'alpha');
+}
+
+// List of fields to search into when doing a "search in all"
+$fieldstosearchall = array();
+foreach ($object->fields as $key => $val)
+{
+ if ($val['searchall']) $fieldstosearchall['t.'.$key] = $val['label'];
+}
+
+$permissiontoread = $user->rights->salaries->read;
+$permissiontoadd = $user->rights->salaries->write;
+$permissiontodelete = $user->rights->salaries->delete;
/*
* Actions
*/
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
-{
- $search_ref = "";
- $search_user = "";
- $search_label = "";
- $search_date_start = '';
- $search_date_end = '';
- $search_amount = "";
- $search_account = '';
- $typeid = "";
-}
+if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
+{
+ // Selection of new fields
+ include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+ // Purge search criteria
+ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
+ {
+ $search_ref = "";
+ $search_user = "";
+ $search_label = "";
+ $search_date_start = '';
+ $search_date_end = '';
+ $search_amount = "";
+ $search_account = '';
+ $search_type_id = "";
+ }
+ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
+ || GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha'))
+ {
+ $massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
+ }
+
+ // Mass actions
+ $objectclass = 'PaymentSalary';
+ $objectlabel = 'SalariesPayments';
+ $permissiontoread = $user->rights->salaries->read;
+ $permissiontodelete = $user->rights->salaries->delete;
+ $uploaddir = $conf->bom->dir_output;
+ include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+
+ // Validate records
+ if (!$error && $massaction == 'buildsepa' && $permissiontoadd)
+ {
+ $objecttmp = new $objectclass($db);
+
+ // TODO
+ }
+}
/*
* View
*/
-llxHeader('', $langs->trans("Salaries"));
-
$form = new Form($db);
$salstatic = new PaymentSalary($db);
$userstatic = new User($db);
$accountstatic = new Account($db);
+$now = dol_now();
+
+//$help_url="EN:Module_BillOfMaterials|FR:Module_BillOfMaterials_FR|ES:Módulo_BillOfMaterials";
+$help_url = '';
+$title = $langs->trans('SalariesPayments');
+
$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.email, u.admin, u.salary as current_salary, u.fk_soc as fk_soc, u.statut as status,";
$sql .= " s.rowid, s.fk_user, s.amount, s.salary, s.label, s.datep as datep, s.datev as datev, s.fk_typepayment as type, s.num_payment, s.fk_bank,";
$sql .= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.fk_accountancy_journal, ba.label as blabel,";
@@ -113,210 +193,319 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON s.fk_bank = b.rowid";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid,";
$sql .= " ".MAIN_DB_PREFIX."user as u";
$sql .= " WHERE u.rowid = s.fk_user";
-$sql .= " AND s.entity = ".$conf->entity;
+$sql .= " AND s.entity IN (".getEntity('payment_salaries').")";
if (empty($user->rights->salaries->readall)) $sql .= " AND s.fk_user IN (".join(',', $childids).")";
// Search criteria
-if ($search_ref) $sql .= " AND s.rowid=".$search_ref;
+if ($search_ref) $sql .= " AND s.rowid=".((int) $search_ref);
if ($search_user) $sql .= natural_search(array('u.login', 'u.lastname', 'u.firstname', 'u.email'), $search_user);
if ($search_label) $sql .= natural_search(array('s.label'), $search_label);
if ($search_date_start) $sql .= " AND s.datep >= '".$db->idate($search_date_start)."'";
if ($search_date_end) $sql .= " AND s.datep <= '".$db->idate($search_date_end)."'";
if ($search_amount) $sql .= natural_search("s.amount", $search_amount, 1);
-if ($search_account > 0) $sql .= " AND b.fk_account=".$search_account;
+if ($search_account > 0) $sql .= " AND b.fk_account=".((int) $search_account);
if ($filtre) {
$filtre = str_replace(":", "=", $filtre);
$sql .= " AND ".$filtre;
}
-if ($typeid) {
- $sql .= " AND s.fk_typepayment=".$typeid;
+if ($search_type_id) {
+ $sql .= " AND s.fk_typepayment=".$search_type_id;
}
$sql .= $db->order($sortfield, $sortorder);
-//$sql.= " GROUP BY u.rowid, u.lastname, u.firstname, s.rowid, s.fk_user, s.amount, s.label, s.datev, s.fk_typepayment, s.num_payment, pst.code";
-$totalnboflines = 0;
-$result = $db->query($sql);
-if ($result)
+// Count total nb of records
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
{
- $totalnboflines = $db->num_rows($result);
+ $resql = $db->query($sql);
+ $nbtotalofrecords = $db->num_rows($resql);
+ if (($page * $limit) > $nbtotalofrecords) // if total of record found is smaller than page * limit, goto and load page 0
+ {
+ $page = 0;
+ $offset = 0;
+ }
}
-$sql .= $db->plimit($limit + 1, $offset);
-
-
-$result = $db->query($sql);
-if ($result)
+// if total of record found is smaller than limit, no need to do paging and to restart another select with limits set.
+if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit)))
{
- $num = $db->num_rows($result);
- $i = 0;
- $total = 0;
+ $num = $nbtotalofrecords;
+} else {
+ if ($limit) $sql .= $db->plimit($limit + 1, $offset);
- $param = '';
- if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
- if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
- if ($typeid) $param .= '&typeid='.$typeid;
- if ($optioncss != '') $param .= '&optioncss='.$optioncss;
+ $resql = $db->query($sql);
+ if (!$resql)
+ {
+ dol_print_error($db);
+ exit;
+ }
- $url = DOL_URL_ROOT.'/salaries/card.php?action=create';
- if (!empty($socid)) $url .= '&socid='.$socid;
- $newcardbutton = dolGetButtonTitle($langs->trans('NewSalaryPayment'), '', 'fa fa-plus-circle', $url, '', $user->rights->salaries->write);
+ $num = $db->num_rows($resql);
+}
- print '
'."\n";
+
+
+
// End of page
llxFooter();
$db->close();
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index ac26eed537a..49b58d61d08 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -813,14 +813,14 @@ print '';
print '';
print '
';
-print '' . $langs->trans("AddEmailPhoneTownInContactList") . ' ';
+print ''.$langs->trans("AddEmailPhoneTownInContactList").' ';
print ' ';
print '';
if (!empty($conf->global->CONTACT_SHOW_EMAIL_PHONE_TOWN_SELECTLIST)) {
- print '';
+ print ' ';
print img_picto($langs->trans("Activated"), 'switch_on');
} else {
- print ' ';
+ print ' ';
print img_picto($langs->trans("Disabled"), 'switch_off');
}
print ' ';
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 1edd5492a81..7d7dcbe86c3 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -97,6 +97,16 @@ if (!empty($canvas))
// Security check
$result = restrictedArea($user, 'societe', $socid, '&societe', '', 'fk_soc', 'rowid', 0);
+/*
+if ($object->id > 0) {
+ if ($object->client == 0 && $object->fournisseur > 0) {
+ if (!empty($user->rights->fournisseur->lire)) {
+ accessforbidden();
+ }
+ }
+}
+*/
+
$permissiontoread = $user->rights->societe->lire;
$permissiontoadd = $user->rights->societe->creer; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
$permissiontodelete = $user->rights->societe->delete || ($permissiontoadd && isset($object->status) && $object->status == 0);
diff --git a/htdocs/societe/checkvat/checkVatService.xml b/htdocs/societe/checkvat/checkVatService.xml
index 373775c2487..b6d7661cdc6 100644
--- a/htdocs/societe/checkvat/checkVatService.xml
+++ b/htdocs/societe/checkvat/checkVatService.xml
@@ -167,7 +167,7 @@
-
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index e67f28c4dab..73c41aeb782 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -2070,7 +2070,7 @@ class Societe extends CommonObject
$discount->amount_tva = $discount->multicurrency_amount_tva = price2num($remise * $vatrate / 100, 'MT');
$discount->amount_ttc = $discount->multicurrency_amount_ttc = price2num($discount->amount_ht + $discount->amount_tva, 'MT');
- $discount->tva_tx = price2num($vatrate, 'MT');
+ $discount->tva_tx = price2num($vatrate);
$discount->vat_src_code = $vat_src_code;
$discount->description = $desc;
@@ -2533,7 +2533,7 @@ class Societe extends CommonObject
$langs->load('companies');
$statusType = 'status4';
- if ($status == 0) $statusType = 'status5';
+ if ($status == 0) $statusType = 'status6';
if (empty($this->labelStatus) || empty($this->labelStatusShort))
{
@@ -3115,10 +3115,10 @@ class Societe extends CommonObject
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
- * Returns if a profid sould be verified
+ * Returns if a profid sould be verified to be unique
*
- * @param int $idprof 1,2,3,4,5,6 (Exemple: 1=siren,2=siret,3=naf,4=rcs/rm,5=idprof5,6=idprof6)
- * @return boolean true , false
+ * @param int $idprof 1,2,3,4,5,6 (Example: 1=siren, 2=siret, 3=naf, 4=rcs/rm, 5=eori, 6=idprof6)
+ * @return boolean true if the ID must be unique
*/
public function id_prof_verifiable($idprof)
{
@@ -3128,22 +3128,22 @@ class Societe extends CommonObject
switch ($idprof)
{
case 1:
- $ret = (!$conf->global->SOCIETE_IDPROF1_UNIQUE ?false:true);
+ $ret = (empty($conf->global->SOCIETE_IDPROF1_UNIQUE) ? false : true);
break;
case 2:
- $ret = (!$conf->global->SOCIETE_IDPROF2_UNIQUE ?false:true);
+ $ret = (empty($conf->global->SOCIETE_IDPROF2_UNIQUE) ? false : true);
break;
case 3:
- $ret = (!$conf->global->SOCIETE_IDPROF3_UNIQUE ?false:true);
+ $ret = (empty($conf->global->SOCIETE_IDPROF3_UNIQUE) ? false : true);
break;
case 4:
- $ret = (!$conf->global->SOCIETE_IDPROF4_UNIQUE ?false:true);
+ $ret = (empty($conf->global->SOCIETE_IDPROF4_UNIQUE) ? false : true);
break;
case 5:
- $ret = (!$conf->global->SOCIETE_IDPROF5_UNIQUE ?false:true);
+ $ret = (empty($conf->global->SOCIETE_IDPROF5_UNIQUE) ? false : true);
break;
case 6:
- $ret = (!$conf->global->SOCIETE_IDPROF6_UNIQUE ?false:true);
+ $ret = (empty($conf->global->SOCIETE_IDPROF6_UNIQUE) ? false : true);
break;
default:
$ret = false;
@@ -3241,7 +3241,7 @@ class Societe extends CommonObject
// si son index (position dans la chaîne en commence à 0 au premier caractère) est impair
// on double sa valeur et si cette dernière est supérieure à 9, on lui retranche 9
// on ajoute cette valeur à la somme totale
-
+ $sum = 0;
for ($index = 0; $index < 9; $index++)
{
$number = (int) $chaine[$index];
@@ -3266,7 +3266,7 @@ class Societe extends CommonObject
// si son index (position dans la chaîne en commence à 0 au premier caractère) est pair
// on double sa valeur et si cette dernière est supérieure à 9, on lui retranche 9
// on ajoute cette valeur à la somme totale
-
+ $sum = 0;
for ($index = 0; $index < 14; $index++)
{
$number = (int) $chaine[$index];
@@ -3343,10 +3343,6 @@ class Societe extends CommonObject
$string = trim($this->idprof1);
$string = preg_replace('/(\s)/', '', $string);
- for ($i = 0; $i < 9; $i++) {
- $num[$i] = substr($string, $i, 1);
- }
-
//Check NIF
if (preg_match('/(^[0-9]{9}$)/', $string)) {
return 1;
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 56e774e7a9b..48a01a94390 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -72,6 +72,7 @@ $search_customer_code = trim(GETPOST('search_customer_code', 'alpha'));
$search_supplier_code = trim(GETPOST('search_supplier_code', 'alpha'));
$search_account_customer_code = trim(GETPOST('search_account_customer_code', 'alpha'));
$search_account_supplier_code = trim(GETPOST('search_account_supplier_code', 'alpha'));
+$search_address = trim(GETPOST('search_address', 'alpha'));
$search_town = trim(GETPOST("search_town", 'alpha'));
$search_zip = trim(GETPOST("search_zip", 'alpha'));
$search_state = trim(GETPOST("search_state", 'alpha'));
@@ -186,6 +187,7 @@ $arrayfields = array(
's.code_fournisseur'=>array('label'=>"SupplierCodeShort", 'position'=>11, 'checked'=>$checkedsuppliercode, 'enabled'=>(!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))),
's.code_compta'=>array('label'=>"CustomerAccountancyCodeShort", 'position'=>13, 'checked'=>$checkedcustomeraccountcode),
's.code_compta_fournisseur'=>array('label'=>"SupplierAccountancyCodeShort", 'position'=>14, 'checked'=>$checkedsupplieraccountcode, 'enabled'=>(!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))),
+ 's.address'=>array('label'=>"Address", 'position'=>19, 'checked'=>1),
's.town'=>array('label'=>"Town", 'position'=>20, 'checked'=>1),
's.zip'=>array('label'=>"Zip", 'position'=>21, 'checked'=>1),
'state.nom'=>array('label'=>"State", 'position'=>22, 'checked'=>0),
@@ -214,7 +216,7 @@ $arrayfields = array(
's.import_key'=>array('label'=>"ImportId", 'checked'=>0, 'position'=>1100),
);
// Extra fields
-include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_array_fields.tpl.php';
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
$object->fields = dol_sort_array($object->fields, 'position');
$arrayfields = dol_sort_array($arrayfields, 'position');
@@ -289,6 +291,7 @@ if (empty($reshook))
$search_supplier_code = '';
$search_account_customer_code = '';
$search_account_supplier_code = '';
+ $search_address = '';
$search_town = "";
$search_zip = "";
$search_state = "";
@@ -386,7 +389,7 @@ if ($resql)
}
} else dol_print_error($db);
-$sql = "SELECT s.rowid, s.nom as name, s.name_alias, s.barcode, s.town, s.zip, s.datec, s.code_client, s.code_fournisseur, s.logo,";
+$sql = "SELECT s.rowid, s.nom as name, s.name_alias, s.barcode, s.address, s.town, s.zip, s.datec, s.code_client, s.code_fournisseur, s.logo,";
$sql .= " s.entity,";
$sql .= " st.libelle as stcomm, st.picto as stcomm_picto, s.fk_stcomm as stcomm_id, s.fk_prospectlevel, s.prefix_comm, s.client, s.fournisseur, s.canvas, s.status as status,";
$sql .= " s.email, s.phone, s.fax, s.url, s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4 as idprof4, s.idprof5 as idprof5, s.idprof6 as idprof6, s.tva_intra, s.fk_pays,";
@@ -448,6 +451,7 @@ if ($search_customer_code) $sql .= natural_search("s.code_client", $search_custo
if ($search_supplier_code) $sql .= natural_search("s.code_fournisseur", $search_supplier_code);
if ($search_account_customer_code) $sql .= natural_search("s.code_compta", $search_account_customer_code);
if ($search_account_supplier_code) $sql .= natural_search("s.code_compta_fournisseur", $search_account_supplier_code);
+if ($search_address) $sql.= natural_search('s.address', $search_address);
if ($search_town) $sql .= natural_search("s.town", $search_town);
if (strlen($search_zip)) $sql .= natural_search("s.zip", $search_zip);
if ($search_state) $sql .= natural_search("state.nom", $search_state);
@@ -545,6 +549,7 @@ if ($search_sale > 0) $param .= '&search_sale='.urlencode($search_sale);
if ($search_id > 0) $param .= "&search_id=".urlencode($search_id);
if ($search_nom != '') $param .= "&search_nom=".urlencode($search_nom);
if ($search_alias != '') $param .= "&search_alias=".urlencode($search_alias);
+if ($search_address != '') $param .= '&search_address=' . urlencode($search_address);
if ($search_town != '') $param .= "&search_town=".urlencode($search_town);
if ($search_zip != '') $param .= "&search_zip=".urlencode($search_zip);
if ($search_phone != '') $param .= "&search_phone=".urlencode($search_phone);
@@ -766,6 +771,13 @@ if (!empty($arrayfields['s.code_compta_fournisseur']['checked']))
print '';
+ print ' ';
+}
// Town
if (!empty($arrayfields['s.town']['checked']))
{
@@ -975,6 +987,7 @@ if (!empty($arrayfields['s.code_client']['checked'])) print_liste_fi
if (!empty($arrayfields['s.code_fournisseur']['checked'])) print_liste_field_titre($arrayfields['s.code_fournisseur']['label'], $_SERVER["PHP_SELF"], "s.code_fournisseur", "", $param, '', $sortfield, $sortorder);
if (!empty($arrayfields['s.code_compta']['checked'])) print_liste_field_titre($arrayfields['s.code_compta']['label'], $_SERVER["PHP_SELF"], "s.code_compta", "", $param, '', $sortfield, $sortorder);
if (!empty($arrayfields['s.code_compta_fournisseur']['checked'])) print_liste_field_titre($arrayfields['s.code_compta_fournisseur']['label'], $_SERVER["PHP_SELF"], "s.code_compta_fournisseur", "", $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['s.address']['checked'])) print_liste_field_titre($arrayfields['s.address']['label'], $_SERVER['PHP_SELF'], 's.address', '', $param, '', $sortfield, $sortorder);
if (!empty($arrayfields['s.town']['checked'])) print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], "s.town", "", $param, '', $sortfield, $sortorder);
if (!empty($arrayfields['s.zip']['checked'])) print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], "s.zip", "", $param, '', $sortfield, $sortorder);
if (!empty($arrayfields['state.nom']['checked'])) print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER["PHP_SELF"], "state.nom", "", $param, '', $sortfield, $sortorder);
@@ -1103,6 +1116,12 @@ while ($i < min($num, $limit))
print ''.$obj->code_compta_fournisseur.' ';
if (!$i) $totalarray['nbfield']++;
}
+ // Address
+ if (!empty($arrayfields['s.address']['checked']))
+ {
+ print ''.$obj->address.' ';
+ if (!$i) $totalarray['nbfield']++;
+ }
// Town
if (!empty($arrayfields['s.town']['checked']))
{
diff --git a/htdocs/societe/societecontact.php b/htdocs/societe/societecontact.php
index c40de9060ef..0d1ae48e9e3 100644
--- a/htdocs/societe/societecontact.php
+++ b/htdocs/societe/societecontact.php
@@ -71,7 +71,8 @@ if ($action == 'addcontact' && $user->rights->societe->creer)
if ($result > 0 && $id > 0)
{
$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
- $result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
+ $typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+ $result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
}
if ($result >= 0)
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index b891d042e5b..ae40784aa68 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -257,7 +257,7 @@ if (empty($reshook))
{
if ($object->fetch(GETPOST('copie_supplier_proposal')) > 0) {
$object->ref = GETPOST('ref');
- $object->date_livraison = $date_delivery; // deprecated
+ $object->date_livraison = $date_delivery; // deprecated
$object->delivery_date = $date_delivery;
$object->shipping_method_id = GETPOST('shipping_method_id', 'int');
$object->cond_reglement_id = GETPOST('cond_reglement_id');
@@ -272,8 +272,6 @@ if (empty($reshook))
$object->note = GETPOST('note', 'restricthtml');
$object->note_private = GETPOST('note', 'restricthtml');
$object->statut = SupplierProposal::STATUS_DRAFT;
-
- $id = $object->create_from($user);
} else {
setEventMessages($langs->trans("ErrorFailedToCopyProposal", GETPOST('copie_supplier_proposal')), null, 'errors');
}
@@ -547,14 +545,13 @@ if (empty($reshook))
$date_end = dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end'.$predef.'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
$ref_supplier = GETPOST('fourn_ref', 'alpha');
$prod_entry_mode = GETPOST('prod_entry_mode');
- if ($prod_entry_mode == 'free')
- {
+ if ($prod_entry_mode == 'free') {
$idprod = 0;
$price_ht = GETPOST('price_ht');
$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
} else {
$idprod = GETPOST('idprod', 'int');
- $price_ht = '';
+ $price_ht = GETPOST('price_ht');
$tva_tx = '';
}
@@ -588,8 +585,8 @@ if (empty($reshook))
$error++;
}
if (!$error && ($qty >= 0)) {
- $pu_ht = 0;
- $pu_ttc = 0;
+ $pu_ht = price2num($price_ht, 'MU');
+ $pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
$price_min = 0;
$price_base_type = (GETPOST('price_base_type', 'alpha') ? GETPOST('price_base_type', 'alpha') : 'HT');
@@ -654,12 +651,12 @@ if (empty($reshook))
$localtax1_tx = get_localtax($tva_tx, 1, $mysoc, $object->thirdparty, $tva_npr);
$localtax2_tx = get_localtax($tva_tx, 2, $mysoc, $object->thirdparty, $tva_npr);
- $pu_ht = $productsupplier->fourn_pu;
if (empty($pu_ht)) $pu_ht = 0; // If pu is '' or null, we force to have a numeric value
// If GETPOST('idprodfournprice') is a numeric, we can use it. If it is empty or if it is 'idprod_123', we should use -1 (not used)
$fournprice = (is_numeric(GETPOST('idprodfournprice', 'alpha')) ? GETPOST('idprodfournprice', 'alpha') : -1);
$buyingprice = 0;
+ $pu_ht_devise = price2num($price_ht_devise, 'MU');
$result = $object->addline(
$desc,
@@ -685,7 +682,7 @@ if (empty($reshook))
$productsupplier->fk_unit,
'',
0,
- $productsupplier->fourn_multicurrency_unitprice,
+ $pu_ht_devise,
$date_start,
$date_end
);
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 914e487b594..b46ed476629 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -171,9 +171,7 @@ class SupplierProposal extends CommonObject
public $remise_percent = 0;
public $remise_absolue = 0;
- public $products = array();
public $extraparams = array();
-
public $lines = array();
public $line;
@@ -237,15 +235,12 @@ class SupplierProposal extends CommonObject
$this->socid = $socid;
$this->id = $supplier_proposalid;
-
- $this->products = array();
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
- * Add line into array products
- * $this->client doit etre charge
+ * Add line into array ->lines
*
* @param int $idproduct Product Id to add
* @param int $qty Quantity
@@ -253,7 +248,6 @@ class SupplierProposal extends CommonObject
* @return int <0 if KO, >0 if OK
*
* TODO Remplacer les appels a cette fonction par generation objet Ligne
- * insere dans tableau $this->products
*/
public function add_product($idproduct, $qty, $remise_percent = 0)
{
@@ -1085,23 +1079,6 @@ class SupplierProposal extends CommonObject
}
}
-
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
- /**
- * Insert into DB a supplier_proposal object completely defined by its data members (ex, results from copy).
- *
- * @param User $user User that create
- * @return int Id of the new object if ok, <0 if ko
- * @see create()
- */
- public function create_from($user)
- {
- // phpcs:enable
- $this->products = $this->lines;
-
- return $this->create($user);
- }
-
/**
* Load an object from its id and create a new one in database
*
@@ -1263,7 +1240,7 @@ class SupplierProposal extends CommonObject
$this->datev = $this->db->jdate($obj->datev); // TODO deprecated
$this->date_creation = $this->db->jdate($obj->datec); //Creation date
$this->date_validation = $this->db->jdate($obj->datev); //Validation date
- $this->date_livraison = $this->db->jdate($obj->delivery_date); // deprecated
+ $this->date_livraison = $this->db->jdate($obj->delivery_date); // deprecated
$this->delivery_date = $this->db->jdate($obj->delivery_date);
$this->shipping_method_id = ($obj->fk_shipping_method > 0) ? $obj->fk_shipping_method : null;
diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php
index fd5f5a1cbc2..84efe32839e 100644
--- a/htdocs/takepos/admin/setup.php
+++ b/htdocs/takepos/admin/setup.php
@@ -179,8 +179,10 @@ foreach ($dirmodels as $reldir)
// Show example of numbering module
print '';
$tmp = $module->getExample();
- if (preg_match('/^Error/', $tmp)) print ''.$langs->trans($tmp).'
';
- elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+ if (preg_match('/^Error/', $tmp)) {
+ $langs->load("errors");
+ print ''.$langs->trans($tmp).'
';
+ } elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
else print $tmp;
print ' '."\n";
@@ -230,6 +232,8 @@ foreach ($dirmodels as $reldir)
}
print "