From 880a27f827483b80af304d6470d5f2050d5df529 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Tue, 4 Jun 2013 18:40:46 +0200
Subject: [PATCH 01/22] Fixed field name

---
 htdocs/societe/societe.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/societe/societe.php b/htdocs/societe/societe.php
index 4e4374fc69a..89187914c04 100644
--- a/htdocs/societe/societe.php
+++ b/htdocs/societe/societe.php
@@ -98,7 +98,7 @@ if ($mode == 'search')
     if ($search_categ) $sql.= " AND s.rowid = cs.fk_societe";   // Join for the needed table to filter by categ
 	if (! $user->rights->societe->lire || ! $user->rights->fournisseur->lire)
 	{
-		if (! $user->rights->fournisseur->lire) $sql.=" AND s.fourn != 1";
+		if (! $user->rights->fournisseur->lire) $sql.=" AND s.fournisseur != 1";
 	}
     // Insert sale filter
     if ($search_sale)

From a4841dacda59fec0e7a04d719dfc72648c84276f Mon Sep 17 00:00:00 2001
From: simnandez <jmenent@2byte.es>
Date: Wed, 5 Jun 2013 15:09:13 +0200
Subject: [PATCH 02/22] Fix: Warning missing argument 2 into withdrawals

---
 htdocs/compta/prelevement/rejets.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php
index 6cd04c95162..bebc56abbeb 100644
--- a/htdocs/compta/prelevement/rejets.php
+++ b/htdocs/compta/prelevement/rejets.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2010-2012 Juanjo Menent 		<jmenent@2byte.es>
+ * Copyright (C) 2010-2013 Juanjo Menent 		<jmenent@2byte.es>
  * Copyright (C) 2005-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -57,7 +57,7 @@ if ($sortorder == "") $sortorder="DESC";
 if ($sortfield == "") $sortfield="p.datec";
 
 $rej = new RejetPrelevement($db, $user);
-$ligne = new LignePrelevement($db);
+$ligne = new LignePrelevement($db, $user);
 
 /*
  * Liste des factures

From 693f4f3b8bfa99fef1f89c01fe06e51e17bd5d3a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 6 Jun 2013 21:25:10 +0200
Subject: [PATCH 03/22] Fix: Pb of offset in numbering. Add also phpunit test
 to detect and test fix.

Conflicts:
	test/phpunit/NumberingModulesTest.php
---
 htdocs/core/lib/functions2.lib.php    | 11 +++++++----
 test/phpunit/NumberingModulesTest.php | 12 ++++++++----
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index ab41e5aaec7..66b64035c4d 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -607,7 +607,7 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
     	$maskraz=$yearoffsettype; // For backward compatibility
     else if ($yearoffsettype === '0' || (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $conf->global->SOCIETE_FISCAL_MONTH_START > 1))
     	$maskraz = $conf->global->SOCIETE_FISCAL_MONTH_START;
-    //print "maskraz=".$maskraz;
+    //print "maskraz=".$maskraz;	// -1=no reset
 
     if ($maskraz > 0)    // A reset is required
     {
@@ -699,8 +699,8 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
             $sqlwhere.='(SUBSTRING('.$field.', '.(dol_strlen($reg[1])+1).', '.dol_strlen($reg[2]).") = '".$yearcomp."')";
         }
     }
-    //print "sqlwhere=".$sqlwhere."<br>\n";
-    //print "masktri=".$masktri." maskcounter=".$maskcounter." maskraz=".$maskraz." maskoffset=".$maskoffset." yearcomp=".$yearcomp."<br>\n";
+    //print "sqlwhere=".$sqlwhere." yearcomp=".$yearcomp."<br>\n";	// sqlwhere and yearcomp defined only if we ask a reset
+    //print "masktri=".$masktri." maskcounter=".$maskcounter." maskraz=".$maskraz." maskoffset=".$maskoffset."<br>\n";
 
     // Define $sqlstring
     $posnumstart=strpos($maskwithnocode,$maskcounter);	// Pos of counter in final string (from 0 to ...)
@@ -739,7 +739,10 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
         $counter = $obj->val;
     }
     else dol_print_error($db);
+
+    // Check if we must force counter to maskoffset
     if (empty($counter) || preg_match('/[^0-9]/i',$counter)) $counter=$maskoffset;
+    else if ($counter < $maskoffset && empty($conf->global->MAIN_NUMBERING_OFFSET_ONLY_FOR_FIRST)) $counter=$maskoffset;
 
     if ($mode == 'last')	// We found value for counter = last counter value. Now need to get corresponding ref of invoice.
     {
@@ -824,7 +827,7 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
             }
             else dol_print_error($db);
             if (empty($maskrefclient_counter) || preg_match('/[^0-9]/i',$maskrefclient_counter)) $maskrefclient_counter=$maskrefclient_maskoffset;
-            $maskrefclient_counter++;
+			$maskrefclient_counter++;
         }
 
         // Build numFinal
diff --git a/test/phpunit/NumberingModulesTest.php b/test/phpunit/NumberingModulesTest.php
index 82bb96dc0be..5e93e32fe22 100644
--- a/test/phpunit/NumberingModulesTest.php
+++ b/test/phpunit/NumberingModulesTest.php
@@ -147,7 +147,7 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
 		$result=$localobject->is_erasable();
 		print __METHOD__." is_erasable=".$result."\n";
 		$this->assertEquals(1, $result);						// Can be deleted
-		
+
 		$localobject2=new Facture($this->savdb);
 		$localobject2->initAsSpecimen();
 		$localobject2->date=dol_mktime(12, 0, 0, 1, 1, 1916);	// we use following year for second invoice (there is no reset into mask)
@@ -166,7 +166,7 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
 		$result=$localobject->is_erasable();
 		print __METHOD__." is_erasable=".$result."\n";
 		$this->assertEquals(0, $result);						// Case 1 can not be deleted (case 2 is more recent)
-		
+
 		// Now we try with a reset
 		$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}-{0000@1}';
 		$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}-{0000@1}';
@@ -194,7 +194,7 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
 		$result=$localobject->is_erasable();
 		print __METHOD__." is_erasable=".$result."\n";
 		$this->assertEquals(1, $result);						// Can be deleted
-		
+
 		$localobject2=new Facture($this->savdb);
 		$localobject2->initAsSpecimen();
 		$localobject2->date=dol_mktime(12, 0, 0, 1, 1, 1921);	// we use following year for second invoice (and there is a reset required)
@@ -210,7 +210,11 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
     	$result=$localobject->is_erasable();
     	print __METHOD__." is_erasable=".$result."\n";
     	$this->assertEquals(1, $result);						// Case 1 can be deleted (because there was a reset for case 2)
-    	 
+
+    	// Try an offset when an invoice already exists
+    	$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000+9990}';
+    	$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000+9990}';
+    	$result=$numbering->getNextValue($mysoc, $localobject2);
 
 		// Now we try with a different fiscal month (forced by mask)
     	$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@6}';

From c78d5aa4a78a829849b7ec9dec1f3cf34c913d38 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 7 Jun 2013 14:52:25 +0200
Subject: [PATCH 04/22] Fix: Bad param 'zone' into printCommon

---
 htdocs/main.inc.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index f22110f57d7..86419f2bdaf 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1149,7 +1149,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
             if (! empty($conf->global->MAIN_USE_JQUERY_JMOBILE) || defined('REQUIRE_JQUERY_JMOBILE') || (! empty($conf->dol_use_jmobile) && $conf->dol_use_jmobile > 0))
             {
             	// We must force not using ajax because cache of jquery does not load js of other pages.
-            	// This also increase seriously speed onto mobile device where complex js code is very slow and memory very low. 
+            	// This also increase seriously speed onto mobile device where complex js code is very slow and memory very low.
             	if (empty($conf->dol_use_jmobile) || $conf->dol_use_jmobile != 2)
             	{
 	            	print '<script type="text/javascript">
@@ -1772,10 +1772,11 @@ if (! function_exists("llxFooter"))
      * Show HTML footer
      * Close div /DIV data-role=page + /DIV class=fiche + /DIV /DIV main layout + /BODY + /HTML.
      *
-     * @param	string	$foot    		A text to add in HTML generated page
+     * @param	string	$comment    A text to add as HTML comment into HTML generated page
+	 * @param	string	$zone		'private' (for private pages) or 'public' (for public pages)
      * @return	void
      */
