Merge remote-tracking branch 'origin/3.6' into develop

Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/fourn/commande/fiche.php

README-FR.md

@@ -115,8 +115,8 @@ Divers:
 - Application simple à utiliser.
 - Plusieurs thèmes visuels.
 - Code simple et facilement personnalisable.
-- Fonctionne avec PHP 5.3+, MySQL 4.1+ ou PostgreSql 8.1.4+.
+- Requiert PHP et Mysql ou Postgresql (Voir versions exactes sur http://wiki.dolibarr.org/index.php/Prérequis). 
-- Compatible avec toutes les offres Cloud du marché respectant les prérequis MySQL et PHP. 
+- Compatible avec toutes les offres Cloud du marché respectant les prérequis MySQL et PHP ou Postgresql.
 
 
 ## CE QUE DOLIBARR NE PEUT PAS FAIRE (TACHES A FAIRE)

README.md

@@ -114,6 +114,7 @@ See ChangeLog file found into package.
 - Very user friendly and easy to use.
 - Highly customizable: Enable only modules you need, user personalized fields, choose your skin, several menu managers (can be used by internal users as a back-office with a particular menu, or by external users as a front-office with another one).
 - Works with PHP 5.3+, MySql 4.1 or PostgreSQL 8.1.
+- Require PHP and Mysql or Postgresql (See exatc versions on http://wiki.dolibarr.org/index.php/Prerequisite).
 - Compatible with all Cloud solutions that match MySql, PHP or PostgreSQL prerequisites.
 - An easy to understand, maintain and code interfaces with your own system information (PHP with no heavy frameworks, trigger and hook architecture).
 - Support countries specific features:

htdocs/core/tpl/objectline_create.tpl.php

@@ -252,7 +252,7 @@ else {
 		<input type="submit" class="button" value="<?php echo $langs->trans('Add'); ?>" name="addline" id="addline">
 	</td>
 	<?php
-	// Line extrafield
+	// Lines for extrafield
 	if (!empty($extrafieldsline)) {
 		if ($this->table_element_line=='commandedet') {
 			$newline = new OrderLine($this->db);
@@ -267,7 +267,7 @@ else {
 			print $newline->showOptionals($extrafieldsline, 'edit', array('style'=>$bcnd[$var], 'colspan'=>$coldisplay+8));
 		}
 	}
-		?>
+	?>
 </tr>
 
 <?php
@@ -275,6 +275,8 @@ if (! empty($conf->service->enabled) && $dateSelector)
 {
 	if(! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) $colspan = 10;
 	else $colspan = 9;
+	if (! empty($inputalsopricewithtax)) $colspan++;	// We add 1 if col total ttc
+	if (in_array($object->element,array('propal','facture','invoice','commande','order'))) $colspan++;	// With this, there is a column move button
 
 	if (! empty($usemargins))
 	{

htdocs/fourn/commande/fiche.php

@@ -1702,7 +1702,7 @@ elseif (! empty($object->id))
 			print "</tr>";
 		}
 
-		// Ligne en mode update
+		// Edit line
 		if ($action	== 'edit_line' && $user->rights->fournisseur->commande->creer && ($_GET["rowid"] == $line->id))
 		{
 			print "\n";
@@ -1728,8 +1728,7 @@ elseif (! empty($object->id))
 			else
 			{
                 $forceall=1;	// For suppliers, we always show all types
-				print $form->select_type_of_lines($line->product_type,'type',1,0,$forceall);
+                print $form->select_type_of_lines($line->product_type,'type',1,0,$forceall);
-				if (! empty($conf->product->enabled) && ! empty($conf->service->enabled)) print '<br>';
                 if ($forceall || (! empty($conf->product->enabled) && ! empty($conf->service->enabled))
                 || (empty($conf->product->enabled) && empty($conf->service->enabled))) print '<br>';
 			}

htdocs/fourn/facture/fiche.php

@@ -1948,7 +1948,7 @@ else
 
                 print '<input type="hidden" name="lineid" value="'.$object->lines[$i]->rowid.'">';
 
-                if ((! empty($conf->product->enabled) || ! empty($conf->service->enabled)) && $object->lines[$i]->fk_product)
+                if ((! empty($conf->product->enabled) || ! empty($conf->service->enabled)) && $object->lines[$i]->fk_product > 0)
                 {
                     print '<input type="hidden" name="idprod" value="'.$object->lines[$i]->fk_product.'">';
                     $product_static=new ProductFournisseur($db);

htdocs/langs/fa_IR/main.lang

@@ -7,21 +7,21 @@ DIRECTION=لیتر
 FONTFORPDF=DejaVuSans
 FONTSIZEFORPDF=10
 SeparatorDecimal=.
-SeparatorThousand=،
+SeparatorThousand=None
-FormatDateShort=٪ M /٪ د /٪ Y
+FormatDateShort=%m/%d/%Y
-FormatDateShortInput=٪ M /٪ د /٪ Y
+FormatDateShortInput=%m/%d/%Y
-FormatDateShortJava=MM / DD / YYYY
+FormatDateShortJava=MM/dd/yyyy
-FormatDateShortJavaInput=MM / DD / YYYY
+FormatDateShortJavaInput=MM/dd/yyyy
-FormatDateShortJQuery=ماه / روز / سا
+FormatDateShortJQuery=yy/dd/mm
-FormatDateShortJQueryInput=ماه / روز / سا
+FormatDateShortJQueryInput=yy/dd/mm
-FormatHourShort=٪ I:٪ M٪ P
+FormatHourShort=%I:%M
-FormatHourShortDuration=٪ H:٪ M
+FormatHourShortDuration=%H:%M
-FormatDateTextShort=٪ B٪ د،٪ Y
+FormatDateTextShort=%b %d %Y
-FormatDateText=٪ B٪ د،٪ Y
+FormatDateText=%B %d %Y
-FormatDateHourShort=٪ M /٪ د /٪ Y٪ I:٪ M٪ P
+FormatDateHourShort=%m/%d/%Y %I:%M:%S %p
-FormatDateHourSecShort=٪ M /٪ د /٪ Y٪ I:٪ M:٪ S٪ P
+FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
-FormatDateHourTextShort=٪ B٪ د،٪ Y،٪ I:٪ M٪ P
+FormatDateHourTextShort=%b %d %Y %I:%M %p
-FormatDateHourText=٪ B٪ د،٪ Y،٪ I:٪ M٪ P
+FormatDateHourText=%B %d %Y %H:%M %p
 DatabaseConnection=اتصال به پایگاه داده
 NoTranslation=بدون ترجمه
 NoRecordFound=هیچ سابقه ای پیدا نشد

test/phpunit/LangTest.php

@@ -146,7 +146,7 @@ class LangTest extends PHPUnit_Framework_TestCase
 		{
 			if (! preg_match('/^[a-z]+_[A-Z]+$/',$code)) continue;
 
-			print 'Check language file for code='.$code."\n";
+			print 'Check language file for lang code='.$code."\n";
 			$tmplangs=new Translate('',$conf);
     		$langcode=$code;
         	$tmplangs->setDefaultLang($langcode);
@@ -154,19 +154,19 @@ class LangTest extends PHPUnit_Framework_TestCase
 
 			$result=$tmplangs->trans("SeparatorDecimal");
 			print __METHOD__." SeparatorDecimal=".$result."\n";
-			$this->assertContains($result,array('.',',','/',' ','','None'), 'Error for code '.$code);
+			$this->assertContains($result,array('.',',','/',' ','','None'), 'Error for decimal separator for lang code '.$code);	// Note that ، that is coma for RTL languages is not supported
 
 			$result=$tmplangs->trans("SeparatorThousand");
 			print __METHOD__." SeparatorThousand=".$result."\n";
-			$this->assertContains($result, array('.',',','/',' ','','None','Space'), 'Error for code '.$code);
+			$this->assertContains($result, array('.',',','/',' ','','None','Space'), 'Error for thousand separator for lang code '.$code);	// Note that ، that is coma for RTL languages is not supported
 
 			// Test java string contains only d,M,y,/,-,. and not m,...
 			$result=$tmplangs->trans("FormatDateShortJava");
 			print __METHOD__." FormatDateShortJava=".$result."\n";
-			$this->assertRegExp('/^[dMy\/\-\.]+$/',$result);
+			$this->assertRegExp('/^[dMy\/\-\.]+$/',$result,'FormatDateShortJava');
 			$result=$tmplangs->trans("FormatDateShortJavaInput");
 			print __METHOD__." FormatDateShortJavaInput=".$result."\n";
-			$this->assertRegExp('/^[dMy\/\-\.]+$/',$result);
+			$this->assertRegExp('/^[dMy\/\-\.]+$/',$result,'FormatDateShortJavaInput');
 
 			unset($tmplangs);
 		}