diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 9df26cb870e..d25d2a3c3da 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -2403,7 +2403,7 @@ class ActionComm extends CommonObject $assignedUserArray[$key] = $assignedUser; } - if ($filters['module'] != 'project@eventorganization') { + if (!empty($filters['module']) && $filters['module'] != 'project@eventorganization') { $event['assignedUsers'] = $assignedUserArray; } diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index fe8238a27aa..482d78f2b75 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -839,7 +839,7 @@ if ($action == 'validate' && $permissiontoadd && $objectclass !== null) { } else { $idwarehouse = 0; } - if ($objecttmp->valid($user, $idwarehouse)) { + if ($objecttmp->valid($user, $idwarehouse) > 0) { setEventMessages($langs->trans('hasBeenValidated', $objecttmp->ref), null, 'mesgs'); } else { setEventMessages($objecttmp->error, $objecttmp->errors, 'errors'); diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index 2e53465afbf..50a828455ed 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -522,6 +522,7 @@ class Conf extends stdClass $this->notification = new stdClass(); $this->expensereport = new stdClass(); $this->productbatch = new stdClass(); + $this->api = new stdClass(); // Common arrays $this->cache = array(); @@ -791,6 +792,10 @@ class Conf extends stdClass $this->admin->dir_output = $rootfordata.'/admin'; $this->admin->dir_temp = $rootfortemp.'/admin/temp'; + // For api storage + $this->api->dir_output = $rootfordata.'/api'; + $this->api->dir_temp = $rootfortemp.'/api/temp'; + // For user storage $this->user->multidir_output = array($this->entity => $rootfordata."/users"); $this->user->multidir_temp = array($this->entity => $rootfortemp."/users/temp"); diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index d7144f50b24..d298931e6dc 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -1683,7 +1683,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl // Address - Phone - Email if (!empty($arrayfields['t.address']['checked'])) { $addresstoshow = $contactstatic->getBannerAddress('contact', $object); - print ''; + print ''; print $addresstoshow; print ''; } diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php index 589f83c7467..06f45de2017 100644 --- a/htdocs/fourn/class/fournisseur.product.class.php +++ b/htdocs/fourn/class/fournisseur.product.class.php @@ -1399,7 +1399,7 @@ class ProductFournisseur extends Product $label .= '
'.$langs->trans('ProductAccountancyBuyExportCode').': '.length_accountg($this->accountancy_code_buy_export); } - $logPrices = $this->listProductFournisseurPriceLog($this->product_fourn_price_id, 'pfpl.datec', 'DESC'); // set sort order here + $logPrices = $this->listProductFournisseurPriceLog($this->product_fourn_price_id, 'pfpl.datec', 'DESC', getDolGlobalInt('MAIN_TOOLTIP_PRICELOG_HISTORY_LIMIT', 10)); // set sort order here if (is_array($logPrices) && count($logPrices) > 0) { $label .= '

'; $label .= ''.$langs->trans("History").''; diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php index 5d9ebad18d9..f1af015f6cc 100644 --- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php +++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php @@ -207,13 +207,13 @@ class modMyModule extends DolibarrModules // 'group' to add a tab in group view // 'intervention' to add a tab in intervention view // 'invoice' to add a tab in customer invoice view - // 'invoice_supplier' to add a tab in supplier invoice view + // 'supplier_invoice' to add a tab in supplier invoice view // 'member' to add a tab in foundation member view // 'opensurveypoll' to add a tab in opensurvey poll view // 'order' to add a tab in sale order view - // 'order_supplier' to add a tab in supplier order view + // 'supplier_order' to add a tab in supplier order view // 'payment' to add a tab in payment view - // 'payment_supplier' to add a tab in supplier payment view + // 'supplier_payment' to add a tab in supplier payment view // 'product' to add a tab in product view // 'propal' to add a tab in propal view // 'project' to add a tab in project view