From 23f7de0873c10d4b8a7eae6e455179d84089135d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 21 Nov 2013 02:07:13 +0100
Subject: [PATCH 1/2] Fix: [ bug #1094 ] Invoice Text Reminder

Conflicts:
	htdocs/compta/facture.php
---
 htdocs/compta/facture.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 02a60d4764a..f1423681e4b 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -3674,16 +3674,16 @@ else if ($id > 0 || ! empty($ref))
 				// By default if $action=='presend'
 				$titreform='SendBillByMail';
 				$topicmail='SendBillRef';
-				$action='send';
 				$modelmail='facture_send';
 
 				if ($action == 'prerelance')	// For backward compatibility
 				{
 					$titrefrom='SendReminderBillByMail';
 					$topicmail='SendReminderBillRef';
-					$action='relance';
 					$modelmail='facture_relance';
+					$action='relance';
 				}
+				else $action='send';
 
 				$ref = dol_sanitizeFileName($object->ref);
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

From e63dcc53431539cc9d4addcb511d12d8ca5c0869 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 21 Nov 2013 02:14:25 +0100
Subject: [PATCH 2/2] Fix: [ bug #1119 ] If no country is selected for a
 warehouse or thids card, broken IMG is shown

---
 htdocs/product/stock/fiche.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/stock/fiche.php b/htdocs/product/stock/fiche.php
index db8dbc6de1b..5a7170d23c3 100644
--- a/htdocs/product/stock/fiche.php
+++ b/htdocs/product/stock/fiche.php
@@ -270,8 +270,11 @@ else
 
 			// Country
 			print '<tr><td>'.$langs->trans('Country').'</td><td colspan="3">';
-			$img=picto_from_langcode($object->country_code);
-			print ($img?$img.' ':'');
+			if (! empty($object->country_code)) 
+			{
+				$img=picto_from_langcode($object->country_code);
+				print ($img?$img.' ':'');
+			}
 			print $object->country;
 			print '</td></tr>';