| '.$langs->trans("VoteAllowed").' | ';
diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index d8dd21719fd..36f08309e02 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -40,6 +40,8 @@ if (GETPOST('action', 'aZ09') == 'donothing') {
exit;
}
+$execmethod = empty($conf->global->MAIN_EXEC_USE_POPEN) ? 1 : $conf->global->MAIN_EXEC_USE_POPEN;
+
/*
* View
@@ -74,7 +76,13 @@ print "PHP allow_url_include = ".(ini_get('allow_url_include')
print "PHP disable_functions = ";
$arrayoffunctionsdisabled = explode(',', ini_get('disable_functions'));
$arrayoffunctionstodisable = explode(',', 'pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals');
-$arrayoffunctionstodisable2 = explode(',', 'exec,passthru,shell_exec,system,proc_open,popen');
+if ($execmethod == 1) {
+ $arrayoffunctionstodisable2 = explode(',', 'passthru,shell_exec,system,proc_open,popen');
+ $functiontokeep = 'exec';
+} else {
+ $arrayoffunctionstodisable2 = explode(',', 'exec,passthru,shell_exec,system,proc_open');
+ $functiontokeep = 'popen';
+}
$i = 0;
foreach ($arrayoffunctionsdisabled as $functionkey) {
if ($i > 0) {
@@ -115,6 +123,13 @@ if ($todisabletext) {
print '
';
}
+print $langs->trans("PHPFunctionsRequiredForCLI").': ';
+if (in_array($functiontokeep, $arrayoffunctionsdisabled)) {
+ print img_picto($langs->trans("PHPFunctionsRequiredForCLI"), 'warning');
+}
+print ''.$functiontokeep.'';
+print '
';
+
print '
';
// XDebug
@@ -245,6 +260,22 @@ print 'MAIN_SECURITY_ANTI_SSRF_SERVER_IP = '.(empty($conf->glob
print '
';
+print 'MAIN_EXEC_USE_POPEN = ';
+if (empty($conf->global->MAIN_EXEC_USE_POPEN)) {
+ print ''.$langs->trans("Undefined").' ';
+} else {
+ print $conf->global->MAIN_EXEC_USE_POPEN.' ';
+}
+if ($execmethod == 1) {
+ print ' --> "exec" PHP method will be used for shell commands.';
+}
+if ($execmethod == 2) {
+ print ' --> "popen" PHP method will be used for shell commands.';
+}
+print "
";
+print '
';
+
+
print ''.$langs->trans("AntivirusEnabledOnUpload").': ';
print empty($conf->global->MAIN_ANTIVIRUS_COMMAND) ? '' : img_picto('', 'tick').' ';
print yn($conf->global->MAIN_ANTIVIRUS_COMMAND ? 1 : 0);
diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php
index 7a9dd908a59..0a84de7b7c1 100644
--- a/htdocs/api/class/api.class.php
+++ b/htdocs/api/class/api.class.php
@@ -124,6 +124,16 @@ class DolibarrApi
unset($object->ref_previous);
unset($object->ref_next);
unset($object->ref_int);
+ unset($object->imgWidth);
+ unset($object->imgHeight);
+ unset($object->barcode_type_code);
+ unset($object->barcode_type_label);
+
+ unset($object->mode_reglement); // We use mode_reglement_id now
+ unset($object->cond_reglement); // We use cond_reglement_id now
+ unset($object->note); // We use note_public or note_private now
+ unset($object->contact); // We use contact_id now
+ unset($object->thirdparty); // We use thirdparty_id or fk_soc or socid now
unset($object->projet); // Should be fk_project
unset($object->project); // Should be fk_project
@@ -137,6 +147,12 @@ class DolibarrApi
unset($object->timespent_fk_user);
unset($object->timespent_note);
unset($object->fk_delivery_address);
+ unset($object->modelpdf);
+ unset($object->sendtoid);
+ unset($object->name_bis);
+ unset($object->newref);
+ unset($object->alreadypaid);
+ unset($object->openid);
unset($object->statuts);
unset($object->statuts_short);
@@ -169,16 +185,17 @@ class DolibarrApi
unset($object->region);
unset($object->region_code);
+ unset($object->country);
+ unset($object->state);
+ unset($object->state_code);
+ unset($object->departement);
+ unset($object->departement_code);
unset($object->libelle_statut);
unset($object->libelle_paiement);
unset($object->prefix_comm);
- unset($object->sendtoid);
- unset($object->name_bis);
- unset($object->newref);
-
if (!isset($object->table_element) || $object->table_element != 'ticket') {
unset($object->comments);
}
diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index 5e6d199db0a..f78e004f571 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -338,14 +338,13 @@ if ($result) {
if ($search_accountancy_subledger > 0) {
$param .= '&search_accountancy_subledger='.urlencode($search_accountancy_subledger);
}
-
if ($optioncss != '') {
- $param .= '&optioncss='.urlencode($optioncss);
+ $param .= '&optioncss='.urlencode($optioncss);
}
$url = DOL_URL_ROOT.'/compta/bank/various_payment/card.php?action=create';
if (!empty($socid)) {
- $url .= '&socid='.$socid;
+ $url .= '&socid='.urlencode($socid);
}
$newcardbutton = dolGetButtonTitle($langs->trans('MenuNewVariousPayment'), '', 'fa fa-plus-circle', $url, '', $user->rights->banque->modifier);
@@ -423,7 +422,7 @@ if ($result) {
// Payment type
if ($arrayfields['type']['checked']) {
- print ' | ';
+ print ' | ';
$form->select_types_paiements($typeid, 'typeid', '', 0, 1, 1, 16, 1, 'maxwidth100');
print ' | ';
}
@@ -498,7 +497,7 @@ if ($result) {
print_liste_field_titre($arrayfields['ref']['label'], $_SERVER["PHP_SELF"], 'v.rowid', '', $param, '', $sortfield, $sortorder);
}
if ($arrayfields['label']['checked']) {
- print_liste_field_titre($arrayfields['label']['label'], $_SERVER["PHP_SELF"], 'v.label', '', $param, '', $sortfield, $sortorder, 'left ');
+ print_liste_field_titre($arrayfields['label']['label'], $_SERVER["PHP_SELF"], 'v.label', '', $param, '', $sortfield, $sortorder);
}
if ($arrayfields['datep']['checked']) {
print_liste_field_titre($arrayfields['datep']['label'], $_SERVER["PHP_SELF"], 'v.datep,v.rowid', '', $param, '', $sortfield, $sortorder, 'center ');
@@ -507,7 +506,7 @@ if ($result) {
print_liste_field_titre($arrayfields['datev']['label'], $_SERVER["PHP_SELF"], 'v.datev,v.rowid', '', $param, '', $sortfield, $sortorder, 'center ');
}
if ($arrayfields['type']['checked']) {
- print_liste_field_titre($arrayfields['type']['label'], $_SERVER["PHP_SELF"], 'type', '', $param, '', $sortfield, $sortorder, 'left ');
+ print_liste_field_titre($arrayfields['type']['label'], $_SERVER["PHP_SELF"], 'type', '', $param, '', $sortfield, $sortorder, 'center ');
}
if ($arrayfields['project']['checked']) {
print_liste_field_titre($arrayfields['project']['label'], $_SERVER["PHP_SELF"], 'fk_project', '', $param, '', $sortfield, $sortorder);
@@ -590,7 +589,7 @@ if ($result) {
// Type
if ($arrayfields['type']['checked']) {
- print '';
+ print ' | ';
if ($obj->payment_code) {
print $langs->trans("PaymentTypeShort".$obj->payment_code);
print ' ';
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 4fb0a44b06b..46858191c7b 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -56,6 +56,51 @@ class FormOther
$this->db = $db;
}
+ /**
+ * Return HTML code for scanner tool.
+ * This must be called into an existing ';
+ include DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+ $formother = new FormOther($db);
+ print $formother->getHTMLScannerForm();
}
@@ -609,7 +590,7 @@ if ($object->id > 0) {
print ' |
';
}
- // Request to show lines of inventory (prefilled during creation)
+ // Request to show lines of inventory (prefilled after start/validate step)
$sql = 'SELECT id.rowid, id.datec as date_creation, id.tms as date_modification, id.fk_inventory, id.fk_warehouse,';
$sql .= ' id.fk_product, id.batch, id.qty_stock, id.qty_view, id.qty_regulated';
$sql .= ' FROM '.MAIN_DB_PREFIX.'inventorydet as id';
@@ -624,6 +605,7 @@ if ($object->id > 0) {
$num = $db->num_rows($resql);
$i = 0;
+ $totalfound = 0;
$totalarray = array();
while ($i < $num) {
$obj = $db->fetch_object($resql);
@@ -641,7 +623,7 @@ if ($object->id > 0) {
$product_static = $cacheOfProducts[$obj->fk_product];
} else {
$product_static = new Product($db);
- $product_static->fetch($obj->fk_product);
+ $result = $product_static->fetch($obj->fk_product, '', '', '', 1, 1, 1);
$option = 'nobatch';
$option .= ',novirtual';
@@ -673,6 +655,7 @@ if ($object->id > 0) {
print '