diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 5c9ac3375dd..0bf304b96a1 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -433,7 +433,7 @@ if (empty($reshook))
 		}
 
 		$qty = GETPOST('qty'.$predef);
-		$remise_percent = GETPOST('remise_percent'.$predef);
+		$remise_percent = ((GETPOST('remise_percent'.$predef) != '') ? GETPOST('remise_percent'.$predef) : 0);
 
 		if ($qty == '')
 		{
@@ -566,7 +566,8 @@ if (empty($reshook))
 			$info_bits=0;
 			if ($tva_npr) $info_bits |= 0x01;
 
-			if (((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS) )&& ($price_min && (price2num($pu_ht)*(1-price2num($remise_percent)/100) < price2num($price_min))))
+			if (((! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance))
+				|| empty($conf->global->MAIN_USE_ADVANCED_PERMS) ) && ($price_min && (price2num($pu_ht)*(1-price2num($remise_percent)/100) < price2num($price_min))))
 			{
 				$object->error = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, -1, $conf->currency));
 				$result = -1 ;
diff --git a/htdocs/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php
index 995ba93fb64..c313b6c526a 100644
--- a/htdocs/core/boxes/box_activity.php
+++ b/htdocs/core/boxes/box_activity.php
@@ -173,7 +173,7 @@ class box_activity extends ModeleBoxes
         			$totalnb += $data[$j]->nb;
 
         			$this->info_box_contents[$line][3] = array(
-                        'td' => 'class="right"',
+                        'td' => 'class="nowrap right"',
                         'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
         			);
         			$this->info_box_contents[$line][4] = array(
@@ -256,7 +256,7 @@ class box_activity extends ModeleBoxes
                     $totalnb += $data[$j]->nb;
 
                     $this->info_box_contents[$line][3] = array(
-                        'td' => 'class="right"',
+                        'td' => 'class="nowrap right"',
                         'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
                     );
                     $this->info_box_contents[$line][4] = array(
@@ -340,7 +340,7 @@ class box_activity extends ModeleBoxes
         			);
 
         			$this->info_box_contents[$line][3] = array(
-                        'td' => 'class="right"',
+                        'td' => 'class="nowrap right"',
                         'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency)
         			);
 
diff --git a/htdocs/core/boxes/box_comptes.php b/htdocs/core/boxes/box_comptes.php
index 525562d308d..1928ac7cc94 100644
--- a/htdocs/core/boxes/box_comptes.php
+++ b/htdocs/core/boxes/box_comptes.php
@@ -134,7 +134,7 @@ class box_comptes extends ModeleBoxes
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
+                        'td' => 'class="right nowraponall"',
                         'text' => price($solde, 0, $langs, 0, -1, -1, $objp->currency_code)
                     );
 
diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php
index d1381870338..165b6db0d6b 100644
--- a/htdocs/core/boxes/box_produits_alerte_stock.php
+++ b/htdocs/core/boxes/box_produits_alerte_stock.php
@@ -179,12 +179,12 @@ class box_produits_alerte_stock extends ModeleBoxes
 	               	}
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
+                        'td' => 'class="right nowraponall"',
                         'text' => $price,
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowrap"',
+                        'td' => 'class="right"',
                         'text' => $price_base_type,
                     );
 
diff --git a/htdocs/core/boxes/box_supplier_orders.php b/htdocs/core/boxes/box_supplier_orders.php
index 34316cd1ad1..6874425db78 100644
--- a/htdocs/core/boxes/box_supplier_orders.php
+++ b/htdocs/core/boxes/box_supplier_orders.php
@@ -135,7 +135,7 @@ class box_supplier_orders extends ModeleBoxes
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
+                        'td' => 'class="right nowrap"',
                         'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
                     );
 
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index d0459e1e288..abc875c370f 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -383,6 +383,7 @@ class Stripe extends CommonObject
             {
                 $metadata['dol_type'] = $object->element;
                 $metadata['dol_id'] = $object->id;
+				if (is_object($object->thirdparty) && $object->thirdparty->id > 0) $metadata['dol_thirdparty_id'] = $object->thirdparty->id;
             }
 
     		$dataforintent = array(
diff --git a/htdocs/theme/md/img/title_ticket.png b/htdocs/theme/md/img/title_ticket.png
new file mode 100644
index 00000000000..b1cf5df0e75
Binary files /dev/null and b/htdocs/theme/md/img/title_ticket.png differ
diff --git a/htdocs/theme/md/img/title_ticketsup.png b/htdocs/theme/md/img/title_ticketsup.png
deleted file mode 100644
index 3ec332075e6..00000000000
Binary files a/htdocs/theme/md/img/title_ticketsup.png and /dev/null differ