From 5de8b6eee5cd5c293d4276603269d4c7870044f8 Mon Sep 17 00:00:00 2001 From: novalore Date: Sat, 4 Jun 2016 18:04:49 +0200 Subject: [PATCH 1/6] correction on banks.lang as mentioned in #5267 --- htdocs/langs/en_US/main.lang | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 0aa839d09c2..93f12930824 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -176,7 +176,6 @@ Upload=Send file ToLink=Link Select=Select Choose=Choose -ChooseLangage=Please choose your language Resize=Resize Recenter=Recenter Author=Author From 9ac05fa8f27a69de6e6263da40ff0ad9c996f267 Mon Sep 17 00:00:00 2001 From: cla Date: Sat, 4 Jun 2016 18:17:13 +0200 Subject: [PATCH 2/6] FIX #5134 --- htdocs/product/card.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/product/card.php b/htdocs/product/card.php index ef126a85b52..b0bab3ab3c1 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -1730,7 +1730,8 @@ if (empty($reshook)) { if ($action == '' || $action == 'view') { - if ($user->rights->produit->creer || $user->rights->service->creer) + if (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer ) || + ($object->type == Product::TYPE_SERVICE && $user->rights->service->creer)) { if (! isset($object->no_button_edit) || $object->no_button_edit <> 1) print '
id.'">'.$langs->trans("Modify").'
'; From ff95bb164427d221935014ef780828fff0b882ce Mon Sep 17 00:00:00 2001 From: paolo Date: Sat, 4 Jun 2016 18:31:31 +0200 Subject: [PATCH 3/6] fix #4467 --- htdocs/product/stock/replenish.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php index cdbb4cafad3..25dd6728df8 100644 --- a/htdocs/product/stock/replenish.php +++ b/htdocs/product/stock/replenish.php @@ -241,7 +241,7 @@ $form = new Form($db); $title = $langs->trans('Status'); -$sql = 'SELECT p.rowid, p.ref, p.label, p.price,'; +$sql = 'SELECT p.rowid, p.ref, p.label,p.description, p.price,'; $sql.= ' p.price_ttc, p.price_base_type,p.fk_product_type,'; $sql.= ' p.tms as datem, p.duration, p.tobuy,'; $sql.= ' p.desiredstock, p.seuil_stock_alerte as alertstock,'; @@ -490,7 +490,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) // Multilangs if (! empty($conf->global->MAIN_MULTILANGS)) { - $sql = 'SELECT label'; + $sql = 'SELECT label,description'; $sql .= ' FROM ' . MAIN_DB_PREFIX . 'product_lang'; $sql .= ' WHERE fk_product = ' . $objp->rowid; $sql .= ' AND lang = "' . $langs->getDefaultLang() . '"'; @@ -500,6 +500,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) if ($resqlm) { $objtp = $db->fetch_object($resqlm); + if (!empty($objtp->description)) $objp->description = $objtp->description; if (!empty($objtp->label)) $objp->label = $objtp->label; } } @@ -557,7 +558,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) print ''.$prod->getNomUrl(1, '').''; - print '' . $objp->label . ''; + print '' . $objp->label . ''; if (!empty($conf->service->enabled) && $type == 1) { From c5ed9e723fcc5fb04fbe72c10fb33cd35a7d4d09 Mon Sep 17 00:00:00 2001 From: novalore Date: Sat, 4 Jun 2016 18:39:04 +0200 Subject: [PATCH 4/6] bills.lang: TIP payment fixed in en_US --- htdocs/langs/en_US/bills.lang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index ab0056dc70e..f6428f6a49a 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -356,8 +356,8 @@ PaymentTypeCB=Credit card PaymentTypeShortCB=Credit card PaymentTypeCHQ=Check PaymentTypeShortCHQ=Check -PaymentTypeTIP=Interbank Payment -PaymentTypeShortTIP=Interbank Payment +PaymentTypeTIP=TIP (Documents against Payment) +PaymentTypeShortTIP=TIP Payment PaymentTypeVAD=On line payment PaymentTypeShortVAD=On line payment PaymentTypeTRA=Bank draft From a193920ddc9fbbd27d7f53c18928bec12637934b Mon Sep 17 00:00:00 2001 From: BENKE Charlie Date: Sat, 4 Jun 2016 18:40:53 +0200 Subject: [PATCH 5/6] if socity then company requiered --- htdocs/adherents/card.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php index be81c9b967d..bec4156dbe0 100644 --- a/htdocs/adherents/card.php +++ b/htdocs/adherents/card.php @@ -265,6 +265,11 @@ if (empty($reshook)) $langs->load("errors"); setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Firstname")), null, 'errors'); } + if ($morphy == 'mor' && empty($societe)) { + $error++; + $langs->load("errors"); + setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Company")), null, 'errors'); + } // Test si le login existe deja if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) { @@ -514,6 +519,11 @@ if (empty($reshook)) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Password")), null, 'errors'); } } + if ($morphy == 'mor' && empty($societe)) { + $error++; + $langs->load("errors"); + setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Company")), null, 'errors'); + } if ($morphy != 'mor' && empty($lastname)) { $error++; $langs->load("errors"); From b440ad4e7ba871879ac34c569d907d053bb9c5e2 Mon Sep 17 00:00:00 2001 From: cla Date: Sat, 4 Jun 2016 18:44:10 +0200 Subject: [PATCH 6/6] FIX #5134: fixed action 'edit' top page --- htdocs/product/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/product/card.php b/htdocs/product/card.php index b0bab3ab3c1..deff36ebfdf 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -1122,7 +1122,7 @@ else else if ($object->id > 0) { // Fiche en mode edition - if ($action == 'edit' && ($user->rights->produit->creer || $user->rights->service->creer)) + if ($action == 'edit' && ((($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->creer)))) { //WYSIWYG Editor require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';