diff --git a/ChangeLog b/ChangeLog index c592a261157..f6a1c949bf5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -42,6 +42,7 @@ FIX: #12041 FIX: #12054 FIX: #12083 FIX: #12088 +FIX: CVE-2019-17578 CVE-2019-17577 CVE-2019-17576 FIX: Clean the + of categories on the product view only in POS module FIX: access to public interface when origin email has an alias. FIX: Alias name is not into the email recipient label. diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php index 8a26b12f15b..abcb3145a80 100644 --- a/htdocs/bookmarks/bookmarks.lib.php +++ b/htdocs/bookmarks/bookmarks.lib.php @@ -66,6 +66,7 @@ function printBookmarksList() $ret.= ''."\n"; $ret.= '
'; + $ret.= ''; $ret.= ' - - - "> - - rights->margins->creer) - { + ?> + + + product->enabled) || ! empty($conf->service->enabled)) { ?> + + + + "> + + global->DISPLAY_MARGIN_RATES)) { echo '%'; diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php index f98bea150de..0b275202d92 100644 --- a/htdocs/core/tpl/objectline_edit.tpl.php +++ b/htdocs/core/tpl/objectline_edit.tpl.php @@ -217,10 +217,10 @@ $coldisplay=0; product->enabled) || ! empty($conf->service->enabled)) { ?> - + - + subprice < 0) echo ''.$margin_rate.'%'; else - echo '%'; + echo '%'; $coldisplay++; } elseif (! empty($conf->global->DISPLAY_MARK_RATES)) @@ -242,7 +242,7 @@ $coldisplay=0; if ($line->subprice < 0) echo ''.$mark_rate.'%'; else - echo '%'; + echo '%'; $coldisplay++; } } diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index 836e7ffd0c7..a101f3964c0 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -2442,10 +2442,10 @@ elseif ($id || $ref) { // edit-delete buttons print ''; - print 'id . '">' . img_edit() . ''; + print 'id . '">' . img_edit() . ''; print ''; print ''; - print 'id . '">' . img_delete() . ''; + print 'id . '">' . img_delete() . ''; print ''; // Display lines extrafields diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php index 0773695f6a0..293c00a2319 100644 --- a/htdocs/expedition/shipment.php +++ b/htdocs/expedition/shipment.php @@ -42,7 +42,7 @@ if (! empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propa if (! empty($conf->product->enabled) || ! empty($conf->service->enabled)) require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; // Load translation files required by the page -$langs->loadLangs(array('orders',"companies","bills",'propal','deliveries','stocks',"productbatch",'incoterm')); +$langs->loadLangs(array('orders',"companies","bills",'propal','deliveries','stocks',"productbatch",'incoterm','other')); $id = GETPOST('id', 'int'); // id of order $ref = GETPOST('ref', 'alpha'); diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index c176d06aff4..0b47f9b5e54 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -478,6 +478,7 @@ By=By From=From FromLocation=From to=to +To=to and=and or=or Other=Other diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index b375a3e16e0..afeed4b318d 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -476,6 +476,7 @@ Category=Tag/catégorie By=Par From=Du to=au +To=à and=et or=ou Other=Autre diff --git a/htdocs/product/list.php b/htdocs/product/list.php index 2b36582025f..2f13c4921a9 100644 --- a/htdocs/product/list.php +++ b/htdocs/product/list.php @@ -485,6 +485,8 @@ if ($resql) if($type == Product::TYPE_SERVICE) $rightskey='service'; if($user->rights->{$rightskey}->creer) { + $oldtype=$type; + if ($type === "") { $newcardbutton.= dolGetButtonTitle($langs->trans('NewProduct'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/product/card.php?action=create&type=0'); $type = Product::TYPE_SERVICE; @@ -492,7 +494,9 @@ if ($resql) $label='NewProduct'; if($type == Product::TYPE_SERVICE) $label='NewService'; $newcardbutton.= dolGetButtonTitle($langs->trans($label), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/product/card.php?action=create&type='.$type); - } + + $type=$oldtype; + } print ''; if ($optioncss != '') print ''; diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php index b992be282d4..3536088cab5 100644 --- a/htdocs/product/stock/replenish.php +++ b/htdocs/product/stock/replenish.php @@ -140,7 +140,6 @@ if ($action == 'order' && isset($_POST['valid'])) if ($qty) { //might need some value checks - $obj = $db->fetch_object($resql); $line = new CommandeFournisseurLigne($db); $line->qty = $qty; $line->fk_product = $idprod; @@ -179,7 +178,7 @@ if ($action == 'order' && isset($_POST['valid'])) $error=$db->lasterror(); dol_print_error($db); } - $db->free($resql); + unset($_POST['fourn' . $i]); } unset($_POST[$i]);