-    function llxFooter($foot='')
+    function llxFooter($comment='',$zone='pivate')
     {
         global $conf, $langs;
 
@@ -1810,9 +1811,9 @@ if (! function_exists("llxFooter"))
 		if (empty($conf->dol_hide_leftmenu)) print '</div>'; // End div id-right
 
         print "\n";
-        if ($foot) print '<!-- '.$foot.' -->'."\n";
+        if ($comment) print '<!-- '.$comment.' -->'."\n";
 
-        printCommonFooter($foot);
+        printCommonFooter($zone);
 
         if (empty($conf->dol_hide_leftmenu)) print '</div>';	// End div container
 

From a27d71f083caf6598196b73a11704de88b00ccce Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 7 Jun 2013 15:58:15 +0200
Subject: [PATCH 05/22] Fix: Miscellaneous fixes into cachdesk module: -
 Missing footer in cashdesk module - Wrong field label - Do not use limit list
 (Freeze when too many product)

---
 htdocs/cashdesk/affPied.php              |  4 ++-
 htdocs/cashdesk/facturation.php          | 17 +++++----
 htdocs/cashdesk/tpl/facturation1.tpl.php | 45 +++++++-----------------
 htdocs/langs/en_US/cashdesk.lang         |  3 +-
 htdocs/langs/fr_FR/cashdesk.lang         |  3 +-
 5 files changed, 30 insertions(+), 42 deletions(-)

diff --git a/htdocs/cashdesk/affPied.php b/htdocs/cashdesk/affPied.php
index 9c77c9ee03e..b97b9108de1 100644
--- a/htdocs/cashdesk/affPied.php
+++ b/htdocs/cashdesk/affPied.php
@@ -23,5 +23,7 @@
 
 ?>
 <div class="pied">
-
+<?php
+printCommonFooter('private');
+?>
 </div>
diff --git a/htdocs/cashdesk/facturation.php b/htdocs/cashdesk/facturation.php
index b64ad065c64..e70b4ed3483 100644
--- a/htdocs/cashdesk/facturation.php
+++ b/htdocs/cashdesk/facturation.php
@@ -24,7 +24,7 @@
  */
 
 // Get list of articles (in warehouse '$conf_fkentrepot' if defined and stock module enabled)
-if ( $_GET['filtre'] ) {
+if ( GETPOST('filtre') ) {
 
 	// Avec filtre
 	$ret=array(); $i=0;
@@ -36,17 +36,18 @@ if ( $_GET['filtre'] ) {
 	$sql.= " WHERE p.entity IN (".getEntity('product', 1).")";
 	$sql.= " AND p.tosell = 1";
 	if(!$conf->global->CASHDESK_SERVICES) $sql.= " AND p.fk_product_type = 0";
-	$sql.= " AND (p.ref LIKE '%".$_GET['filtre']."%' OR p.label LIKE '%".$_GET['filtre']."%' ";
-	if (! empty($conf->barcode->enabled)) $sql.= " OR p.barcode LIKE '%".$_GET['filtre']."%')";
+	$sql.= " AND (p.ref LIKE '%".$db->escape(GETPOST('filtre'))."%' OR p.label LIKE '%".$db->escape(GETPOST('filtre'))."%'";
+	if (! empty($conf->barcode->enabled)) $sql.= " OR p.barcode LIKE '%".$db->escape(GETPOST('filtre'))."%')";
 	else $sql.= ")";
-
 	$sql.= " ORDER BY label";
 
 	dol_syslog("facturation.php sql=".$sql);
 	$resql=$db->query($sql);
 	if ($resql)
 	{
-		while ( $tab = $db->fetch_array($resql) )
+		$nbr_enreg = $db->num_rows($resql);
+
+		while ($i < $conf_taille_listes && $tab = $db->fetch_array($resql) )
 		{
 			foreach ( $tab as $cle => $valeur )
 			{
@@ -79,7 +80,9 @@ if ( $_GET['filtre'] ) {
 	$resql=$db->query($sql);
 	if ($resql)
 	{
-		while ( $tab = $db->fetch_array($resql) )
+		$nbr_enreg = $db->num_rows($resql);
+
+		while ($i < $conf_taille_listes && $tab = $db->fetch_array($resql))
 		{
 			foreach ( $tab as $cle => $valeur )
 			{
@@ -95,7 +98,7 @@ if ( $_GET['filtre'] ) {
 	$tab_designations=$ret;
 }
 
-$nbr_enreg = count($tab_designations);
+//$nbr_enreg = count($tab_designations);
 
 if ( $nbr_enreg > 1 )
 {
diff --git a/htdocs/cashdesk/tpl/facturation1.tpl.php b/htdocs/cashdesk/tpl/facturation1.tpl.php
index 482b1474d99..eb35a9e05d5 100644
--- a/htdocs/cashdesk/tpl/facturation1.tpl.php
+++ b/htdocs/cashdesk/tpl/facturation1.tpl.php
@@ -35,7 +35,7 @@ $langs->load("cashdesk");
 		<input type="hidden" name="hdnSource" value="NULL" />
 
 		<table>
-			<tr><th class="label1"><?php echo $langs->trans("Code"); ?></th><th class="label1"><?php echo $langs->trans("Designation"); ?></th></tr>
+			<tr><th class="label1"><?php echo $langs->trans("FilterRefOrLabelOrBC"); ?></th><th class="label1"><?php echo $langs->trans("Designation"); ?></th></tr>
 			<tr>
 			<!-- Affichage de la reference et de la designation -->
 			<td><input class="texte_ref" type="text" id ="txtRef" name="txtRef" value="<?php echo $obj_facturation->ref() ?>"
@@ -62,43 +62,24 @@ $langs->load("cashdesk");
 						$id = $obj_facturation->id();
 
 						// Si trop d'articles ont ete trouves, on n'affiche que les X premiers (defini dans le fichier de configuration) ...
-						if ( $nbr_enreg > $conf_taille_listes ) {
 
-							for ($i = 0; $i < $conf_taille_listes; $i++) {
+						$nbtoshow = $nbr_enreg;
+						if (! empty($conf_taille_listes) && $nbtoshow > $conf_taille_listes) $nbtoshow = $conf_taille_listes;
 
-								if ( $id == $tab_designations[$i]['rowid'] )
-									$selected = 'selected="selected"';
-								else
-									$selected = '';
+						for ($i = 0; $i < $nbtoshow; $i++)
+						{
+							if ( $id == $tab_designations[$i]['rowid'] )
+								$selected = 'selected="selected"';
+							else
+								$selected = '';
 
-								$label = $tab_designations[$i]['label'];
+							$label = $tab_designations[$i]['label'];
 
-								print '<option '.$selected.' value="'.$tab_designations[$i]['rowid'].'">'.dol_trunc($tab_designations[$i]['ref'],7).' - '.dol_trunc($label,35,'middle');
-								if (! empty($conf->stock->enabled) && !empty($conf_fkentrepot) && $tab_designations[$i]['fk_product_type']==0) print ' ('.$langs->trans("CashDeskStock").': '.$tab_designations[$i]['reel'].')';
-								print '</option>'."\n				";
-
-							}
-
-						// ... sinon on affiche tout
-						} else {
-
-							for ($i = 0; $i < $nbr_enreg; $i++) {
-
-								if ( $id == $tab_designations[$i]['rowid'] )
-									$selected = 'selected="selected"';
-								else
-									$selected = '';
-
-								$label = $tab_designations[$i]['label'];
-
-								print '<option '.$selected.' value="'.$tab_designations[$i]['rowid'].'">'.dol_trunc($tab_designations[$i]['ref'],7).' - '.dol_trunc($label,35,'middle');
-								if (! empty($conf->stock->enabled) && !empty($conf_fkentrepot) && $tab_designations[$i]['fk_product_type']==0) print ' ('.$langs->trans("CashDeskStock").': '.(empty($tab_designations[$i]['reel'])?0:$tab_designations[$i]['reel']).')';
-								print '</option>'."\n				";
-
-							}
+							print '<option '.$selected.' value="'.$tab_designations[$i]['rowid'].'">'.dol_trunc($tab_designations[$i]['ref'],7).' - '.dol_trunc($label,35,'middle');
+							if (! empty($conf->stock->enabled) && !empty($conf_fkentrepot) && $tab_designations[$i]['fk_product_type']==0) print ' ('.$langs->trans("CashDeskStock").': '.(empty($tab_designations[$i]['reel'])?0:$tab_designations[$i]['reel']).')';
+							print '</option>'."\n";
 
 						}
-
 					?>
 				</select>
 			</td>
diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index f8e1d1fa780..f11853b7b89 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -36,4 +36,5 @@ CashDeskSetupStock=You ask to decrease stock on invoice creation but warehouse f
 BankToPay=Charge Account
 ShowCompany=Show company
 ShowStock=Show warehouse
-DeleteArticle=Click to remove this article
\ No newline at end of file
+DeleteArticle=Click to remove this article
+FilterRefOrLabelOrBC=Search (Ref/Label)
diff --git a/htdocs/langs/fr_FR/cashdesk.lang b/htdocs/langs/fr_FR/cashdesk.lang
index 6eab6e5b3d0..6fd0f1bb137 100644
--- a/htdocs/langs/fr_FR/cashdesk.lang
+++ b/htdocs/langs/fr_FR/cashdesk.lang
@@ -36,4 +36,5 @@ CashDeskSetupStock=La configuration du module stock demande une réduction du st
 BankToPay=Compte à créditer
 ShowCompany=Voir société
 ShowStock=Voir entrepôt
-DeleteArticle=Cliquez pour enlever cet article
\ No newline at end of file
+DeleteArticle=Cliquez pour enlever cet article
+FilterRefOrLabelOrBC=Recherche (Ref/Lib.)
\ No newline at end of file

From a88a3bb8778a9564140b3afff01a3746c18ed983 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 7 Jun 2013 16:39:29 +0200
Subject: [PATCH 06/22] Look: More neutral css to match with other skins

---
 htdocs/cashdesk/css/style.css   |  28 +++++++++++++++++++++++-----
 htdocs/cashdesk/img/bg_menu.png | Bin 23261 -> 0 bytes
 2 files changed, 23 insertions(+), 5 deletions(-)
 delete mode 100644 htdocs/cashdesk/img/bg_menu.png

diff --git a/htdocs/cashdesk/css/style.css b/htdocs/cashdesk/css/style.css
index 7582126e8d1..9ac041bc811 100644
--- a/htdocs/cashdesk/css/style.css
+++ b/htdocs/cashdesk/css/style.css
@@ -62,7 +62,13 @@ p {
 	font-size: 14px;
 	width: 735px;
 	height: 84px;
-	background: url('../img/bg_menu.png') no-repeat left top;
+	background: #CCCCCC;
+	background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(40,40,40,.3) 100%);
+	background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(40,40,40,.3) 100%);
+	background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(40,40,40,.3) 100%);
+	background-image: -webkit-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(40,40,40,.3) 100%);
+	background-image: -ms-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(40,40,40,.3) 100%);
+	background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0, rgba(255,255,255,.3)), color-stop(1, rgba(40,40,40,.3)) );
 }
 
 .menu_bloc {
@@ -334,12 +340,25 @@ p.titre {
 /* -------------- Boutons --------------------- */
 .bouton_ajout_article,.bouton_mode_reglement,.bouton_validation {
 	border: 1px solid #999;
-	background: #f7f7ff;
+	background: #f7f7f7;
+	
+background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%);
+background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%);
+background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%);
+background-image: -webkit-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%);
+background-image: -ms-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%);
+background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0, rgba(255,255,255,.3)), color-stop(1, rgba(80,80,80,.3)) );	
 }
 
 .bouton_ajout_article:hover,.bouton_mode_reglement:hover,.bouton_validation:hover
-	{
-	background: #e7e7ff;
+{
+	background: #cccccc;
+background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%);
+background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%);
+background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%);
+background-image: -webkit-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%);
+background-image: -ms-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%);
+background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0, rgba(255,255,255,.3)), color-stop(1, rgba(80,80,80,.3)) );
 }
 
 .bouton_ajout_article {
@@ -472,4 +491,3 @@ p.titre {
 	background-color: #3366cc;
 	color: white ! important;
 }
-
diff --git a/htdocs/cashdesk/img/bg_menu.png b/htdocs/cashdesk/img/bg_menu.png
deleted file mode 100644
index 7238950ab2e6eefd5a15ed2dad8f91dbe2bb236b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 23261
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
QhoU~CuV?fSsbl}<-+U`V)Bpeg


From dd43f7a89021396eafc0e7b7e7e5abe7adb747ae Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 7 Jun 2013 19:12:38 +0200
Subject: [PATCH 07/22] Fix: memory not freed

---
 htdocs/cashdesk/facturation.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/cashdesk/facturation.php b/htdocs/cashdesk/facturation.php
index e70b4ed3483..e4f23785a97 100644
--- a/htdocs/cashdesk/facturation.php
+++ b/htdocs/cashdesk/facturation.php
@@ -55,6 +55,7 @@ if ( GETPOST('filtre') ) {
 			}
 			$i++;
 		}
+		$db->free($resql);
 	}
 	else
 	{
@@ -90,6 +91,7 @@ if ( GETPOST('filtre') ) {
 			}
 			$i++;
 		}
+		$db->free($resql);
 	}
 	else
 	{
@@ -147,6 +149,7 @@ if ($res)
 		}
 		$i++;
 	}
+	$db->free($resql);
 }
 else
 {

From 3c9fef8eea0ec44a60203ffbec53c18f76bb745e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 8 Jun 2013 01:33:16 +0200
Subject: [PATCH 08/22] Fix: choice of percentage was lost

---
 htdocs/comm/action/fiche.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php
index 4b438786d56..3fe597d5c66 100644
--- a/htdocs/comm/action/fiche.php
+++ b/htdocs/comm/action/fiche.php
@@ -494,7 +494,11 @@ if ($action == 'create')
 	print '<tr><td width="10%">'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td>';
 	print '<td>';
 	$percent=-1;
-	if (isset($_GET['percentage']) || isset($_POST['percentage']))
+	if (isset($_GET['status']) || isset($_POST['status']))
+	{
+		$percent=GETPOST('status');
+	}
+	else if (isset($_GET['percentage']) || isset($_POST['percentage']))
 	{
 		$percent=GETPOST('percentage');
 	}

From afbe6c1808ba68f35c49fa74b1c3251229affcba Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 8 Jun 2013 14:56:40 +0200
Subject: [PATCH 09/22] Fix: translation

---
 htdocs/langs/en_US/main.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 64f8fbd44cf..8a297b6adce 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -19,7 +19,7 @@ FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
 DatabaseConnection=Database connection
 NoTranslation=No translation
-NoRecordFound=Aucun enregistrement trouvé
+NoRecordFound=No record found
 NoError=No error
 Error=Error
 ErrorFieldRequired=Field '%s' is required

From 2c71c898ebba584942aad5d548488919fbad6ca6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 8 Jun 2013 15:21:47 +0200
Subject: [PATCH 10/22] Fix: param lang not provided to price function

---
 htdocs/core/lib/pdf.lib.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index ad1fa61a54d..d6d846c2b23 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1118,7 +1118,7 @@ function pdf_getlineupexcltax($object,$i,$outputlangs,$hidedetails=0,$hookmanage
 	}
 	else
 	{
-		if (empty($hidedetails) || $hidedetails > 1) return price($sign * $object->lines[$i]->subprice);
+		if (empty($hidedetails) || $hidedetails > 1) return price($sign * $object->lines[$i]->subprice, 0, $outputlangs);
 	}
 }
 
@@ -1144,7 +1144,7 @@ function pdf_getlineupwithtax($object,$i,$outputlangs,$hidedetails=0)
     }
     else
     {
-        if (empty($hidedetails) || $hidedetails > 1) return price(($object->lines[$i]->subprice) + ($object->lines[$i]->subprice)*($object->lines[$i]->tva_tx)/100);
+        if (empty($hidedetails) || $hidedetails > 1) return price(($object->lines[$i]->subprice) + ($object->lines[$i]->subprice)*($object->lines[$i]->tva_tx)/100, 0, $outputlangs);
     }
 }
 
@@ -1328,7 +1328,7 @@ function pdf_getlinetotalexcltax($object,$i,$outputlangs,$hidedetails=0,$hookman
 		}
 		else
 		{
-			if (empty($hidedetails) || $hidedetails > 1) return price($sign * $object->lines[$i]->total_ht);
+			if (empty($hidedetails) || $hidedetails > 1) return price($sign * $object->lines[$i]->total_ht, 0, $outputlangs);
 		}
 	}
 }
@@ -1362,7 +1362,7 @@ function pdf_getlinetotalwithtax($object,$i,$outputlangs,$hidedetails=0)
         else
         {
             if (empty($hidedetails) || $hidedetails > 1) return
-				price(($object->lines[$i]->total_ht) + ($object->lines[$i]->total_ht)*($object->lines[$i]->tva_tx)/100);
+				price(($object->lines[$i]->total_ht) + ($object->lines[$i]->total_ht)*($object->lines[$i]->tva_tx)/100, 0, $outputlangs);
         }
     }
 }

From e13974b5f3df5f0df542fe923b7eef5b39701fab Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 8 Jun 2013 15:29:27 +0200
Subject: [PATCH 11/22] Fix: tcpdf bug

---
 htdocs/includes/tcpdf/tcpdf.php | 42 ++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/htdocs/includes/tcpdf/tcpdf.php b/htdocs/includes/tcpdf/tcpdf.php
index a2fe57578e1..aee6fedeef3 100644
--- a/htdocs/includes/tcpdf/tcpdf.php
+++ b/htdocs/includes/tcpdf/tcpdf.php
@@ -76,7 +76,7 @@
 // dullus for text Justification.
 // Bob Vincent (pillarsdotnet@users.sourceforge.net) for <li> value attribute.
 // Patrick Benny for text stretch suggestion on Cell().
-// Johannes G�ntert for JavaScript support.
+// Johannes G�ntert for JavaScript support.
 // Denis Van Nuffelen for Dynamic Form.
 // Jacek Czekaj for multibyte justification
 // Anthony Ferrara for the reintroduction of legacy image methods.
@@ -87,7 +87,7 @@
 // Mohamad Ali Golkar, Saleh AlMatrafe, Charles Abbott for Arabic and Persian support.
 // Moritz Wagner and Andreas Wurmser for graphic functions.
 // Andrew Whitehead for core fonts support.
-// Esteban Jo�l Mar�n for OpenType font conversion.
+// Esteban Jo�l Mar�n for OpenType font conversion.
 // Teus Hagen for several suggestions and fixes.
 // Yukihiro Nakadaira for CID-0 CJK fonts fixes.
 // Kosmas Papachristos for some CSS improvements.
@@ -5324,7 +5324,7 @@ class TCPDF {
 			$cbbox = array();
 		}
 		// initialize subsetchars
-		$subsetchars = array();
+		$subsetchars = array_fill(0, 256, true);
 		$this->setFontBuffer($fontkey, array('fontkey' => $fontkey, 'i' => $this->numfonts, 'type' => $type, 'name' => $name, 'desc' => $desc, 'up' => $up, 'ut' => $ut, 'cw' => $cw, 'cbbox' => $cbbox, 'dw' => $dw, 'enc' => $enc, 'cidinfo' => $cidinfo, 'file' => $file, 'ctg' => $ctg, 'subset' => $subset, 'subsetchars' => $subsetchars));
 		if ($this->inxobj) {
 			// we are inside an XObject template
@@ -7123,7 +7123,7 @@ class TCPDF {
 	 * @param $cellpadding (float) Internal cell padding, if empty uses default cell padding.
 	 * @param $border (mixed) Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
 	 * @return float Return the minimal height needed for multicell method for printing the $txt param.
-	 * @author Alexander Escalona Fern�ndez, Nicola Asuni
+	 * @author Alexander Escalona Fern�ndez, Nicola Asuni
 	 * @public
 	 * @since 4.5.011
 	 */
@@ -7230,7 +7230,7 @@ class TCPDF {
 	 * @param $cellpadding (float) Internal cell padding, if empty uses default cell padding.
 	 * @param $border (mixed) Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
 	 * @return float Return the minimal height needed for multicell method for printing the $txt param.
-	 * @author Nicola Asuni, Alexander Escalona Fern�ndez
+	 * @author Nicola Asuni, Alexander Escalona Fern�ndez
 	 * @public
 	 */
 	public function getStringHeight($w, $txt, $reseth=false, $autopadding=true, $cellpadding='', $border=0) {
@@ -15417,7 +15417,7 @@ class TCPDF {
 	}
 
 	/**
-	 * Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x2, y2) as the B�zier control points.
+	 * Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x2, y2) as the B�zier control points.
 	 * The new current point shall be (x3, y3).
 	 * @param $x1 (float) Abscissa of control point 1.
 	 * @param $y1 (float) Ordinate of control point 1.
@@ -15435,7 +15435,7 @@ class TCPDF {
 	}
 
 	/**
-	 * Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using the current point and (x2, y2) as the B�zier control points.
+	 * Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using the current point and (x2, y2) as the B�zier control points.
 	 * The new current point shall be (x3, y3).
 	 * @param $x2 (float) Abscissa of control point 2.
 	 * @param $y2 (float) Ordinate of control point 2.
@@ -15451,7 +15451,7 @@ class TCPDF {
 	}
 
 	/**
-	 * Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x3, y3) as the B�zier control points.
+	 * Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x3, y3) as the B�zier control points.
 	 * The new current point shall be (x3, y3).
 	 * @param $x1 (float) Abscissa of control point 1.
 	 * @param $y1 (float) Ordinate of control point 1.
@@ -16855,7 +16855,7 @@ class TCPDF {
 	/**
 	 * Insert Named Destinations.
 	 * @protected
-	 * @author Johannes G�ntert, Nicola Asuni
+	 * @author Johannes G�ntert, Nicola Asuni
 	 * @since 5.9.098 (2011-06-23)
 	 */
 	protected function _putdests() {
@@ -17054,7 +17054,7 @@ class TCPDF {
 	 * Adds a javascript
 	 * @param $script (string) Javascript code
 	 * @public
-	 * @author Johannes G�ntert, Nicola Asuni
+	 * @author Johannes G�ntert, Nicola Asuni
 	 * @since 2.1.002 (2008-02-12)
 	 */
 	public function IncludeJS($script) {
@@ -17083,7 +17083,7 @@ class TCPDF {
 	/**
 	 * Create a javascript PDF string.
 	 * @protected
-	 * @author Johannes G�ntert, Nicola Asuni
+	 * @author Johannes G�ntert, Nicola Asuni
 	 * @since 2.1.002 (2008-02-12)
 	 */
 	protected function _putjavascript() {
@@ -19146,7 +19146,7 @@ class TCPDF {
 	 * @param $col1 (array) first color (Grayscale, RGB or CMYK components).
 	 * @param $col2 (array) second color (Grayscale, RGB or CMYK components).
 	 * @param $coords (array) array of the form (x1, y1, x2, y2) which defines the gradient vector (see linear_gradient_coords.jpg). The default value is from left to right (x1=0, y1=0, x2=1, y2=0).
-	 * @author Andreas W�rmser, Nicola Asuni
+	 * @author Andreas W�rmser, Nicola Asuni
 	 * @since 3.1.000 (2008-06-09)
 	 * @public
 	 */
@@ -19164,7 +19164,7 @@ class TCPDF {
 	 * @param $col1 (array) first color (Grayscale, RGB or CMYK components).
 	 * @param $col2 (array) second color (Grayscale, RGB or CMYK components).
 	 * @param $coords (array) array of the form (fx, fy, cx, cy, r) where (fx, fy) is the starting point of the gradient with color1, (cx, cy) is the center of the circle with color2, and r is the radius of the circle (see radial_gradient_coords.jpg). (fx, fy) should be inside the circle, otherwise some areas will not be defined.
-	 * @author Andreas W�rmser, Nicola Asuni
+	 * @author Andreas W�rmser, Nicola Asuni
 	 * @since 3.1.000 (2008-06-09)
 	 * @public
 	 */
@@ -19187,7 +19187,7 @@ class TCPDF {
 	 * @param $coords_min (array) minimum value used by the coordinates. If a coordinate's value is smaller than this it will be cut to coords_min. default: 0
 	 * @param $coords_max (array) maximum value used by the coordinates. If a coordinate's value is greater than this it will be cut to coords_max. default: 1
 	 * @param $antialias (boolean) A flag indicating whether to filter the shading function to prevent aliasing artifacts.
-	 * @author Andreas W�rmser, Nicola Asuni
+	 * @author Andreas W�rmser, Nicola Asuni
 	 * @since 3.1.000 (2008-06-09)
 	 * @public
 	 */
@@ -19279,7 +19279,7 @@ class TCPDF {
 	 * @param $y (float) ordinate of the top left corner of the rectangle.
 	 * @param $w (float) width of the rectangle.
 	 * @param $h (float) height of the rectangle.
-	 * @author Andreas W�rmser, Nicola Asuni
+	 * @author Andreas W�rmser, Nicola Asuni
 	 * @since 3.1.000 (2008-06-09)
 	 * @protected
 	 */
@@ -20797,19 +20797,19 @@ class TCPDF {
 		// remove empty blocks
 		$cssdata = preg_replace('/([^\}\{]+)\{\}/', '', $cssdata);
 		// replace media type parenthesis
-		$cssdata = preg_replace('/@media[\s]+([^\{]*)\{/i', '@media \\1�', $cssdata);
-		$cssdata = preg_replace('/\}\}/si', '}�', $cssdata);
+		$cssdata = preg_replace('/@media[\s]+([^\{]*)\{/i', '@media \\1�', $cssdata);
+		$cssdata = preg_replace('/\}\}/si', '}�', $cssdata);
 		// trim string
 		$cssdata = trim($cssdata);
 		// find media blocks (all, braille, embossed, handheld, print, projection, screen, speech, tty, tv)
 		$cssblocks = array();
 		$matches = array();
-		if (preg_match_all('/@media[\s]+([^\�]*)�([^�]*)�/i', $cssdata, $matches) > 0) {
+		if (preg_match_all('/@media[\s]+([^\�]*)�([^�]*)�/i', $cssdata, $matches) > 0) {
 			foreach ($matches[1] as $key => $type) {
 				$cssblocks[$type] = $matches[2][$key];
 			}
 			// remove media blocks
-			$cssdata = preg_replace('/@media[\s]+([^\�]*)�([^�]*)�/i', '', $cssdata);
+			$cssdata = preg_replace('/@media[\s]+([^\�]*)�([^�]*)�/i', '', $cssdata);
 		}
 		// keep 'all' and 'print' media, other media types are discarded
 		if (isset($cssblocks['all']) AND !empty($cssblocks['all'])) {
@@ -29032,7 +29032,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 					}
 					break;
 				}
-				case 'Q': { // quadratic B�zier curveto
+				case 'Q': { // quadratic B�zier curveto
 					foreach ($params as $ck => $cp) {
 						$params[$ck] = $cp;
 						if ((($ck + 1) % 4) == 0) {
@@ -29058,7 +29058,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 					}
 					break;
 				}
-				case 'T': { // shorthand/smooth quadratic B�zier curveto
+				case 'T': { // shorthand/smooth quadratic B�zier curveto
 					foreach ($params as $ck => $cp) {
 						$params[$ck] = $cp;
 						if (($ck % 2) != 0) {

From 0ffb01e3477b4ada8f1ddbeef95845567daca2e2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 8 Jun 2013 16:35:52 +0200
Subject: [PATCH 12/22] Fix: Remove duplicate key

---
 htdocs/langs/el_GR/other.lang | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/langs/el_GR/other.lang b/htdocs/langs/el_GR/other.lang
index b3c717c3550..1afefb9578e 100644
--- a/htdocs/langs/el_GR/other.lang
+++ b/htdocs/langs/el_GR/other.lang
@@ -109,7 +109,6 @@ ToExport=Export
 NewExport=New export
 ##### External sites #####
 ExternalSites=External sites
-FONTFORPDF=Freemono
 
 
 // START - Lines generated via autotranslator.php tool (2011-06-26 15:35:22).

From 49dcc32374b89d4410ba16e3861aa21c67abe1d2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 8 Jun 2013 16:53:26 +0200
Subject: [PATCH 13/22] Fix: Param lang forbidden into price function

---
 .../commande/doc/pdf_einstein.modules.php     | 22 +++++++-------
 .../modules/facture/doc/pdf_crabe.modules.php | 30 +++++++++----------
 .../modules/propale/doc/pdf_azur.modules.php  | 24 +++++++--------
 3 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index f13af05b108..5e4d5d1395c 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -702,7 +702,7 @@ class pdf_einstein extends ModelePDFCommandes
 		$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
 
 		$pdf->SetXY($col2x, $tab2_top + 0);
-		$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ht + (! empty($object->remise)?$object->remise:0)), 0, 'R', 1);
+		$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ht + (! empty($object->remise)?$object->remise:0), 0, $outputlangs), 0, 'R', 1);
 
 		// Show VAT by rates and total
 		$pdf->SetFillColor(248,248,248);
@@ -743,7 +743,7 @@ class pdf_einstein extends ModelePDFCommandes
 								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
 								$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
 							}
 						}
 					}
@@ -776,7 +776,7 @@ class pdf_einstein extends ModelePDFCommandes
 								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
 								$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
 
 							}
 						}
@@ -803,7 +803,7 @@ class pdf_einstein extends ModelePDFCommandes
 						$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
 						$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+						$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
 					}
 				}
 
@@ -834,14 +834,14 @@ class pdf_einstein extends ModelePDFCommandes
 									$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
 									$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-									$pdf->MultiCell($largcol2, $tab2_hl, price($tvakey), 0, 'R', 1);
+									$pdf->MultiCell($largcol2, $tab2_hl, price($tvakey, 0, $outputlangs), 0, 'R', 1);
 								}
 								else
 								{
 									$totalvat.=vatrate(abs($tvakey),1).$tvacompl;
 									$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 									$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-									$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+									$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
 								}
 							}
 						}
@@ -874,7 +874,7 @@ class pdf_einstein extends ModelePDFCommandes
 								if ($localtax_type == '7') {  // amount on order
 									$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 									$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-									$pdf->MultiCell($largcol2, $tab2_hl, price($tvakey), 0, 'R', 1);
+									$pdf->MultiCell($largcol2, $tab2_hl, price($tvakey, 0, $outputlangs), 0, 'R', 1);
 								}
 								else
 								{
@@ -882,7 +882,7 @@ class pdf_einstein extends ModelePDFCommandes
 									$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
 									$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-									$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+									$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
 								}
 							}
 						}
@@ -897,7 +897,7 @@ class pdf_einstein extends ModelePDFCommandes
 				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
 
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc), $useborder, 'R', 1);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc, 0, $outputlangs), $useborder, 'R', 1);
 			}
 		}
 
@@ -919,7 +919,7 @@ class pdf_einstein extends ModelePDFCommandes
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 			$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid"), 0, 'L', 0);
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle), 0, 'R', 0);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle, 0, $outputlangs), 0, 'R', 0);
 
 			$index++;
 			$pdf->SetTextColor(0,0,60);
@@ -928,7 +928,7 @@ class pdf_einstein extends ModelePDFCommandes
 			$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', 1);
 
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer), $useborder, 'R', 1);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer, 0, $outputlangs), $useborder, 'R', 1);
 
 			$pdf->SetFont('','', $default_font_size - 1);
 			$pdf->SetTextColor(0,0,0);
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index d5cafd460c2..453860ba192 100755
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -589,7 +589,7 @@ class pdf_crabe extends ModelePDFFactures
 				$pdf->SetXY($tab3_posx, $tab3_top+$y);
 				$pdf->MultiCell(20, 3, dol_print_date($obj->datef,'day',false,$outputlangs,true), 0, 'L', 0);
 				$pdf->SetXY($tab3_posx+21, $tab3_top+$y);
-				$pdf->MultiCell(20, 3, price($obj->amount_ttc), 0, 'L', 0);
+				$pdf->MultiCell(20, 3, price($obj->amount_ttc, 0, $outputlangs), 0, 'L', 0);
 				$pdf->SetXY($tab3_posx+40, $tab3_top+$y);
 				$pdf->MultiCell(20, 3, $text, 0, 'L', 0);
 				$pdf->SetXY($tab3_posx+58, $tab3_top+$y);
@@ -626,7 +626,7 @@ class pdf_crabe extends ModelePDFFactures
 				$pdf->SetXY($tab3_posx, $tab3_top+$y);
 				$pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($row->date),'day',false,$outputlangs,true), 0, 'L', 0);
 				$pdf->SetXY($tab3_posx+21, $tab3_top+$y);
-				$pdf->MultiCell(20, 3, price($sign * $row->amount), 0, 'L', 0);
+				$pdf->MultiCell(20, 3, price($sign * $row->amount, 0, $outputlangs), 0, 'L', 0);
 				$pdf->SetXY($tab3_posx+40, $tab3_top+$y);
 				$oper = $outputlangs->transnoentitiesnoconv("PaymentTypeShort" . $row->code);
 
@@ -832,7 +832,7 @@ class pdf_crabe extends ModelePDFFactures
 		$pdf->SetXY($col1x, $tab2_top + 0);
 		$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
 		$pdf->SetXY($col2x, $tab2_top + 0);
-		$pdf->MultiCell($largcol2, $tab2_hl, price($sign * ($object->total_ht + (! empty($object->remise)?$object->remise:0))), 0, 'R', 1);
+		$pdf->MultiCell($largcol2, $tab2_hl, price($sign * ($object->total_ht + (! empty($object->remise)?$object->remise:0)), 0, $outputlangs), 0, 'R', 1);
 
 		// Show VAT by rates and total
 		$pdf->SetFillColor(248,248,248);
@@ -874,7 +874,7 @@ class pdf_crabe extends ModelePDFFactures
 								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
 								$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
 							}
 						}
 					}
@@ -908,7 +908,7 @@ class pdf_crabe extends ModelePDFFactures
 								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
 								$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
 
 							}
 						}
@@ -935,7 +935,7 @@ class pdf_crabe extends ModelePDFFactures
 						$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
 						$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+						$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
 					}
 				}
 
@@ -966,14 +966,14 @@ class pdf_crabe extends ModelePDFFactures
 									$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
 									$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-									$pdf->MultiCell($largcol2, $tab2_hl, price($tvakey), 0, 'R', 1);
+									$pdf->MultiCell($largcol2, $tab2_hl, price($tvakey, 0, $outputlangs), 0, 'R', 1);
 								}
 								else
 								{
 									$totalvat.=vatrate(abs($tvakey),1).$tvacompl;
 									$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 									$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-									$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+									$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
 								}
 							}
 						}
@@ -1007,7 +1007,7 @@ class pdf_crabe extends ModelePDFFactures
 								if ($localtax_type == '7') {  // amount on order
 									$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 									$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-									$pdf->MultiCell($largcol2, $tab2_hl, price($tvakey), 0, 'R', 1);
+									$pdf->MultiCell($largcol2, $tab2_hl, price($tvakey, 0, $outputlangs), 0, 'R', 1);
 								}
 								else
 								{
@@ -1015,7 +1015,7 @@ class pdf_crabe extends ModelePDFFactures
 									$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
 									$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-									$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+									$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
 								}
 							}
 						}
@@ -1030,7 +1030,7 @@ class pdf_crabe extends ModelePDFFactures
 				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
 
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $object->total_ttc), $useborder, 'R', 1);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $object->total_ttc, 0, $outputlangs), $useborder, 'R', 1);
 			}
 		}
 
@@ -1049,7 +1049,7 @@ class pdf_crabe extends ModelePDFFactures
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 			$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("Paid"), 0, 'L', 0);
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle + $depositsamount), 0, 'R', 0);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle + $depositsamount, 0, $outputlangs), 0, 'R', 0);
 
 			// Credit note
 			if ($creditnoteamount)
@@ -1058,7 +1058,7 @@ class pdf_crabe extends ModelePDFFactures
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("CreditNotes"), 0, 'L', 0);
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($creditnoteamount), 0, 'R', 0);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($creditnoteamount, 0, $outputlangs), 0, 'R', 0);
 			}
 
 			// Escompte
@@ -1070,7 +1070,7 @@ class pdf_crabe extends ModelePDFFactures
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("EscompteOffered"), $useborder, 'L', 1);
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc - $deja_regle - $creditnoteamount - $depositsamount), $useborder, 'R', 1);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 0, $outputlangs), $useborder, 'R', 1);
 
 				$resteapayer=0;
 			}
@@ -1081,7 +1081,7 @@ class pdf_crabe extends ModelePDFFactures
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 			$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', 1);
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer), $useborder, 'R', 1);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer, 0, $outputlangs), $useborder, 'R', 1);
 
 			// Fin
 			$pdf->SetFont('','', $default_font_size - 1);
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index b62a6fe01f6..8de154861ac 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -735,7 +735,7 @@ class pdf_azur extends ModelePDFPropales
 		$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
 
 		$pdf->SetXY($col2x, $tab2_top + 0);
-		$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ht + (! empty($object->remise)?$object->remise:0)), 0, 'R', 1);
+		$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ht + (! empty($object->remise)?$object->remise:0), 0, $outputlangs), 0, 'R', 1);
 
 		// Show VAT by rates and total
 		$pdf->SetFillColor(248,248,248);
@@ -777,7 +777,7 @@ class pdf_azur extends ModelePDFPropales
 								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
 								$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
 							}
 						}
 					}
@@ -811,7 +811,7 @@ class pdf_azur extends ModelePDFPropales
 								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
 								$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
 
 							}
 						}
@@ -838,7 +838,7 @@ class pdf_azur extends ModelePDFPropales
 						$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
 						$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+						$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
 					}
 				}
 
@@ -869,14 +869,14 @@ class pdf_azur extends ModelePDFPropales
 									$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
 									$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-									$pdf->MultiCell($largcol2, $tab2_hl, price($tvakey), 0, 'R', 1);
+									$pdf->MultiCell($largcol2, $tab2_hl, price($tvakey, 0, $outputlangs), 0, 'R', 1);
 								}
 								else
 								{
 									$totalvat.=vatrate(abs($tvakey),1).$tvacompl;
 									$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 									$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-									$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+									$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
 								}
 							}
 						}
@@ -909,7 +909,7 @@ class pdf_azur extends ModelePDFPropales
 								if ($localtax_type == '7') {  // amount on order
 									$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 									$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-									$pdf->MultiCell($largcol2, $tab2_hl, price($tvakey), 0, 'R', 1);
+									$pdf->MultiCell($largcol2, $tab2_hl, price($tvakey, 0, $outputlangs), 0, 'R', 1);
 								}
 								else
 								{
@@ -917,7 +917,7 @@ class pdf_azur extends ModelePDFPropales
 									$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
 									$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-									$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+									$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
 								}
 							}
 						}
@@ -932,7 +932,7 @@ class pdf_azur extends ModelePDFPropales
 				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
 
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc), $useborder, 'R', 1);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc, 0, $outputlangs), $useborder, 'R', 1);
 			}
 		}
 
@@ -951,7 +951,7 @@ class pdf_azur extends ModelePDFPropales
 			$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid"), 0, 'L', 0);
 
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle), 0, 'R', 0);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle, 0, $outputlangs), 0, 'R', 0);
 
 			/*
 			if ($object->close_code == 'discount_vat')
@@ -963,7 +963,7 @@ class pdf_azur extends ModelePDFPropales
 				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("EscompteOffered"), $useborder, 'L', 1);
 
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc - $deja_regle), $useborder, 'R', 1);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc - $deja_regle, 0, $outputlangs), $useborder, 'R', 1);
 
 				$resteapayer=0;
 			}
@@ -976,7 +976,7 @@ class pdf_azur extends ModelePDFPropales
 			$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', 1);
 
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer), $useborder, 'R', 1);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer, 0, $outputlangs), $useborder, 'R', 1);
 
 			$pdf->SetFont('','', $default_font_size - 1);
 			$pdf->SetTextColor(0,0,0);

From 532c56002d35430225ed63579671464edfdcfefa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a?= <marcosgdf@gmail.com>
Date: Sat, 8 Jun 2013 19:07:13 +0200
Subject: [PATCH 14/22] Entities problem with error message in predefined
 invoice creation

---
 htdocs/compta/facture/fiche-rec.php   | 4 ++--
 test/phpunit/NumberingModulesTest.php | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 54d0c800920..67b36fdc586 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -65,7 +65,7 @@ if ($action == 'add')
 {
 	if (! GETPOST('titre'))
 	{
-		setEventMessage($langs->trans("ErrorFieldRequired",$langs->trans("Title")), 'errors');
+		setEventMessage($langs->transnoentities("ErrorFieldRequired",$langs->trans("Title")), 'errors');
 		$action = "create";
 		$error++;
 	}
@@ -138,7 +138,7 @@ if ($action == 'create')
 		print '</td></tr>';
 
 		// Title
-		print '<tr><td>'.$langs->trans("Title").'</td><td>';
+		print '<tr><td class="fieldrequired">'.$langs->trans("Title").'</td><td>';
 		print '<input class="flat" type="text" name="titre" size="24" value="'.$_POST["titre"].'">';
 		print '</td>';
 
diff --git a/test/phpunit/NumberingModulesTest.php b/test/phpunit/NumberingModulesTest.php
index 5e93e32fe22..0700c784bae 100644
--- a/test/phpunit/NumberingModulesTest.php
+++ b/test/phpunit/NumberingModulesTest.php
@@ -212,9 +212,9 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
     	$this->assertEquals(1, $result);						// Case 1 can be deleted (because there was a reset for case 2)
 
     	// Try an offset when an invoice already exists
-    	$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000+9990}';
-    	$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000+9990}';
-    	$result=$numbering->getNextValue($mysoc, $localobject2);
+    	$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000+9990}';
+    	$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000+9990}';
+    	$result=$numbering->getNextValue($mysoc, $localobject2);
 
 		// Now we try with a different fiscal month (forced by mask)
     	$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@6}';

From 3cff899b44d636eab5a3502918c223858b7344d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a?= <marcosgdf@gmail.com>
Date: Sat, 8 Jun 2013 20:01:51 +0200
Subject: [PATCH 15/22] Removed debug message and wrong translation key

---
 htdocs/compta/facture/stats/index.php | 6 +++---
 htdocs/product/composition/fiche.php  | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index 4abff5b63be..895cadbf2d9 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -54,8 +54,8 @@ $endyear=$year;
  * View
  */
 
-$langs->load("bills");
-$langs->load("companies");
+$langs->load("bills");
+$langs->load("companies");
 
 $form=new Form($db);
 
@@ -233,7 +233,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 	print $form->select_company($socid,'socid',$filter,1);
 	print '</td></tr>';
 	// User
-	print '<tr><td>'.$langs->trans("CreatedBy").'</td><td>';
+	print '<tr><td>'.$langs->trans("Author").'</td><td>';
 	print $form->select_users($userid,'userid',1);
 	print '</td></tr>';
 	// Year
diff --git a/htdocs/product/composition/fiche.php b/htdocs/product/composition/fiche.php
index 71ce35c76e1..644c321b8bb 100644
--- a/htdocs/product/composition/fiche.php
+++ b/htdocs/product/composition/fiche.php
@@ -72,7 +72,6 @@ $cancel <> $langs->trans("Cancel") &&
 	$error=0;
 	for($i=0;$i<$_POST["max_prod"];$i++)
 	{
-		print "<br> : ".$_POST["prod_id_chk".$i];
 		if ($_POST["prod_id_chk".$i] > 0)
 		{
 			if($product->add_sousproduit($id, $_POST["prod_id_".$i],$_POST["prod_qty_".$i]) > 0)

From 000de9530d5d5bff59efe3d46d202c39224c3ee2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a?= <marcosgdf@gmail.com>
Date: Sat, 8 Jun 2013 20:15:48 +0200
Subject: [PATCH 16/22] Fixed wrong translation key and and improved es_ES
 translations

---
 htdocs/langs/es_ES/products.lang | 10 ++++++----
 htdocs/product/fiche.php         |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/htdocs/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang
index 66d64d3d4ff..f7ae35cc0db 100644
--- a/htdocs/langs/es_ES/products.lang
+++ b/htdocs/langs/es_ES/products.lang
@@ -84,10 +84,10 @@ ShowService=Mostrar servicio
 ProductsAndServicesArea=Área productos y servicios
 ProductsArea=Área Productos
 ServicesArea=Área Servicios
-AddToMyProposals=Adjuntar a mis presupuestos
-AddToOtherProposals=Adjuntar a otros presupuestos
-AddToMyBills=Adjuntar a mis facturas
-AddToOtherBills=Adjuntar a otras facturas
+AddToMyProposals=Añadir a mis presupuestos
+AddToOtherProposals=Añadir a otros presupuestos
+AddToMyBills=Añadir a mis facturas
+AddToOtherBills=Añadir a otras facturas
 CorrectStock=Corregir stock
 AddPhoto=Adjuntar una foto
 ListOfStockMovements=Listado de movimientos de stock
@@ -114,6 +114,8 @@ AssociatedProductsAbility=Activar productos compuestos
 AssociatedProducts=Productos compuestos
 AssociatedProductsNumber=Nº de productos que componen este producto
 ParentProductsNumber=Nº de productos que este producto compone
+IfZeroItIsNotAVirtualProduct=Si 0, este producto no es un producto virtual
+IfZeroItIsNotUsedByVirtualProduct=Si 0, este producto no está siendo utilizado por ningún producto virtual
 EditAssociate=Componer
 Translation=Traducción
 KeywordFilter=Filtro por clave
diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php
index 0a8aed4634f..fa1f0fa5621 100644
--- a/htdocs/product/fiche.php
+++ b/htdocs/product/fiche.php
@@ -1417,7 +1417,7 @@ if ($object->id && ($action == '' || $action == 'view') && $object->status)
     	$langs->load("bills");
 
     	$html .= '<tr class="liste_titre">';
-    	$html .= '<td class="liste_titre">'.$langs->trans("AddToOtherOrders").'</td>';
+    	$html .= '<td class="liste_titre">'.$langs->trans("AddToOtherBills").'</td>';
         $html .= '</tr><tr>';
     	$html .= '<td valign="top">';
 

From 17efbd41c75f6565cc1313f9c0f4dedcbab9a12f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a?= <marcosgdf@gmail.com>
Date: Sat, 8 Jun 2013 20:18:09 +0200
Subject: [PATCH 17/22] Improved es_ES translation

---
 htdocs/langs/es_ES/products.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang
index f7ae35cc0db..fc9a1fb1d3c 100644
--- a/htdocs/langs/es_ES/products.lang
+++ b/htdocs/langs/es_ES/products.lang
@@ -91,7 +91,7 @@ AddToOtherBills=Añadir a otras facturas
 CorrectStock=Corregir stock
 AddPhoto=Adjuntar una foto
 ListOfStockMovements=Listado de movimientos de stock
-NoPhotoYet=No hay fotografía disponible por el momento
+NoPhotoYet=No hay fotografías disponibles por el momento
 BuyingPrice=Precio de compra
 SupplierCard=Ficha proveedor
 CommercialCard=Ficha comercial

From cf6bfcc9c4aee94dd340ec73c69b61282ba2ece0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a?= <marcosgdf@gmail.com>
Date: Sat, 8 Jun 2013 20:31:39 +0200
Subject: [PATCH 18/22] Missing translations

---
 htdocs/comm/propal/stats/index.php    | 3 ++-
 htdocs/commande/stats/index.php       | 3 ++-
 htdocs/compta/facture/stats/index.php | 7 ++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php
index a4b7ad69d24..cb35f6c782a 100644
--- a/htdocs/comm/propal/stats/index.php
+++ b/htdocs/comm/propal/stats/index.php
@@ -53,7 +53,8 @@ $endyear=$year;
 
 $form=new Form($db);
 
-$langs->load("propal");
+$langs->load('propal');
+$langs->load('other');
 
 llxHeader();
 
diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
index 07dfb674c74..85bbaae9ef2 100644
--- a/htdocs/commande/stats/index.php
+++ b/htdocs/commande/stats/index.php
@@ -51,7 +51,8 @@ $year = GETPOST('year')>0?GETPOST('year'):$nowyear;
 $startyear=$year-1;
 $endyear=$year;
 
-$langs->load("orders");
+$langs->load('orders');
+$langs->load('other');
 
 
 /*
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index 895cadbf2d9..af45fb24ca7 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -54,8 +54,9 @@ $endyear=$year;
  * View
  */
 
-$langs->load("bills");
-$langs->load("companies");
+$langs->load('bills');
+$langs->load('companies');
+$langs->load('other');
 
 $form=new Form($db);
 
@@ -233,7 +234,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 	print $form->select_company($socid,'socid',$filter,1);
 	print '</td></tr>';
 	// User
-	print '<tr><td>'.$langs->trans("Author").'</td><td>';
+	print '<tr><td>'.$langs->trans("CreatedBy").'</td><td>';
 	print $form->select_users($userid,'userid',1);
 	print '</td></tr>';
 	// Year

From 3b28de0a077894e85c921740094aa322af1fe8c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a?= <marcosgdf@gmail.com>
Date: Sat, 8 Jun 2013 21:57:57 +0200
Subject: [PATCH 19/22] Fixed some translation problems

---
 htdocs/core/class/html.form.class.php | 18 +++++++++---------
 htdocs/ecm/docmine.php                |  1 +
 htdocs/fourn/commande/fiche.php       |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 000f14ee59f..cb8bc2ee872 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -701,13 +701,13 @@ class Form
                 	$selected_input_value=$product->ref;
                 }
 =======
-				if ($selected && empty($selected_input_value))
-                {
-                	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-                	$product = new Product($this->db);
-                	$product->fetch($selected);
-                	$selected_input_value=$product->ref;
-                }
+				if ($selected && empty($selected_input_value))
+                {
+                	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+                	$product = new Product($this->db);
+                	$product->fetch($selected);
+                	$selected_input_value=$product->ref;
+                }
 >>>>>>> refs/remotes/origin/3.3
                 // mode=1 means customers products
                 $ajaxoptions=array();
@@ -1657,8 +1657,8 @@ class Form
                     {
     	                $opt.= price($objp->fprice).' '.$currencytext."/".$objp->quantity;
 	                    $outval.= price($objp->fprice).' '.$currencytextnoent."/".$objp->quantity;
-                    	$opt.= $langs->trans("Units");	// Do not use strtolower because it breaks utf8 encoding
-                        $outval.=$langs->transnoentities("Units");
+                    	$opt.= ' '.$langs->trans("Units");	// Do not use strtolower because it breaks utf8 encoding
+                        $outval.= ' '.$langs->transnoentities("Units");
                     }
 
                     if ($objp->quantity >= 1)
diff --git a/htdocs/ecm/docmine.php b/htdocs/ecm/docmine.php
index 23ac16e75fe..8ba84f6fc76 100644
--- a/htdocs/ecm/docmine.php
+++ b/htdocs/ecm/docmine.php
@@ -132,6 +132,7 @@ if ($action == 'confirm_deletedir' && $confirm == 'yes')
 	}
 	else
 	{
+		$langs->load('errors');
 		setEventMessage($langs->trans($ecmdir->error,$ecmdir->label), 'errors');
 	}
 }
diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php
index 1bb3fa405af..8bdd44adcf3 100644
--- a/htdocs/fourn/commande/fiche.php
+++ b/htdocs/fourn/commande/fiche.php
@@ -1109,7 +1109,7 @@ elseif (! empty($object->id))
 					//'text' => $langs->trans("ConfirmClone"),
 					//array('type' => 'checkbox', 'name' => 'clone_content',   'label' => $langs->trans("CloneMainAttributes"),   'value' => 1),
 					//array('type' => 'checkbox', 'name' => 'update_prices',   'label' => $langs->trans("PuttingPricesUpToDate"),   'value' => 1),
-					array('type' => 'other', 'name' => 'idwarehouse',   'label' => $langs->trans("SelectWarehouseForStockDecrease"),   'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse'),'idwarehouse','',1))
+					array('type' => 'other', 'name' => 'idwarehouse',   'label' => $langs->trans("SelectWarehouseForStockIncrease"),   'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse'),'idwarehouse','',1))
 			);
 		}
 

From e85b72e4521943e9ba2135d7d2c9d52c41e82565 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 9 Jun 2013 15:59:51 +0200
Subject: [PATCH 20/22] Fix: Bad error management

---
 htdocs/fourn/class/fournisseur.commande.class.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 3374393310e..633115fa373 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -986,8 +986,7 @@ class CommandeFournisseur extends CommonOrder
 	                );
 	                if ($result < 0)
 	                {
-	                    $this->error=$this->db->lasterror();
-	                    dol_print_error($this->db);
+	                    dol_syslog(get_class($this)."::create ".$this->error, LOG_WARNING);	// do not use dol_print_error here as it may be a functionnal error
 	                    $this->db->rollback();
 	                    return -1;
 	                }
@@ -1022,7 +1021,7 @@ class CommandeFournisseur extends CommonOrder
 	                    }
 	                    else if ($reshook < 0) $error++;
                     }
-					
+
 					if (! $notrigger)
 	                {
 	                    // Appel des triggers
@@ -1441,7 +1440,7 @@ class CommandeFournisseur extends CommonOrder
         {
             $error++;
         }
-        
+
         // Remove extrafields
         if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
         {

From a5f401f9138f3f75b66ff926f95a84aa683b2b57 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 9 Jun 2013 16:13:59 +0200
Subject: [PATCH 21/22] Fix: phpunit file

---
 test/phpunit/phpunittest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/phpunit/phpunittest.xml b/test/phpunit/phpunittest.xml
index 424359786ae..35083cb6d0f 100644
--- a/test/phpunit/phpunittest.xml
+++ b/test/phpunit/phpunittest.xml
@@ -47,6 +47,7 @@
 	    <directory suffix=".php">../../htdocs/societe/canvas/</directory>
 	    <directory suffix=".php">../../htdocs/includes/</directory>
 	    <file>../../htdocs/boutique/osc_master.inc.php</file>
+	    <file>../../htdocs/holiday/common.inc.php</file>
 	    </exclude>
 	  </whitelist>
 	</filter>

From 050819ce0b6e5a2ef0318c46e0f3fb38a75f1f8f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 9 Jun 2013 16:15:12 +0200
Subject: [PATCH 22/22] Fix: dead code

---
 htdocs/holiday/common.inc.php | 25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

diff --git a/htdocs/holiday/common.inc.php b/htdocs/holiday/common.inc.php
index 072b4818be6..adf490b61a3 100644
--- a/htdocs/holiday/common.inc.php
+++ b/htdocs/holiday/common.inc.php
@@ -42,27 +42,4 @@ if (empty($conf->holiday->enabled))
     exit();
 }
 
-
-/*$sql = "SELECT value";
-$sql.= " FROM ".MAIN_DB_PREFIX."holiday_config";
-$sql.= " WHERE name = 'userGroup'";
-
-$result = $db->query($sql);
-$obj = $db->fetch_object($result);
-
-if ($obj->value == null || $obj->value < 0)
-{
-    llxHeader('',$langs->trans('CPTitreMenu'));
-
-    $langs->load("errors");
-	$warnpicto=img_error($langs->trans("WarningMandatorySetupNotComplete"));
-	print '<div class="tabBar">';
-	print $warnpicto.' '.$langs->trans("NotConfigModCP");
-	print '</div>';
-
-    llxFooter();
-    exit();
-}
-*/
-
-?>
+?>
\ No newline at end of file