Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4

Dolibarr · Nov 21, 2013 · ea0bbb5 · ea0bbb5
2 parents 7f950d8 + 0d853cf
commit ea0bbb5
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
@@ -3674,16 +3674,16 @@
 				// 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';

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
@@ -1442,8 +1442,9 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 	    // Link to print main content area
 	    if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->browser->phone))
 	    {
-	        $qs=$_SERVER["QUERY_STRING"].($_SERVER["QUERY_STRING"]?'&':'').$morequerystring;
-	        $text ='<a href="'.$_SERVER["PHP_SELF"].'?'.$qs.($qs?'&amp;':'').'optioncss=print" target="_blank">';
+	        $qs=$_SERVER["QUERY_STRING"];
+	        $qs.=(($qs && $morequerystring)?'&':'').$morequerystring;
+	        $text ='<a href="'.$_SERVER["PHP_SELF"].'?'.$qs.($qs?'&':'').'optioncss=print" target="_blank">';
 	        $text.= img_picto('', 'printer.png', 'class="printer"');
 	        $text.='</a>';
 	        $toprightmenu.=$form->textwithtooltip('',$langs->trans("PrintContentArea"),2,1,$text,'',1);

diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php
@@ -684,7 +684,7 @@
         $tmpcode='';
 		if (! empty($modCodeProduct->code_auto))
 			$tmpcode=$modCodeProduct->getNextValue($object,$type);
-        print '<td class="fieldrequired" width="20%">'.$langs->trans("Ref").'</td><td><input name="ref" size="40" maxlength="32" value="'.dol_escape_htmltag(GETPOST('ref')?GETPOST('ref'):$tmpcode).'">';
+        print '<td class="fieldrequired" width="20%">'.$langs->trans("Ref").'</td><td><input name="ref" size="40" maxlength="128" value="'.dol_escape_htmltag(GETPOST('ref')?GETPOST('ref'):$tmpcode).'">';
         if ($_error)
         {
             print $langs->trans("RefAlreadyExists");
@@ -862,7 +862,7 @@
             print '<table class="border allwidth">';
 
             // Ref
-            print '<tr><td width="15%" class="fieldrequired">'.$langs->trans("Ref").'</td><td colspan="2"><input name="ref" size="40" maxlength="32" value="'.$object->ref.'"></td></tr>';
+            print '<tr><td width="15%" class="fieldrequired">'.$langs->trans("Ref").'</td><td colspan="2"><input name="ref" size="40" maxlength="128" value="'.$object->ref.'"></td></tr>';
 
             // Label
             print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td colspan="2"><input name="libelle" size="40" maxlength="255" value="'.$object->libelle.'"></td></tr>';

diff --git a/htdocs/product/stock/fiche.php b/htdocs/product/stock/fiche.php
@@ -270,8 +270,11 @@
 
 			// 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>';