From 13e5c8ff7ac61bd3b22810d06a229f7c7d768166 Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Mon, 26 Jun 2017 22:44:56 +0200
Subject: [PATCH 01/17] Create patch

Add Number of supplier prices and wap columns
---
 .../fourn/class/fournisseur.product.class.php | 28 ++++++++---
 htdocs/langs/en_US/suppliers.lang             |  1 +
 htdocs/product/list.php                       | 49 ++++++++++++++++++-
 3 files changed, 70 insertions(+), 8 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 4f576148099..e8a63e252d7 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -699,17 +699,33 @@ class ProductFournisseur extends Product
     /**
      *	Display price of product
      *
-     *  @param	int		$showunitprice	Show "Unit price" into output string
-     *  @param	int		$showsuptitle	Show "Supplier" into output string
-     *	@param	int		$maxlen			Max length of name
-     *  @param	integer	$notooltip		1=Disable tooltip
+     *  @param	int		$showunitprice	    Show "Unit price" into output string
+     *  @param	int		$showsuptitle	    Show "Supplier" into output string
+     *	@param	int		$maxlen			    Max length of name
+     *  @param	integer	$notooltip		    1=Disable tooltip
+     *  @param  array   $productFournList   list of ProductFournisseur objects to display in table format.
      *	@return	string					String with supplier price
      */
-    function display_price_product_fournisseur($showunitprice=1,$showsuptitle=1,$maxlen=0,$notooltip=0)
+    function display_price_product_fournisseur($showunitprice=1,$showsuptitle=1,$maxlen=0,$notooltip=0, $productFournList=array())
     {
         global $langs;
+
+        $out = '';
         $langs->load("suppliers");
-        $out=($showunitprice?price($this->fourn_unitprice * (1 - $this->fourn_remise_percent/100) + $this->fourn_unitcharges - $this->fourn_remise).' '.$langs->trans("HT").' &nbsp; (':'').($showsuptitle?$langs->trans("Supplier").': ':'').$this->getSocNomUrl(1, 'supplier', $maxlen, $notooltip).' / '.$langs->trans("SupplierRef").': '.$this->fourn_ref.($showunitprice?')':'');
+        if (count($productFournList) > 0) {
+            $out .= '<table>';
+            $out .= '<tr><td align="right">'.($showunitprice?$langs->trans("Price").' '.$langs->trans("HT"):'').'</td>';
+            $out .= '<td>'.$langs->trans("Supplier").'</td>';
+            $out .= '<td>'.$langs->trans("SupplierRef").'</td></tr>';
+            foreach ($productFournList as $productFourn) {
+                $out.= '<tr><td align="right">'.($showunitprice?price($productFourn->fourn_unitprice * (1 -$productFourn->fourn_remise_percent/100) + $productFourn->fourn_unitcharges - $productFourn->fourn_remise):'').'</td>';
+                $out.= '<td>'.$productFourn->getSocNomUrl(1, 'supplier', $maxlen, $notooltip).'</td>';
+                $out.= '<td>'.$productFourn->fourn_ref.'<td></tr>';
+            }
+            $out .= '</table>';      
+        } else {
+            $out=($showunitprice?price($this->fourn_unitprice * (1 - $this->fourn_remise_percent/100) + $this->fourn_unitcharges - $this->fourn_remise).' '.$langs->trans("HT").' &nbsp; (':'').($showsuptitle?$langs->trans("Supplier").': ':'').$this->getSocNomUrl(1, 'supplier', $maxlen, $notooltip).' / '.$langs->trans("SupplierRef").': '.$this->fourn_ref.($showunitprice?')':'');
+        }
         return $out;
     }
 
diff --git a/htdocs/langs/en_US/suppliers.lang b/htdocs/langs/en_US/suppliers.lang
index d84925d0676..079b588167f 100644
--- a/htdocs/langs/en_US/suppliers.lang
+++ b/htdocs/langs/en_US/suppliers.lang
@@ -43,3 +43,4 @@ NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
+BuyingPriceNumShort=Nbr of Buying prices
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 74f9c59cff3..fa0ee2cace7 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -164,6 +164,8 @@ $arrayfields=array(
     'p.duration'=>array('label'=>$langs->trans("Duration"), 'checked'=>($contextpage != 'productlist'), 'enabled'=>(! empty($conf->service->enabled))),
 	'p.sellprice'=>array('label'=>$langs->trans("SellingPrice"), 'checked'=>1, 'enabled'=>empty($conf->global->PRODUIT_MULTIPRICES)),
     'p.minbuyprice'=>array('label'=>$langs->trans("BuyingPriceMinShort"), 'checked'=>1, 'enabled'=>(! empty($user->rights->fournisseur->lire))),
+	'p.numbuyprice'=>array('label'=>$langs->trans("BuyingPriceNumShort"), 'checked'=>0, 'enabled'=>(! empty($user->rights->fournisseur->lire))),
+	'p.pmp'=>array('label'=>$langs->trans("PMPValueShort"), 'checked'=>0, 'enabled'=>(! empty($user->rights->fournisseur->lire))),
 	'p.seuil_stock_alerte'=>array('label'=>$langs->trans("StockLimit"), 'checked'=>0, 'enabled'=>(! empty($conf->stock->enabled) && $user->rights->stock->lire && $contextpage != 'service')),
     'p.desiredstock'=>array('label'=>$langs->trans("DesiredStock"), 'checked'=>1, 'enabled'=>(! empty($conf->stock->enabled) && $user->rights->stock->lire && $contextpage != 'service')),
     'p.stock'=>array('label'=>$langs->trans("PhysicalStock"), 'checked'=>1, 'enabled'=>(! empty($conf->stock->enabled) && $user->rights->stock->lire && $contextpage != 'service')),
@@ -266,7 +268,7 @@ else
     $sql = 'SELECT DISTINCT p.rowid, p.ref, p.label, p.fk_product_type, p.barcode, p.price, p.price_ttc, p.price_base_type, p.entity,';
     $sql.= ' p.fk_product_type, p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock,';
     $sql.= ' p.tobatch, p.accountancy_code_sell, p.accountancy_code_buy,';
-    $sql.= ' p.datec as date_creation, p.tms as date_update,';
+    $sql.= ' p.datec as date_creation, p.tms as date_update, p.pmp,';
     //$sql.= ' pfp.ref_fourn as ref_supplier, ';
     $sql.= ' MIN(pfp.unitprice) as minsellprice';
 	if (!empty($conf->variants->enabled) && $search_hidechildproducts && ($search_type === 0)) {
@@ -335,7 +337,7 @@ else
 	$sql.=$hookmanager->resPrint;
     $sql.= " GROUP BY p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type,";
     $sql.= " p.fk_product_type, p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock,";
-    $sql.= ' p.datec, p.tms, p.entity, p.tobatch, p.accountancy_code_sell, p.accountancy_code_buy';
+    $sql.= ' p.datec, p.tms, p.entity, p.tobatch, p.accountancy_code_sell, p.accountancy_code_buy, p.pmp';
 	if (!empty($conf->variants->enabled) && $search_hidechildproducts && ($search_type === 0)) {
 		$sql .= ', pac.rowid';
 	}
@@ -563,6 +565,20 @@ else
     			print '<td class="liste_titre">';
     			print '&nbsp;';
     			print '</td>';
+    		}
+			// Number buying Price
+			if (! empty($arrayfields['p.numbuyprice']['checked']))
+    		{
+    			print '<td class="liste_titre">';
+    			print '&nbsp;';
+    			print '</td>';
+    		}
+			// Number buying Price
+			if (! empty($arrayfields['p.pmp']['checked']))
+    		{
+    			print '<td class="liste_titre">';
+    			print '&nbsp;';
+    			print '</td>';
     		}
     	    // Limit for alert
 			if (! empty($arrayfields['p.seuil_stock_alerte']['checked']))
@@ -640,6 +656,8 @@ else
     		if (! empty($arrayfields['p.duration']['checked']))  print_liste_field_titre($arrayfields['p.duration']['label'], $_SERVER["PHP_SELF"],"p.duration","",$param,'align="center"',$sortfield,$sortorder);
     		if (! empty($arrayfields['p.sellprice']['checked']))  print_liste_field_titre($arrayfields['p.sellprice']['label'], $_SERVER["PHP_SELF"],"","",$param,'align="right"',$sortfield,$sortorder);
     		if (! empty($arrayfields['p.minbuyprice']['checked']))  print_liste_field_titre($arrayfields['p.minbuyprice']['label'], $_SERVER["PHP_SELF"],"","",$param,'align="right"',$sortfield,$sortorder);
+    		if (! empty($arrayfields['p.numbuyprice']['checked']))  print_liste_field_titre($arrayfields['p.numbuyprice']['label'], $_SERVER["PHP_SELF"],"","",$param,'align="right"',$sortfield,$sortorder);
+    		if (! empty($arrayfields['p.pmp']['checked']))  print_liste_field_titre($arrayfields['p.pmp']['label'], $_SERVER["PHP_SELF"],"","",$param,'align="right"',$sortfield,$sortorder);
     		if (! empty($arrayfields['p.seuil_stock_alerte']['checked']))  print_liste_field_titre($arrayfields['p.seuil_stock_alerte']['label'], $_SERVER["PHP_SELF"],"p.seuil_stock_alerte","",$param,'align="right"',$sortfield,$sortorder);
     		if (! empty($arrayfields['p.desiredstock']['checked']))  print_liste_field_titre($arrayfields['p.desiredstock']['label'], $_SERVER["PHP_SELF"],"p.desiredstock","",$param,'align="right"',$sortfield,$sortorder);
     		if (! empty($arrayfields['p.stock']['checked']))  print_liste_field_titre($arrayfields['p.stock']['label'], $_SERVER["PHP_SELF"],"p.stock","",$param,'align="right"',$sortfield,$sortorder);
@@ -703,6 +721,7 @@ else
     			$product_static->status_buy = $obj->tobuy;
                 $product_static->status     = $obj->tosell;
 				$product_static->entity = $obj->entity;
+				$product_static->pmp = $obj->pmp;
 
 				if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $search_type != 1)	// To optimize call of load_stock
 				{
@@ -798,6 +817,32 @@ else
         			print '</td>';
     			}
 
+				// Number of buy prices
+ 			    if (! empty($arrayfields['p.numbuyprice']['checked']))
+    			{
+        			print  '<td align="right">';
+    			    if ($obj->tobuy)
+        			{
+    					if (($productFournList = $product_fourn->list_product_fournisseur_price($product_fourn->id)) > 0)
+    					{
+    						$htmltext=$product_fourn->display_price_product_fournisseur(1, 1, 0, 1, $productFournList);
+    						print $form->textwithpicto(count($productFournList),$htmltext);
+    					}
+        			}
+        			print '</td>';
+    			}
+
+				// WAP
+ 			    if (! empty($arrayfields['p.pmp']['checked']))
+    			{
+        			print  '<td align="right">';
+    			    if ($obj->tobuy)
+        			{
+    					print price($product_static->pmp, 1, $langs, 1, 2, 1, 'auto');
+        			}
+        			print '</td>';
+    			}
+
     		    // Limit alert
 		        if (! empty($arrayfields['p.seuil_stock_alerte']['checked']))
         		{

From 7556a604e364a6d4cb3d5517605170012277bf84 Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Thu, 29 Jun 2017 16:30:57 +0200
Subject: [PATCH 02/17] fix travis

---
 .../class/accountancycategory.class.php       | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php
index 7668756a046..a7bab16b30d 100644
--- a/htdocs/accountancy/class/accountancycategory.class.php
+++ b/htdocs/accountancy/class/accountancycategory.class.php
@@ -429,7 +429,7 @@ class AccountancyCategory
 			return - 1;
 		}
 	}
-	
+
 	public function getCats() {
 		global $db, $langs, $user, $mysoc;
 
@@ -462,7 +462,7 @@ class AccountancyCategory
 			if ($num) {
 				while ( $i < $num ) {
 					$obj = $this->db->fetch_object($resql);
-					
+
 					$data[] = array (
 							'rowid' => $obj->rowid,
 							'code' => $obj->code,
@@ -483,10 +483,10 @@ class AccountancyCategory
 			return - 1;
 		}
 	}
-	
-	
-	// calcule 
-	
+
+
+	// calcule
+
 	const PATTERN = '/(?:\-?\d+(?:\.?\d+)?[\+\-\*\/])+\-?\d+(?:\.?\d+)?/';
 
 	const PARENTHESIS_DEPTH = 10;
@@ -535,10 +535,12 @@ class AccountancyCategory
 
 		return 0;
 	}
-	
+
 	/**
 	 * get cpts of category
 	 *
+	 * @param int $cat_id Id accounting account category
+	 *
 	 * @return array       Result in table
 	 */
 	public function getCptsCat($cat_id) {
@@ -554,7 +556,7 @@ class AccountancyCategory
 		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as t";
 		$sql .= " WHERE t.fk_accounting_category = ".$cat_id;
 		$sql .= " ORDER BY t.account_number ";
-		
+
 		//echo $sql;
 
 		$resql = $this->db->query($sql);
@@ -582,5 +584,5 @@ class AccountancyCategory
 			return -1;
 		}
 	}
-	
+
 }

From 7dc4eeddf04d0bfb6de78a5c4bcf6c793e32c405 Mon Sep 17 00:00:00 2001
From: KHELIFA <kkhelifa@open-dsi.fr>
Date: Thu, 29 Jun 2017 16:44:52 +0200
Subject: [PATCH 03/17] FIX: Function load_board in commande.class.php for
 warnings delay in dashboard

---
 htdocs/commande/class/commande.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 93df2f1aa0b..eb62d84ce48 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -3243,7 +3243,8 @@ class Commande extends CommonOrder
                 $response->nbtodo++;
 
                 $generic_commande->statut = $obj->fk_statut;
-                $generic_commande->date_livraison = $obj->delivery_date;
+                $generic_commande->date_commande = $this->db->jdate($obj->date_commande);
+                $generic_commande->date_livraison = $this->db->jdate($obj->delivery_date);
 
                 if ($generic_commande->hasDelay()) {
 		            $response->nbtodolate++;

From 62f8aa8b40f1a45ee22a8ddfff25a54b462835f6 Mon Sep 17 00:00:00 2001
From: KHELIFA <kkhelifa@open-dsi.fr>
Date: Thu, 29 Jun 2017 16:49:30 +0200
Subject: [PATCH 04/17] Fix: In supplier order, show link Now for order date
 and delivery date

---
 htdocs/fourn/commande/card.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index bdd38ebc0b7..d49d9df85d2 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -2704,7 +2704,7 @@ elseif (! empty($object->id))
 		    //print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("ToOrder").'</td></tr>';
 		    print '<tr><td>'.$langs->trans("OrderDate").'</td><td>';
 		    $date_com = dol_mktime(0, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
-		    print $form->select_date($date_com,'',1,1,'',"commande",1,0,1);
+		    print $form->select_date($date_com,'',1,1,'',"commande",1,1,1);
 		    print '</td></tr>';
 
 		    print '<tr><td>'.$langs->trans("OrderMode").'</td><td>';
@@ -2756,7 +2756,7 @@ if ($action != 'makeorder')
 			print '<table class="noborder" width="100%">';
 			//print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Receive").'</td></tr>';
 			print '<tr><td>'.$langs->trans("DeliveryDate").'</td><td>';
-			print $form->select_date('','',1,1,'',"commande",1,0,1);
+			print $form->select_date('','',1,1,'',"commande",1,1,1);
 			print "</td></tr>\n";
 
 			print "<tr><td>".$langs->trans("Delivery")."</td><td>\n";

From 7d4a093d9ebd49be669e43061e037dff7280f2d5 Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Fri, 30 Jun 2017 10:52:54 +0200
Subject: [PATCH 05/17] WAP alway decimal 2 digits

---
 .../fourn/class/fournisseur.product.class.php | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 38a1ea366c5..bcbaf18e9f5 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -699,12 +699,13 @@ class ProductFournisseur extends Product
     /**
      *	Display price of product
      *
-     *  @param	int		$showunitprice	    Show "Unit price" into output string
-     *  @param	int		$showsuptitle	    Show "Supplier" into output string
-     *	@param	int		$maxlen			    Max length of name
-     *  @param	integer	$notooltip		    1=Disable tooltip
-     *  @param  array   $productFournList   list of ProductFournisseur objects to display in table format.
-     *	@return	string					String with supplier price
+     *  @param  int     $showunitprice    Show "Unit price" into output string
+     *  @param  int     $showsuptitl      Show "Supplier" into output string
+     *  @param  int     $maxlen           Max length of name
+     *  @param  integer $notooltip        1=Disable tooltip
+     *  @param  array   $productFournList  list of ProductFournisseur objects 
+     *                                    to display in table format.
+     *  @return string                    String with supplier price
      */
     function display_price_product_fournisseur($showunitprice=1,$showsuptitle=1,$maxlen=0,$notooltip=0, $productFournList=array())
     {
@@ -713,16 +714,18 @@ class ProductFournisseur extends Product
         $out = '';
         $langs->load("suppliers");
         if (count($productFournList) > 0) {
-            $out .= '<table>';
-            $out .= '<tr><td align="right">'.($showunitprice?$langs->trans("Price").' '.$langs->trans("HT"):'').'</td>';
-            $out .= '<td>'.$langs->trans("Supplier").'</td>';
-            $out .= '<td>'.$langs->trans("SupplierRef").'</td></tr>';
+            $out .= '<table class="nobordernopadding" width="100%">';
+            $out .= '<tr><td class="liste_titre" align="right">'.($showunitprice?$langs->trans("Price").' '.$langs->trans("HT"):'').'</td>';
+            $out .= '<td class="liste_titre" align="right">'.($showunitprice?$langs->trans("QtyMin"):'').'</td>';
+            $out .= '<td class="liste_titre">'.$langs->trans("Supplier").'</td>';
+            $out .= '<td class="liste_titre">'.$langs->trans("SupplierRef").'</td></tr>';
             foreach ($productFournList as $productFourn) {
                 $out.= '<tr><td align="right">'.($showunitprice?price($productFourn->fourn_unitprice * (1 -$productFourn->fourn_remise_percent/100) + $productFourn->fourn_unitcharges - $productFourn->fourn_remise):'').'</td>';
+                $out.= '<td align="right">'.($showunitprice?$productFourn->fourn_qty:'').'</td>';
                 $out.= '<td>'.$productFourn->getSocNomUrl(1, 'supplier', $maxlen, $notooltip).'</td>';
                 $out.= '<td>'.$productFourn->fourn_ref.'<td></tr>';
             }
-            $out .= '</table>';      
+            $out .= '</table>';
         } else {
             $out=($showunitprice?price($this->fourn_unitprice * (1 - $this->fourn_remise_percent/100) + $this->fourn_unitcharges - $this->fourn_remise).' '.$langs->trans("HT").' &nbsp; (':'').($showsuptitle?$langs->trans("Supplier").': ':'').$this->getSocNomUrl(1, 'supplier', $maxlen, $notooltip).' / '.$langs->trans("SupplierRef").': '.$this->fourn_ref.($showunitprice?')':'');
         }

From d0599cd9528dd9ad9e3e45d4930cf61bd6dd9159 Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Fri, 30 Jun 2017 10:54:04 +0200
Subject: [PATCH 06/17] Revert "WAP alway decimal 2 digits"

This reverts commit 7d4a093d9ebd49be669e43061e037dff7280f2d5.
---
 .../fourn/class/fournisseur.product.class.php | 25 ++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index bcbaf18e9f5..38a1ea366c5 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -699,13 +699,12 @@ class ProductFournisseur extends Product
     /**
      *	Display price of product
      *
-     *  @param  int     $showunitprice    Show "Unit price" into output string
-     *  @param  int     $showsuptitl      Show "Supplier" into output string
-     *  @param  int     $maxlen           Max length of name
-     *  @param  integer $notooltip        1=Disable tooltip
-     *  @param  array   $productFournList  list of ProductFournisseur objects 
-     *                                    to display in table format.
-     *  @return string                    String with supplier price
+     *  @param	int		$showunitprice	    Show "Unit price" into output string
+     *  @param	int		$showsuptitle	    Show "Supplier" into output string
+     *	@param	int		$maxlen			    Max length of name
+     *  @param	integer	$notooltip		    1=Disable tooltip
+     *  @param  array   $productFournList   list of ProductFournisseur objects to display in table format.
+     *	@return	string					String with supplier price
      */
     function display_price_product_fournisseur($showunitprice=1,$showsuptitle=1,$maxlen=0,$notooltip=0, $productFournList=array())
     {
@@ -714,18 +713,16 @@ class ProductFournisseur extends Product
         $out = '';
         $langs->load("suppliers");
         if (count($productFournList) > 0) {
-            $out .= '<table class="nobordernopadding" width="100%">';
-            $out .= '<tr><td class="liste_titre" align="right">'.($showunitprice?$langs->trans("Price").' '.$langs->trans("HT"):'').'</td>';
-            $out .= '<td class="liste_titre" align="right">'.($showunitprice?$langs->trans("QtyMin"):'').'</td>';
-            $out .= '<td class="liste_titre">'.$langs->trans("Supplier").'</td>';
-            $out .= '<td class="liste_titre">'.$langs->trans("SupplierRef").'</td></tr>';
+            $out .= '<table>';
+            $out .= '<tr><td align="right">'.($showunitprice?$langs->trans("Price").' '.$langs->trans("HT"):'').'</td>';
+            $out .= '<td>'.$langs->trans("Supplier").'</td>';
+            $out .= '<td>'.$langs->trans("SupplierRef").'</td></tr>';
             foreach ($productFournList as $productFourn) {
                 $out.= '<tr><td align="right">'.($showunitprice?price($productFourn->fourn_unitprice * (1 -$productFourn->fourn_remise_percent/100) + $productFourn->fourn_unitcharges - $productFourn->fourn_remise):'').'</td>';
-                $out.= '<td align="right">'.($showunitprice?$productFourn->fourn_qty:'').'</td>';
                 $out.= '<td>'.$productFourn->getSocNomUrl(1, 'supplier', $maxlen, $notooltip).'</td>';
                 $out.= '<td>'.$productFourn->fourn_ref.'<td></tr>';
             }
-            $out .= '</table>';
+            $out .= '</table>';      
         } else {
             $out=($showunitprice?price($this->fourn_unitprice * (1 - $this->fourn_remise_percent/100) + $this->fourn_unitcharges - $this->fourn_remise).' '.$langs->trans("HT").' &nbsp; (':'').($showsuptitle?$langs->trans("Supplier").': ':'').$this->getSocNomUrl(1, 'supplier', $maxlen, $notooltip).' / '.$langs->trans("SupplierRef").': '.$this->fourn_ref.($showunitprice?')':'');
         }

From 574590a59860e3cda4189a4d0e59573fd4996fc1 Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Fri, 30 Jun 2017 10:55:45 +0200
Subject: [PATCH 07/17] Add minimum qty column

---
 .../fourn/class/fournisseur.product.class.php | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 38a1ea366c5..bcbaf18e9f5 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -699,12 +699,13 @@ class ProductFournisseur extends Product
     /**
      *	Display price of product
      *
-     *  @param	int		$showunitprice	    Show "Unit price" into output string
-     *  @param	int		$showsuptitle	    Show "Supplier" into output string
-     *	@param	int		$maxlen			    Max length of name
-     *  @param	integer	$notooltip		    1=Disable tooltip
-     *  @param  array   $productFournList   list of ProductFournisseur objects to display in table format.
-     *	@return	string					String with supplier price
+     *  @param  int     $showunitprice    Show "Unit price" into output string
+     *  @param  int     $showsuptitl      Show "Supplier" into output string
+     *  @param  int     $maxlen           Max length of name
+     *  @param  integer $notooltip        1=Disable tooltip
+     *  @param  array   $productFournList  list of ProductFournisseur objects 
+     *                                    to display in table format.
+     *  @return string                    String with supplier price
      */
     function display_price_product_fournisseur($showunitprice=1,$showsuptitle=1,$maxlen=0,$notooltip=0, $productFournList=array())
     {
@@ -713,16 +714,18 @@ class ProductFournisseur extends Product
         $out = '';
         $langs->load("suppliers");
         if (count($productFournList) > 0) {
-            $out .= '<table>';
-            $out .= '<tr><td align="right">'.($showunitprice?$langs->trans("Price").' '.$langs->trans("HT"):'').'</td>';
-            $out .= '<td>'.$langs->trans("Supplier").'</td>';
-            $out .= '<td>'.$langs->trans("SupplierRef").'</td></tr>';
+            $out .= '<table class="nobordernopadding" width="100%">';
+            $out .= '<tr><td class="liste_titre" align="right">'.($showunitprice?$langs->trans("Price").' '.$langs->trans("HT"):'').'</td>';
+            $out .= '<td class="liste_titre" align="right">'.($showunitprice?$langs->trans("QtyMin"):'').'</td>';
+            $out .= '<td class="liste_titre">'.$langs->trans("Supplier").'</td>';
+            $out .= '<td class="liste_titre">'.$langs->trans("SupplierRef").'</td></tr>';
             foreach ($productFournList as $productFourn) {
                 $out.= '<tr><td align="right">'.($showunitprice?price($productFourn->fourn_unitprice * (1 -$productFourn->fourn_remise_percent/100) + $productFourn->fourn_unitcharges - $productFourn->fourn_remise):'').'</td>';
+                $out.= '<td align="right">'.($showunitprice?$productFourn->fourn_qty:'').'</td>';
                 $out.= '<td>'.$productFourn->getSocNomUrl(1, 'supplier', $maxlen, $notooltip).'</td>';
                 $out.= '<td>'.$productFourn->fourn_ref.'<td></tr>';
             }
-            $out .= '</table>';      
+            $out .= '</table>';
         } else {
             $out=($showunitprice?price($this->fourn_unitprice * (1 - $this->fourn_remise_percent/100) + $this->fourn_unitcharges - $this->fourn_remise).' '.$langs->trans("HT").' &nbsp; (':'').($showsuptitle?$langs->trans("Supplier").': ':'').$this->getSocNomUrl(1, 'supplier', $maxlen, $notooltip).' / '.$langs->trans("SupplierRef").': '.$this->fourn_ref.($showunitprice?')':'');
         }

From 989084e4dece898320c368ac34f2561f8cb245eb Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Fri, 30 Jun 2017 10:56:05 +0200
Subject: [PATCH 08/17] WAP always 2 decimals

---
 htdocs/langs/en_US/suppliers.lang |  2 +-
 htdocs/product/list.php           | 46 +++++++++++++++----------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/htdocs/langs/en_US/suppliers.lang b/htdocs/langs/en_US/suppliers.lang
index 079b588167f..28c5fe39d0d 100644
--- a/htdocs/langs/en_US/suppliers.lang
+++ b/htdocs/langs/en_US/suppliers.lang
@@ -43,4 +43,4 @@ NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
-BuyingPriceNumShort=Nbr of Buying prices
+BuyingPriceNumShort=Supplier prices
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 50bd61fad17..cb31de75892 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -829,31 +829,31 @@ else
     			}
 
 				// Number of buy prices
- 			    if (! empty($arrayfields['p.numbuyprice']['checked']))
-    			{
-        			print  '<td align="right">';
-    			    if ($obj->tobuy)
-        			{
-    					if (($productFournList = $product_fourn->list_product_fournisseur_price($product_fourn->id)) > 0)
-    					{
-    						$htmltext=$product_fourn->display_price_product_fournisseur(1, 1, 0, 1, $productFournList);
-    						print $form->textwithpicto(count($productFournList),$htmltext);
-    					}
-        			}
-        			print '</td>';
-    			}
+				if (! empty($arrayfields['p.numbuyprice']['checked']))
+				{
+					print  '<td align="right">';
+					if ($obj->tobuy)
+					{
+						if (($productFournList = $product_fourn->list_product_fournisseur_price($product_fourn->id)) > 0)
+						{
+							$htmltext=$product_fourn->display_price_product_fournisseur(1, 1, 0, 1, $productFournList);
+							print $form->textwithpicto(count($productFournList),$htmltext);
+						}
+					}
+					print '</td>';
+				}
 
 				// WAP
- 			    if (! empty($arrayfields['p.pmp']['checked']))
-    			{
-        			print  '<td align="right">';
-    			    if ($obj->tobuy)
-        			{
-    					print price($product_static->pmp, 1, $langs, 1, 2, 1, 'auto');
-        			}
-        			print '</td>';
-    			}
-
+				if (! empty($arrayfields['p.pmp']['checked']))
+				{
+					print  '<td class="nowrap" align="right">';
+					if ($obj->tobuy)
+					{
+						print price($product_static->pmp, 1, $langs, 1, 2, 2, 'auto');
+					}
+					print '</td>';
+				}
+				
     		    // Limit alert
 		        if (! empty($arrayfields['p.seuil_stock_alerte']['checked']))
         		{

From 11cd4e1164d8e3dd0380afa9e70f4566e7497fe5 Mon Sep 17 00:00:00 2001
From: Darkjeff <jeff@jeffinfo.com>
Date: Fri, 30 Jun 2017 11:29:37 +0200
Subject: [PATCH 09/17] Fix Binding Customer

---
 htdocs/accountancy/customer/list.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 75c1a59aa30..2663ab1d779 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -189,7 +189,8 @@ $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON p.accounta
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_system as accsys ON accsys.pcg_version = aa.fk_pcg_version";
 $sql .= " WHERE f.fk_statut > 0 AND l.fk_code_ventilation <= 0";
 $sql .= " AND product_type <= 2";
-$sql .= " AND (accsys.rowid='" . $conf->global->CHARTOFACCOUNTS . "' OR p.accountancy_code_sell IS NULL OR p.accountancy_code_sell ='')";
+$sql .= " AND (accsys.rowid='" . $conf->global->CHARTOFACCOUNTS . "' OR p.accountancy_code_sell IS NULL OR p.accountancy_code_sell ='' OR p.accountancy_code_sell NOT IN
+	(SELECT aa.account_number FROM " . MAIN_DB_PREFIX . "accounting_account as aa , " . MAIN_DB_PREFIX . "accounting_system as asy  WHERE fk_pcg_version = asy.pcg_version AND asy.rowid ='" . $conf->global->CHARTOFACCOUNTS . "'))";
 // Add search filter like
 if ($search_lineid) {
     $sql .= natural_search("l.rowid", $search_lineid, 1);

From 2c795da664e5c932bade64139ae121849ddbd760 Mon Sep 17 00:00:00 2001
From: Darkjeff <jeff@jeffinfo.com>
Date: Fri, 30 Jun 2017 11:30:20 +0200
Subject: [PATCH 10/17] Fix Binding Supplier

---
 htdocs/accountancy/supplier/list.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index ff39aad67f4..3077f8f337b 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -191,7 +191,8 @@ $sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON p.accountan
 $sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_system as accsys ON accsys.pcg_version = aa.fk_pcg_version";
 $sql.= " WHERE f.fk_statut > 0 AND l.fk_code_ventilation <= 0";
 $sql.= " AND product_type <= 2";
-$sql.= " AND (accsys.rowid='" . $conf->global->CHARTOFACCOUNTS . "' OR p.accountancy_code_buy IS NULL OR p.accountancy_code_buy ='')";
+$sql.= " AND (accsys.rowid='" . $conf->global->CHARTOFACCOUNTS . "' OR p.accountancy_code_buy IS NULL OR p.accountancy_code_buy =''OR p.accountancy_code_buy  NOT IN
+	(SELECT aa.account_number FROM " . MAIN_DB_PREFIX . "accounting_account as aa , " . MAIN_DB_PREFIX . "accounting_system as asy  WHERE fk_pcg_version = asy.pcg_version AND asy.rowid ='" . $conf->global->CHARTOFACCOUNTS . "'))";
 // Add search filter like
 if ($search_lineid) {
     $sql .= natural_search("l.rowid", $search_lineid, 1);

From f978b0795a5d1d119d5016cc5d6f3e83ae776deb Mon Sep 17 00:00:00 2001
From: Darkjeff <jeff@jeffinfo.com>
Date: Fri, 30 Jun 2017 11:31:24 +0200
Subject: [PATCH 11/17] Fix action in journal

---
 htdocs/accountancy/journal/bankjournal.php      | 6 +++---
 htdocs/accountancy/journal/purchasesjournal.php | 6 +++---
 htdocs/accountancy/journal/sellsjournal.php     | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index ed8d1d7501a..056f3644770 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -75,7 +75,7 @@ $date_endyear = GETPOST('date_endyear');
 $in_bookkeeping = GETPOST('in_bookkeeping');
 
 $now = dol_now();
-$action = GETPOST('action','alpha');
+$action = GETPOST('action','aZ09');
 
 // Security check
 if ($user->societe_id > 0 && empty($id_journal))
@@ -612,7 +612,7 @@ if (! $error && $action == 'writebookkeeping') {
 }
 
 // Export
-if ($action == 'export_csv') {
+if ($action == 'exportcsv') {
 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
 
 	include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php';
@@ -760,7 +760,7 @@ if (empty($action) || $action == 'view') {
 	<script type="text/javascript">
 		function launch_export() {
 			console.log("Set value into form and submit");
-			$("div.fiche div.tabBar form input[name=\"action\"]").val("export_csv");
+			$("div.fiche div.tabBar form input[name=\"action\"]").val("exportcsv");
 			$("div.fiche div.tabBar form input[type=\"submit\"]").click();
 			$("div.fiche div.tabBar form input[name=\"action\"]").val("");
 		}
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index e023e14a817..95fa7f54b54 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -43,7 +43,7 @@ $langs->load("main");
 $langs->load("accountancy");
 
 $id_journal = GETPOST('id_journal', 'int');
-$action = GETPOST('action','alpha');
+$action = GETPOST('action','aZ09');
 
 $date_startmonth = GETPOST('date_startmonth');
 $date_startday = GETPOST('date_startday');
@@ -391,7 +391,7 @@ $companystatic = new Fournisseur($db);
 $invoicestatic = new FactureFournisseur($db);
 
 // Export
-if ($action == 'export_csv') {
+if ($action == 'exportcsv') {
 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
 	$journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL;
 
@@ -519,7 +519,7 @@ if (empty($action) || $action == 'view') {
 	print '
 	<script type="text/javascript">
 		function launch_export() {
-			$("div.fiche div.tabBar form input[name=\"action\"]").val("export_csv");
+			$("div.fiche div.tabBar form input[name=\"action\"]").val("exportcsv");
 			$("div.fiche div.tabBar form input[type=\"submit\"]").click();
 			$("div.fiche div.tabBar form input[name=\"action\"]").val("");
 		}
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index edaf3a87f27..0a6240e7bdb 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -46,7 +46,7 @@ $langs->load("main");
 $langs->load("accountancy");
 
 $id_journal = GETPOST('id_journal', 'int');
-$action = GETPOST('action','alpha');
+$action = GETPOST('action','aZ09');
 
 $date_startmonth = GETPOST('date_startmonth');
 $date_startday = GETPOST('date_startday');
@@ -404,7 +404,7 @@ if ($action == 'writebookkeeping') {
 $form = new Form($db);
 
 // Export
-if ($action == 'export_csv') {
+if ($action == 'exportcsv') {
 
 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
 	$sell_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
@@ -529,7 +529,7 @@ if (empty($action) || $action == 'view') {
 	print '
 	<script type="text/javascript">
 		function launch_export() {
-			$("div.fiche div.tabBar form input[name=\"action\"]").val("export_csv");
+			$("div.fiche div.tabBar form input[name=\"action\"]").val("exportcsv");
 			$("div.fiche div.tabBar form input[type=\"submit\"]").click();
 			$("div.fiche div.tabBar form input[name=\"action\"]").val("");
 		}

From 32729adfae48eaad13aff655fd4d4d5df8f68d2e Mon Sep 17 00:00:00 2001
From: Darkjeff <jeff@jeffinfo.com>
Date: Fri, 30 Jun 2017 11:49:03 +0200
Subject: [PATCH 12/17] Journal correct negatif amount

---
 htdocs/accountancy/journal/purchasesjournal.php | 6 +++---
 htdocs/accountancy/journal/sellsjournal.php     | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index 95fa7f54b54..d95df1c26df 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -230,7 +230,7 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER;
 					$bookkeeping->montant = $mt;
 					$bookkeeping->sens = ($mt >= 0) ? 'C' : 'D';
-					$bookkeeping->debit = ($mt <= 0) ? $mt : 0;
+					$bookkeeping->debit = ($mt <= 0) ? -$mt : 0;
 					$bookkeeping->credit = ($mt > 0) ? $mt : 0;
 					$bookkeeping->code_journal = $journal;
 					$bookkeeping->journal_label = $journal_label;
@@ -280,7 +280,7 @@ if ($action == 'writebookkeeping') {
 						$bookkeeping->montant = $mt;
 						$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
 						$bookkeeping->debit = ($mt > 0) ? $mt : 0;
-						$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
+						$bookkeeping->credit = ($mt <= 0) ? -$mt : 0;
 						$bookkeeping->code_journal = $journal;
 						$bookkeeping->journal_label = $journal_label;
 						$bookkeeping->fk_user_author = $user->id;
@@ -327,7 +327,7 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->montant = $mt;
 					$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
 					$bookkeeping->debit = ($mt > 0) ? $mt : 0;
-					$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
+					$bookkeeping->credit = ($mt <= 0) ? -$mt : 0;
 					$bookkeeping->code_journal = $journal;
 					$bookkeeping->journal_label = $journal_label;
 					$bookkeeping->fk_user_author = $user->id;
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 0a6240e7bdb..54af643df54 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -1,4 +1,4 @@
-<?php
+<?php
 /* Copyright (C) 2007-2010  Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2007-2010  Jean Heimburger			<jean@tiaris.info>
  * Copyright (C) 2011       Juanjo Menent			<jmenent@2byte.es>
@@ -246,7 +246,7 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->montant = $mt;
 					$bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
 					$bookkeeping->debit = ($mt >= 0) ? $mt : 0;
-					$bookkeeping->credit = ($mt < 0) ? $mt : 0;
+					$bookkeeping->credit = ($mt < 0) ? -$mt : 0;
 					$bookkeeping->code_journal = $journal;
 					$bookkeeping->journal_label = $journal_label;
 					$bookkeeping->fk_user_author = $user->id;
@@ -292,7 +292,7 @@ if ($action == 'writebookkeeping') {
 						$bookkeeping->label_operation = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $accountingaccount->label;
 						$bookkeeping->montant = $mt;
 						$bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
-						$bookkeeping->debit = ($mt < 0) ? $mt : 0;
+						$bookkeeping->debit = ($mt < 0) ? -$mt : 0;
 						$bookkeeping->credit = ($mt >= 0) ? $mt : 0;
 						$bookkeeping->code_journal = $journal;
 						$bookkeeping->journal_label = $journal_label;
@@ -338,7 +338,7 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->label_operation = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT").' '.join(', ',$def_tva[$key][$k]);
 					$bookkeeping->montant = $mt;
 					$bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
-					$bookkeeping->debit = ($mt < 0) ? $mt : 0;
+					$bookkeeping->debit = ($mt < 0) ? -$mt : 0;
 					$bookkeeping->credit = ($mt >= 0) ? $mt : 0;
 					$bookkeeping->code_journal = $journal;
 					$bookkeeping->journal_label = $journal_label;

From 180467ba5635f746ab6a4cfd13e69935a6532e6d Mon Sep 17 00:00:00 2001
From: Darkjeff <jeff@jeffinfo.com>
Date: Fri, 30 Jun 2017 11:53:15 +0200
Subject: [PATCH 13/17] add lettering

---
 .../bookkeeping/thirdparty_lettrage.php       | 322 +++++++++++++++++
 .../thirdparty_lettrage_supplier.php          | 332 ++++++++++++++++++
 htdocs/accountancy/class/lettering.class.php  | 327 +++++++++++++++++
 3 files changed, 981 insertions(+)
 create mode 100644 htdocs/accountancy/bookkeeping/thirdparty_lettrage.php
 create mode 100644 htdocs/accountancy/bookkeeping/thirdparty_lettrage_supplier.php
 create mode 100644 htdocs/accountancy/class/lettering.class.php

diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettrage.php b/htdocs/accountancy/bookkeeping/thirdparty_lettrage.php
new file mode 100644
index 00000000000..424aa65eb67
--- /dev/null
+++ b/htdocs/accountancy/bookkeeping/thirdparty_lettrage.php
@@ -0,0 +1,322 @@
+<?php
+/* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2005      Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2013      Olivier Geffroy      <jeff@jeffinfo.com>
+ * Copyright (C) 2013      Florian Henry	      <florian.henry@open-concept.pro>
+ * Copyright (C) 2013      Alexandre Spangaro   <alexandre.spangaro@gmail.com> 
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * \file    accounting/bookkeeping/thirdparty_lettrage.php
+ * \ingroup Accounting Expert
+ * \brief   Onglet de gestion de parametrages des ventilations
+ */
+
+require '../../main.inc.php';
+
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/lettering.class.php';
+require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
+
+$page = GETPOST ( "page" );
+$sortorder = GETPOST ( "sortorder" );
+$search_year = GETPOST ( "search_year" );
+$sortfield = GETPOST ( "sortfield" );
+$action = GETPOST ( 'action', 'alpha' );
+
+
+// Security check
+$socid = GETPOST("socid",'int');
+// if ($user->societe_id) $socid=$user->societe_id;
+
+$object = new Societe($db);
+$object->id = $socid;
+$object->fetch($socid);
+$form = new Form($db);
+
+$BookKeeping = new lettering($db); 
+
+if ($sortorder == "") $sortorder = "ASC";
+if ($sortfield == "") $sortfield = "bk.rowid";
+
+$offset = $conf->liste_limit * $page;
+
+$formaccounting = new FormAccounting($db);
+
+/*
+ * Action
+ */
+if ($action == 'lettering') {
+
+	$result =  $BookKeeping->updatelettrage($_POST['ids']);
+	
+// 	var_dump($result); 
+	if( $result < 0 ){
+		setEventMessages('', $BookKeeping->errors, 'errors' );
+		$error++; 
+
+	}
+}
+
+if ($action == 'autolettrage') {
+
+	$result = $BookKeeping->LettrageTiers($socid);
+	
+	if( $result < 0 ){
+							setEventMessages('', $BookKeeping->errors, 'errors' );
+							$error++; 
+
+						}
+						
+}
+
+
+llxHeader ( '', 'Compta - Grand Livre' );
+	
+	
+	/*
+	 * Affichage onglets
+	 */
+	$head = societe_prepare_head($object);
+
+	dol_htmloutput_mesg(is_numeric($error)?'':$error, $errors, 'error');
+	 
+	dol_fiche_head($head, 'TabAccounting', $langs->trans("ThirdParty"),0,'company');
+	
+	
+
+
+	print '<table width="100%" class="border">';
+	print '<tr><td width="30%">'.$langs->trans("ThirdPartyName").'</td><td width="70%" colspan="3">';
+	$object->next_prev_filter="te.fournisseur = 1";
+	print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom','','');
+	print '</td></tr>';
+
+    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+    {
+        print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
+    }
+
+
+		print '<tr>';
+        print '<td class="nowrap">'.$langs->trans("CustomerCode"). '</td><td colspan="3">';
+        print $object->code_client;
+        if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+        print '</td>';
+        print '</tr>';
+
+		$langs->load('compta');
+        print '<tr>';
+        print '<td>';
+        print $form->editfieldkey("CustomerAccountancyCode",'customeraccountancycode',$object->code_compta,$object,$user->rights->societe->creer);
+        print '</td><td colspan="3">';
+        print $form->editfieldval("CustomerAccountancyCode",'customeraccountancycode',$object->code_compta,$object,$user->rights->societe->creer);
+        print '</td>';
+        print '</tr>';
+	
+
+	// Address
+	print '<tr><td valign="top">'.$langs->trans("Address").'</td><td colspan="3">';
+	dol_print_address($object->address,'gmap','thirdparty',$object->id);
+	print '</td></tr>';
+
+	// Zip / Town
+	print '<tr><td class="nowrap">'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td colspan="3">'.$object->zip.(($object->zip && $object->town)?' / ':'').$object->town.'</td>';
+	print '</tr>';
+
+	// Country
+	print '<tr><td>'.$langs->trans("Country").'</td><td colspan="3">';
+	//$img=picto_from_langcode($object->country_code);
+	$img='';
+	if ($object->isInEEC()) print $form->textwithpicto(($img?$img.' ':'').$object->country,$langs->trans("CountryIsInEEC"),1,0);
+	else print ($img?$img.' ':'').$object->country;
+	print '</td></tr>';
+	
+	print '</table>';
+	
+
+    
+
+	
+	$sql = "SELECT bk.rowid, bk.doc_date, bk.doc_type, bk.doc_ref, bk.code_tiers, bk.numero_compte , bk.label_compte, bk.debit , bk.credit, bk.montant , bk.sens , bk.code_journal , bk.piece_num, bk.lettering_code ";
+	$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as bk";
+	$sql .= " WHERE (bk.code_tiers =  '" . $object->code_compta . "' AND bk.numero_compte = '" .$conf->global->ACCOUNTING_ACCOUNT_CUSTOMER. "' )" ;
+
+	
+
+	if (dol_strlen ( $search_year  )) {
+		$sql .= " AND ( bk.doc_date BETWEEN  '" . $search_year . "-0-0' AND  '" . ($search_year+1). "-0-0' )";
+	}
+
+	
+	$sql .= " ORDER BY bk.lettering_code ASC, bk.doc_date ASC" ;//. $db->plimit ( $conf->liste_limit + 1, $offset );
+	
+// 	echo $sql; 
+// 	dol_syslog ( "bookkeping:liste:create sql=" . $sql, LOG_DEBUG );
+	$resql = $db->query ( $sql );
+	if ($resql) {
+		$num = $db->num_rows ( $resql );
+		$i = 0;
+		
+
+		print '<form name="add" action="?socid='.$object->id.'" method="POST">';
+		print '<input type="hidden" name="action" value="lettering">';
+		print '<input type="hidden" name="socid" value="'.$object->id.'">';
+		
+		print "<table class=\"noborder\" width=\"100%\">";
+		print '<tr class="liste_titre">';
+			print '<td></td>'; 
+		print_liste_field_titre ( $langs->trans ( "Doctype" ), "liste.php", "bk.doc_type" );
+		print_liste_field_titre ( $langs->trans ( "Docdate" ), "liste.php", "bk.doc_date" );
+		print_liste_field_titre ( $langs->trans ( "Docref" ), "liste.php", "bk.doc_ref" );
+// 		print_liste_field_titre ( $langs->trans ( "Numerocompte" ), "liste.php", "bk.numero_compte" );
+// 		print_liste_field_titre ( $langs->trans ( "Code_tiers" ), "liste.php", "bk.code_tiers" );
+		print_liste_field_titre ( $langs->trans ( "Labelcompte" ), "liste.php", "bk_label_compte" );
+		print_liste_field_titre ( $langs->trans ( "Debit" ), "liste.php", "bk.debit" );
+		print_liste_field_titre ( $langs->trans ( "Credit" ), "liste.php", "bk.credit" );
+//		print_liste_field_titre ( $langs->trans ( "Amount" ), "liste.php", "bk.montant" );
+//		print_liste_field_titre ( $langs->trans ( "Sens" ), "liste.php", "bk.sens" );
+		print_liste_field_titre ( $langs->trans ( "Codejournal" ), "liste.php", "bk.code_journal" );
+		print '<td></td>'; 
+		print '<td></td>'; 
+		print "</tr>\n";
+		
+		print '<tr class="liste_titre">';
+		print '<form action="" method="GET">';
+		print '<input type="hidden" name="socid" value="' . $_GET ["socid"] . '">';
+		print '<td><input type="text" name="search_doc_type" value="' . $_GET ["search_doc_type"] . '"></td>';
+		print '<td><input type="text" name="search_year" value="' . $_GET ["search_year"] . '"></td>';
+		print '<td><input type="text" name="search_doc_refe" value="' . $_GET ["search_doc_ref"] . '"></td>';
+// 		print '<td><input type="text" name="search_compte" value="' . $_GET ["search_compte"] . '"></td>';
+// 		print '<td><input type="text" name="search_tiers" value="' . $_GET ["search_tiers"] . '"></td>';
+		print '<td>&nbsp;</td>';
+		print '<td>&nbsp;</td>';
+		print '<td>&nbsp;</td>';
+//		print '<td>&nbsp;</td>';
+//		print '<td>&nbsp;</td>';
+		print '<td align="right">';
+		print '<input type="image" class="liste_titre" name="button_search" src="' . DOL_URL_ROOT . '/theme/' . $conf->theme . '/img/search.png" value="' . dol_escape_htmltag ( $langs->trans ( "Search" ) ) . '" title="' . dol_escape_htmltag ( $langs->trans ( "Search" ) ) . '">';
+		print '</td>';
+		print '<td>&nbsp;</td>';
+		print '<td>&nbsp;</td>';
+		print '<td>&nbsp;</td>';
+		print '</form>';
+		print '</tr>';
+		
+		$var = false;
+		
+		$debit = 0; 
+		$credit = 0; 
+		$solde = 0; 
+		$tmp = ''; 
+		while ( $i < $num ) {
+			$obj = $db->fetch_object ( $resql );
+			
+			if($tmp !=$obj->lettering_code || empty($tmp) )
+				$tmp =$obj->lettering_code;
+				
+			if($tmp !=$obj->lettering_code || empty($obj->lettering_code)) 
+				$var = ! $var;
+				
+				
+			$debit+= $obj->debit; 
+			$credit+= $obj->credit; 
+		
+			$solde+=($obj->credit-$obj->debit);
+			print "<tr $bc[$var]>";
+			
+			print '<td>' . $obj->rowid . '</td>';
+			if(empty($obj->lettering_code)){
+				print '<td><a href="'.dol_buildpath('/accountancy/bookkeeping/card.php', 1).'?piece_num=' . $obj->piece_num . '">';
+				print img_edit ();
+				print '</a>&nbsp;' . $obj->doc_type . '</td>' . "\n";
+			}
+			else
+				print '<td>'.$obj->doc_type . '</td>' . "\n";
+			
+			
+			
+			print '<td>' . dol_print_date ( $db->jdate ( $obj->doc_date ), 'day' ) . '</td>';
+			print '<td>' . $obj->doc_ref . '</td>';
+// 			print '<td>' . $obj->numero_compte . '</td>';
+// 			print '<td>' . $obj->code_tiers . '</td>';
+			print '<td>' . $obj->label_compte . '</td>';
+			print '<td>' . $obj->debit . '</td>';
+			print '<td>' . $obj->credit . '</td>';
+//			print '<td>' . $obj->montant . '</td>';
+//			print '<td>' . $obj->sens . '</td>';
+			print '<td>' . $obj->code_journal . '</td>';
+			print '<td>' . round($solde, 2) . '</td>';
+			
+			if(empty($obj->lettering_code)){
+				print '<td><input type="checkbox" name="ids[]" value="' . $obj->rowid . '" /></td>';
+			}
+			else
+				print '<td>' . $obj->lettering_code . '</td>';
+				
+			print "</tr>\n";
+			
+			$i ++;
+			
+
+				
+
+		}
+		
+			print "<tr $bc[$var]>";
+			
+			print '<td colspan="4">Mouvement totaux</td>' . "\n";
+			print '<td></td>';
+	//		print '<td></td>';
+	//		print '<td></td>';
+			print '<td><strong>' . $debit . '</strong></td>';
+			print '<td><strong>' . $credit . '</strong></td>';
+			print '<td></td>';
+			print '<td></td>';
+			print '<td></td>';
+			print '<td>&nbsp;</td>';
+			print "</tr>\n";
+			
+			print "<tr $bc[$var]>";
+			print '<td colspan="5">Solde Comptable</td>' . "\n";
+	//		print '<td></td>';
+	//		print '<td></td>';
+			print '<td></td>';
+			print '<td><strong>' . ($credit-$debit) . '</strong></td>';
+			print '<td></td>';
+			print '<td></td>';
+			print '<td></td>';
+			print '<td>&nbsp;</td>';
+			print "</tr>\n";
+			
+		print "</table>";
+		
+		print '<input class="butAction" type="submit" value="lettering">';
+		print '<a class="butAction" href="?socid='.$object->id.'&action=autolettrage">auto lettering</a>';
+		print "</form>";
+		$db->free ( $resql );
+	} else {
+		dol_print_error ( $db );
+	}
+
+	
+// End of page
+llxFooter();
+$db->close();
+?>
diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettrage_supplier.php b/htdocs/accountancy/bookkeeping/thirdparty_lettrage_supplier.php
new file mode 100644
index 00000000000..338a4aef0e6
--- /dev/null
+++ b/htdocs/accountancy/bookkeeping/thirdparty_lettrage_supplier.php
@@ -0,0 +1,332 @@
+<?php
+/* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2005      Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2013      Olivier Geffroy      <jeff@jeffinfo.com>
+ * Copyright (C) 2013      Florian Henry	      <florian.henry@open-concept.pro>
+ * Copyright (C) 2013      Alexandre Spangaro   <alexandre.spangaro@gmail.com> 
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * \file    accounting/bookkeeping/thirdparty_lettrage.php
+ * \ingroup Accounting Expert
+ * \brief   Onglet de gestion de parametrages des ventilations
+ */
+
+// Dolibarr environment
+require '../../main.inc.php';
+
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/lettering.class.php';
+require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
+
+
+$page = GETPOST ( "page" );
+$sortorder = GETPOST ( "sortorder" );
+$search_year = GETPOST ( "search_year" );
+$sortfield = GETPOST ( "sortfield" );
+$action = GETPOST ( 'action', 'alpha' );
+
+
+// Security check
+$socid = GETPOST("socid",'int');
+// if ($user->societe_id) $socid=$user->societe_id;
+
+$object = new Societe($db);
+$object->id = $socid;
+$object->fetch($socid);
+$form = new Form($db);
+
+$BookKeeping = new lettering($db); 
+
+if ($sortorder == "") $sortorder = "ASC";
+if ($sortfield == "") $sortfield = "bk.rowid";
+
+$offset = $conf->liste_limit * $page;
+
+$formaccounting = new FormAccounting($db);
+
+/*
+ * Action
+ */
+if ($action == 'lettering') {
+
+	$result =  $BookKeeping->updatelettrage($_POST['ids']);
+	
+// 	var_dump($result); 
+	if( $result < 0 ){
+		setEventMessages('', $BookKeeping->errors, 'errors' );
+		$error++; 
+
+	}
+}
+
+if ($action == 'autolettrage') {
+
+	$result = $BookKeeping->LettrageTiers($socid);
+	
+	if( $result < 0 ){
+							setEventMessages('', $BookKeeping->errors, 'errors' );
+							$error++; 
+
+						}
+						
+}
+
+
+llxHeader ( '', 'Compta - Grand Livre' );
+	
+	
+	/*
+	 * Affichage onglets
+	 */
+	$head = societe_prepare_head($object);
+
+	dol_htmloutput_mesg(is_numeric($error)?'':$error, $errors, 'error');
+	 
+	dol_fiche_head($head, 'TabAccounting', $langs->trans("ThirdParty"),0,'company');
+	
+	
+
+
+	print '<table width="100%" class="border">';
+	print '<tr><td width="30%">'.$langs->trans("ThirdPartyName").'</td><td width="70%" colspan="3">';
+	$object->next_prev_filter="te.fournisseur = 1";
+	print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom','','');
+	print '</td></tr>';
+
+    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+    {
+        print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
+    }
+
+
+		print '<tr>';
+        print '<td class="nowrap">'.$langs->trans("SupplierCode"). '</td><td colspan="3">';
+        print $object->code_fournisseur;
+        if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+        print '</td>';
+        print '</tr>';
+
+		$langs->load('compta');
+        print '<tr>';
+        print '<td>';
+        print $form->editfieldkey("SupplierAccountancyCode",'supplieraccountancycode',$object->code_compta_fournisseur,$object,$user->rights->societe->creer);
+        print '</td><td colspan="3">';
+        print $form->editfieldval("SupplierAccountancyCode",'supplieraccountancycode',$object->code_compta_fournisseur,$object,$user->rights->societe->creer);
+        print '</td>';
+        print '</tr>';
+	
+
+	// Address
+	print '<tr><td valign="top">'.$langs->trans("Address").'</td><td colspan="3">';
+	dol_print_address($object->address,'gmap','thirdparty',$object->id);
+	print '</td></tr>';
+
+	// Zip / Town
+	print '<tr><td class="nowrap">'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td colspan="3">'.$object->zip.(($object->zip && $object->town)?' / ':'').$object->town.'</td>';
+	print '</tr>';
+
+	// Country
+	print '<tr><td>'.$langs->trans("Country").'</td><td colspan="3">';
+	//$img=picto_from_langcode($object->country_code);
+	$img='';
+	if ($object->isInEEC()) print $form->textwithpicto(($img?$img.' ':'').$object->country,$langs->trans("CountryIsInEEC"),1,0);
+	else print ($img?$img.' ':'').$object->country;
+	print '</td></tr>';
+	
+	print '</table>';
+	
+// 	print_r($soc); 
+// exit; 
+//   [code_compta] => 411DOUA
+//     [code_compta_fournisseur] => 401SUPPCODE
+    
+/*
+ * Mode Liste
+ *
+ *
+ *
+ */
+	
+	$sql = "SELECT bk.rowid, bk.doc_date, bk.doc_type, bk.doc_ref, bk.code_tiers, bk.numero_compte , bk.label_compte, bk.debit , bk.credit, bk.montant , bk.sens , bk.code_journal , bk.piece_num, bk.lettering ";
+	$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as bk";
+	$sql .= " WHERE (bk.code_tiers =  '" . $object->code_compta_fournisseur . "' AND bk.numero_compte = '" .$conf->global->ACCOUNTING_ACCOUNT_SUPPLIER. "' )" ;
+	
+	
+
+	if (dol_strlen ( $search_year  )) {
+		$sql .= " AND ( bk.doc_date BETWEEN  '" . $search_year . "-0-0' AND  '" . ($search_year+1). "-0-0' )";
+	}
+
+	
+	$sql .= " ORDER BY bk.lettering ASC, bk.doc_date ASC" ;//. $db->plimit ( $conf->liste_limit + 1, $offset );
+	
+// 	echo $sql; 
+// 	dol_syslog ( "bookkeping:liste:create sql=" . $sql, LOG_DEBUG );
+	$resql = $db->query ( $sql );
+	if ($resql) {
+		$num = $db->num_rows ( $resql );
+		$i = 0;
+		
+
+		print '<form name="add" action="?socid='.$object->id.'" method="POST">';
+		print '<input type="hidden" name="action" value="lettering">';
+		print '<input type="hidden" name="socid" value="'.$object->id.'">';
+		
+		print "<table class=\"noborder\" width=\"100%\">";
+		print '<tr class="liste_titre">';
+			print '<td></td>'; 
+		print_liste_field_titre ( $langs->trans ( "Doctype" ), "liste.php", "bk.doc_type" );
+		print_liste_field_titre ( $langs->trans ( "Docdate" ), "liste.php", "bk.doc_date" );
+		print_liste_field_titre ( $langs->trans ( "Docref" ), "liste.php", "bk.doc_ref" );
+// 		print_liste_field_titre ( $langs->trans ( "Numerocompte" ), "liste.php", "bk.numero_compte" );
+// 		print_liste_field_titre ( $langs->trans ( "Code_tiers" ), "liste.php", "bk.code_tiers" );
+		print_liste_field_titre ( $langs->trans ( "Labelcompte" ), "liste.php", "bk_label_compte" );
+		print_liste_field_titre ( $langs->trans ( "Debit" ), "liste.php", "bk.debit" );
+		print_liste_field_titre ( $langs->trans ( "Credit" ), "liste.php", "bk.credit" );
+		print_liste_field_titre ( $langs->trans ( "Amount" ), "liste.php", "bk.montant" );
+		print_liste_field_titre ( $langs->trans ( "Sens" ), "liste.php", "bk.sens" );
+		print_liste_field_titre ( $langs->trans ( "Codejournal" ), "liste.php", "bk.code_journal" );
+		print '<td></td>'; 
+		print '<td></td>'; 
+		print "</tr>\n";
+		
+		print '<tr class="liste_titre">';
+		print '<form action="" method="GET">';
+		print '<input type="hidden" name="socid" value="' . $_GET ["socid"] . '">';
+		print '<td><input type="text" name="search_doc_type" value="' . $_GET ["search_doc_type"] . '"></td>';
+		print '<td><input type="text" name="search_year" value="' . $_GET ["search_year"] . '"></td>';
+		print '<td><input type="text" name="search_doc_refe" value="' . $_GET ["search_doc_ref"] . '"></td>';
+// 		print '<td><input type="text" name="search_compte" value="' . $_GET ["search_compte"] . '"></td>';
+// 		print '<td><input type="text" name="search_tiers" value="' . $_GET ["search_tiers"] . '"></td>';
+		print '<td>&nbsp;</td>';
+		print '<td>&nbsp;</td>';
+		print '<td>&nbsp;</td>';
+		print '<td>&nbsp;</td>';
+		print '<td>&nbsp;</td>';
+		print '<td align="right">';
+		print '<input type="image" class="liste_titre" name="button_search" src="' . DOL_URL_ROOT . '/theme/' . $conf->theme . '/img/search.png" value="' . dol_escape_htmltag ( $langs->trans ( "Search" ) ) . '" title="' . dol_escape_htmltag ( $langs->trans ( "Search" ) ) . '">';
+		print '</td>';
+		print '<td>&nbsp;</td>';
+		print '<td>&nbsp;</td>';
+		print '<td>&nbsp;</td>';
+		print '</form>';
+		print '</tr>';
+		
+		$var = false;
+		
+		$debit = 0; 
+		$credit = 0; 
+		$solde = 0; 
+		$tmp = ''; 
+		while ( $i < $num ) {
+			$obj = $db->fetch_object ( $resql );
+			
+			if($tmp !=$obj->lettering || empty($tmp) )
+				$tmp =$obj->lettering;
+				
+			if($tmp !=$obj->lettering || empty($obj->lettering)) 
+				$var = ! $var;
+				
+				
+			$debit+= $obj->debit; 
+			$credit+= $obj->credit; 
+		
+			$solde+=($obj->credit-$obj->debit);
+			print "<tr $bc[$var]>";
+			
+			print '<td>' . $obj->rowid . '</td>';
+			if(empty($obj->lettering)){
+				print '<td><a href="'.dol_buildpath('/accountancy/bookkeeping/card.php', 1).'?piece_num=' . $obj->piece_num . '">';
+				print img_edit ();
+				print '</a>&nbsp;' . $obj->doc_type . '</td>' . "\n";
+			}
+			else
+				print '<td>'.$obj->doc_type . '</td>' . "\n";
+			
+			
+			
+			print '<td>' . dol_print_date ( $db->jdate ( $obj->doc_date ), 'day' ) . '</td>';
+			print '<td>' . $obj->doc_ref . '</td>';
+// 			print '<td>' . $obj->numero_compte . '</td>';
+// 			print '<td>' . $obj->code_tiers . '</td>';
+			print '<td>' . $obj->label_compte . '</td>';
+			print '<td>' . $obj->debit . '</td>';
+			print '<td>' . $obj->credit . '</td>';
+			print '<td>' . $obj->montant . '</td>';
+			print '<td>' . $obj->sens . '</td>';
+			print '<td>' . $obj->code_journal . '</td>';
+			print '<td>' . round($solde, 2) . '</td>';
+			
+			if(empty($obj->lettering)){
+				print '<td><input type="checkbox" name="ids[]" value="' . $obj->rowid . '" /></td>';
+			}
+			else
+				print '<td>' . $obj->lettering . '</td>';
+				
+			print "</tr>\n";
+			
+			$i ++;
+			
+
+				
+
+		}
+		
+			print "<tr $bc[$var]>";
+			
+			print '<td colspan="4">Mouvement totaux</td>' . "\n";
+			print '<td></td>';
+			print '<td></td>';
+			print '<td></td>';
+			print '<td><strong>' . $debit . '</strong></td>';
+			print '<td><strong>' . $credit . '</strong></td>';
+			print '<td></td>';
+			print '<td></td>';
+			print '<td></td>';
+			print '<td>&nbsp;</td>';
+			print "</tr>\n";
+			
+			print "<tr $bc[$var]>";
+			print '<td colspan="5">Solde Comptable</td>' . "\n";
+			print '<td></td>';
+			print '<td></td>';
+			print '<td></td>';
+			print '<td><strong>' . ($credit-$debit) . '</strong></td>';
+			print '<td></td>';
+			print '<td></td>';
+			print '<td></td>';
+			print '<td>&nbsp;</td>';
+			print "</tr>\n";
+			
+		print "</table>";
+		
+		print '<input class="butAction" type="submit" value="lettering">';
+		print '<a class="butAction" href="?socid='.$object->id.'&action=autolettrage">auto lettering</a>';
+		print "</form>";
+		$db->free ( $resql );
+	} else {
+		dol_print_error ( $db );
+	}
+
+	
+// End of page
+llxFooter();
+$db->close();
+?>
diff --git a/htdocs/accountancy/class/lettering.class.php b/htdocs/accountancy/class/lettering.class.php
new file mode 100644
index 00000000000..77e1f897f97
--- /dev/null
+++ b/htdocs/accountancy/class/lettering.class.php
@@ -0,0 +1,327 @@
+<?php
+/* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2013      Olivier Geffroy      <jeff@jeffinfo.com>
+ * Copyright (C) 2013      Alexandre Spangaro   <alexandre.spangaro@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file      accountancy/class/bookkeeping.class.php
+ * \ingroup   Accounting Expert
+ * \brief     Fichier de la classe des comptes comptable
+ */
+error_reporting(0); 
+
+dol_include_once ( "/accountancy/class/bookkeeping.class.php");
+dol_include_once ( "/societe/class/societe.class.php");
+dol_include_once ( "/core/lib/date.lib.php");  // see if not useless for dol(now)
+
+class lettering
+	extends BookKeeping {
+
+	
+	public function LettrageTiers($socid){
+	
+		$db = $this->db; 
+		
+		$object = new Societe($this->db);
+		$object->id = $socid;
+		$object->fetch($socid);
+
+
+		if( $object->code_compta == '411CUSTCODE') 
+			$object->code_compta = ''; 
+			
+		if( $object->code_compta_fournisseur == '401SUPPCODE') 
+			$object->code_compta_fournisseur = ''; 
+
+
+			
+		$sql = "SELECT bk.rowid, bk.doc_date, bk.doc_type, bk.lettering_code, bk.code_tiers, bk.numero_compte , bk.label_compte, bk.debit , bk.credit, bk.montant , bk.sens , bk.code_journal , bk.piece_num, bk.date_lettering ";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as bk";
+			$sql .= " WHERE code_journal = 'BQ' AND  ( ";
+		if(!empty($object->code_compta)  )
+			$sql .= "  bk.code_tiers = '" . $object->code_compta . "'  ";
+		if(!empty($object->code_compta) &&  !empty($object->code_compta_fournisseur) )
+			$sql .= "  OR  ";
+		if(!empty($object->code_compta_fournisseur)  )
+		$sql .= "   bk.code_tiers = '" . $object->code_compta_fournisseur . "' ";
+		
+		$sql .= " ) AND ( bk.date_lettering ='' OR bk.date_lettering IS NULL ) AND bk.lettering_code  !='' ";
+		
+		$sql .= " GROUP BY bk.lettering_code  ";
+		
+		
+		$resql = $db->query ( $sql );
+		if ($resql) {
+			$num = $db->num_rows ( $resql );
+			$i = 0;
+			
+			while ( $i < $num ) {
+				$obj = $db->fetch_object ( $resql );
+				$i++;
+
+					$sql = "SELECT  bk.rowid  ";
+					$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as bk";
+					$sql .= " WHERE  bk.lettering_code = '".$obj->lettering_code."' ";
+										$sql .= " AND ( ";
+						if(!empty($object->code_compta)  )
+							$sql .= "  bk.code_tiers = '" . $object->code_compta . "'  ";
+						if(!empty($object->code_compta) &&  !empty($object->code_compta_fournisseur) )
+							$sql .= "  OR  ";
+						if(!empty($object->code_compta_fournisseur)  )
+							$sql .= "   bk.code_tiers = '" . $object->code_compta_fournisseur . "' ";
+						$sql .= " )  ";
+// echo $sql; 
+					$resql2 = $db->query ( $sql );
+					if ($resql2) {
+						$num2 = $db->num_rows ( $resql2 );
+						$i2 = 0;
+						$ids = array();
+						while ( $i2 < $num2 ) {
+							$obj2 = $db->fetch_object ( $resql2 );
+							$i2++;
+							$ids[] = $obj2->rowid;
+						}
+						
+						
+						if(count($ids)  > 1 ){
+							$result =  $this->updatelettrage($ids);
+		
+						// 	var_dump($result); 
+// 							if( $result < 0 ){
+// 								setEventMessages('', $BookKeeping->errors, 'errors' );
+// 								$error++; 
+// 
+// 							}
+						}
+					}
+			}
+		}
+			
+			
+		/**
+			Prise en charge des lettering complexe avec prelevment , virement 
+		*/
+		$sql = "SELECT bk.rowid, bk.doc_date, bk.doc_type, bk.doc_ref, bk.code_tiers, bk.numero_compte , bk.label_compte, bk.debit , bk.credit, bk.montant , bk.sens , bk.code_journal , bk.piece_num, bk.date_lettering, bu.url_id , bu.type ";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as bk";
+		$sql .= " LEFT JOIN  " . MAIN_DB_PREFIX . "bank_url as bu ON(bk.fk_doc = bu.fk_bank AND bu.type IN ('payment', 'payment_supplier') ) ";
+		$sql .= " WHERE code_journal = 'BQ' AND  ( ";
+		if(!empty($object->code_compta)  )
+			$sql .= "  bk.code_tiers = '" . $object->code_compta . "'  ";
+		if(!empty($object->code_compta) &&  !empty($object->code_compta_fournisseur) )
+			$sql .= "  OR  ";
+		if(!empty($object->code_compta_fournisseur)  )
+		$sql .= "   bk.code_tiers = '" . $object->code_compta_fournisseur . "' ";
+		
+		$sql .= " ) AND date_lettering ='' ";
+		$sql .= " GROUP BY bk.lettering_code  ";
+		
+// 		echo $sql; 
+// 		
+		$resql = $db->query ( $sql );
+		if ($resql) {
+			$num = $db->num_rows ( $resql );
+			$i = 0;
+			
+			while ( $i < $num ) {
+				$obj = $db->fetch_object ( $resql );
+				$ids = array();
+				$i++;
+				
+	// 			print_r($obj); 
+				
+
+					
+					if($obj->type =='payment_supplier' ) { 
+						$ids[] = $obj->rowid;
+						
+					$sql= 'SELECT bk.rowid, facf.ref, facf.ref_supplier, payf.fk_bank ';
+					$sql.= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf ";
+					$sql.= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfacf ON  payfacf.fk_facturefourn=facf.rowid";
+					$sql.= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn as payf ON  payfacf.fk_paiementfourn=payf.rowid";
+					$sql.= " INNER JOIN " .MAIN_DB_PREFIX .  "accounting_bookkeeping as bk ON(  bk.fk_doc = facf.ref) ";
+	// 				$sqlmid.= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as soc ON  soc.rowid=facf.fk_soc";
+	// 				$sqlmid.= " INNER JOIN " . MAIN_DB_PREFIX . "c_paiement as payc ON  payc.id=payf.fk_paiement";
+						$sql .= " WHERE 1   ";
+						$sql .= "   AND  fk_paiementfourn = '".$obj->url_id."' ";
+	// 					$sql .= " AND (bk.numero_compte = '" . $object->code_compta . "' OR  bk.numero_compte = '" . $object->code_compta_fournisseur . "') ";
+						$sql .= " AND ( ";
+						if(!empty($object->code_compta)  )
+							$sql .= "  bk.code_tiers = '" . $object->code_compta . "'  ";
+						if(!empty($object->code_compta) &&  !empty($object->code_compta_fournisseur) )
+							$sql .= "  OR  ";
+						if(!empty($object->code_compta_fournisseur)  )
+							$sql .= "   bk.code_tiers = '" . $object->code_compta_fournisseur . "' ";
+						$sql .= " )  ";
+	// 					echo $sql; 
+	// 					exit; 
+					}
+					elseif($obj->type =='payment' ){
+						$ids[] = $obj->rowid;
+						
+						$sql= 'SELECT bk.rowid,fac.facnumber , pay.fk_bank ';
+						$sql.= " FROM " . MAIN_DB_PREFIX . "facture fac ";
+						$sql.= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON  payfac.fk_facture=fac.rowid";
+						$sql.= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as pay ON  payfac.fk_paiement=pay.rowid";
+						$sql.= " INNER JOIN " .MAIN_DB_PREFIX .  "accounting_bookkeeping as bk ON(  bk.fk_doc = fac.rowid) ";
+						$sql .= " WHERE 1   ";
+						$sql .= "   AND   payfac.fk_paiement = '".$obj->url_id."' ";
+						$sql .= " AND ( ";
+						if(!empty($object->code_compta)  )
+							$sql .= "  bk.code_tiers = '" . $object->code_compta . "'  ";
+						if(!empty($object->code_compta) &&  !empty($object->code_compta_fournisseur) )
+							$sql .= "  OR  ";
+						if(!empty($object->code_compta_fournisseur)  )
+							$sql .= "   bk.code_tiers = '" . $object->code_compta_fournisseur . "' ";
+						$sql .= " )  ";
+
+	// 					echo $sql; 
+					}
+					
+					
+					
+					$resql2 = $db->query ( $sql );
+					if ($resql2) {
+						$num2 = $db->num_rows ( $resql2 );
+						$i2 = 0;
+						
+						while ( $i2 < $num2 ) {
+							$obj2 = $db->fetch_object ( $resql2 );
+							$i2++;
+							$ids[] = $obj2->rowid;
+						}
+						
+	// 					print_r($ids); 
+	// 					exit;
+						if(count($ids)  > 1 ){
+							$result =  $this->updatelettrage($ids);
+		
+	// 						var_dump($result); 
+// 							if( $result < 0 ){
+// 								setEventMessages('', $BookKeeping->errors, 'errors' );
+// 								$error++; 
+// 
+// 							}
+						}
+						
+	// 					exit; 
+					}
+			}
+		}
+
+
+	}
+	
+	
+	public function updatelettrage($ids, $notrigger=false){
+		$error = 0; 
+		
+		$sql = "SELECT lettering_code FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping WHERE ";
+		$sql .= " lettering_code != '' GROUP BY lettering_code ORDER BY lettering_code DESC limit 1;  ";
+// 		echo $sql; 
+		$result = $this->db->query ( $sql );
+		if ($result) {
+			$obj = $this->db->fetch_object ( $result );
+			$lettre = (empty($obj->lettering_code)? 'AAA' : $obj->lettering_code ); 
+			if(!empty($obj->lettering_code))
+				$lettre++; 
+		}
+		else{
+			$this->errors[] = 'Error'.$this->db->lasterror();; 
+			$error++;
+		}
+// 			var_dump(__line__, $error); 
+		
+		$sql = "SELECT SUM(ABS(debit)) as deb, SUM(ABS(credit)) as cred   FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping WHERE ";
+		$sql .= " rowid IN (".implode(',', $ids).") ";
+		$result = $this->db->query ( $sql );
+		if ($result) {
+			$obj = $this->db->fetch_object ( $result );
+// 			print_r($obj); 
+			if( !(round(abs($obj->deb),2) === round(abs($obj->cred),2)) ){
+// 				echo $sql; 
+// 				print_r($obj); 
+				$this->errors[] = 'Total not exacts '.round(abs($obj->deb),2).' vs '. round(abs($obj->cred),2); 
+				$error++; 
+			}
+		}
+		else{
+			$this->errors[] = 'Erreur sql'.$this->db->lasterror();; 
+			$error++;
+		}
+
+		
+		// Update request
+		
+		$now = dol_now();
+		
+		$sql = "UPDATE ".MAIN_DB_PREFIX."accounting_bookkeeping SET";
+		$sql.= " lettering_code='".$lettre."'";
+		$sql.= " , date_lettering = " .$now ;  // todo correct date it's false 
+		$sql.= "  WHERE rowid IN (".implode(',', $ids).") ";
+// 		echo $sql ; 
+// 		
+// 		var_dump(__line__, $error); 
+// 		print_r($this->errors); 
+// 		exit; 
+		$this->db->begin();
+		
+			dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		
+			if (! $error)
+			{
+				if (! $notrigger)
+				{
+					// Uncomment this and change MYOBJECT to your own tag if you
+					// want this action calls a trigger.
+		
+					//// Call triggers
+					//include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+					//$interface=new Interfaces($this->db);
+					//$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
+					//if ($result < 0) { $error++; $this->errors=$interface->errors; }
+					//// End call triggers
+				}
+			}
+// 				var_dump(__line__, $error); 
+			// Commit or rollback
+			if ($error)
+			{
+// 				foreach($this->errors as $errmsg)
+// 				{
+// 					dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+// 					$this->error.=($this->error?', '.$errmsg:$errmsg);
+// 				}
+				$this->db->rollback();
+// 				echo $this->error; 
+// 						var_dump(__line__, $error); 
+				return -1*$error;
+			}
+			else
+			{
+				$this->db->commit();
+				return 1;
+			}
+	}
+	
+
+}
+
+
+
+?>

From 78283b6a0bc9851b6dc95ac5b3c5c538df398ae6 Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Fri, 30 Jun 2017 17:02:50 +0200
Subject: [PATCH 14/17] Ignore rights filter for virtual stock calculation.

---
 htdocs/product/class/product.class.php | 60 ++++++++++++++------------
 htdocs/product/stock/product.php       |  8 ++--
 2 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index aa4dc5710b4..14b60473687 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2136,11 +2136,12 @@ class Product extends CommonObject
 	/**
 	 *  Charge tableau des stats commande client pour le produit/service
 	 *
-	 *  @param    int	$socid       	Id societe pour filtrer sur une societe
-	 *  @param    int	$filtrestatut   Id statut pour filtrer sur un statut
-	 *  @return   array       			Array of stats (nb=nb of order, qty=qty ordered)
+	 *  @param    int    $socid           Id societe pour filtrer sur une societe
+	 *  @param    string $filtrestatut    Id statut pour filtrer sur un statut
+	 *  @param    int    $forVirtualStock Ignore rights filter for virtual stock calculation.
+	 *  @return   array                  Array of stats (nb=nb of order, qty=qty ordered)
 	 */
-	function load_stats_commande($socid=0,$filtrestatut='')
+	function load_stats_commande($socid=0,$filtrestatut='', $forVirtualStock = 0)
 	{
 		global $conf,$user;
 
@@ -2149,12 +2150,12 @@ class Product extends CommonObject
 		$sql.= " FROM ".MAIN_DB_PREFIX."commandedet as cd";
 		$sql.= ", ".MAIN_DB_PREFIX."commande as c";
 		$sql.= ", ".MAIN_DB_PREFIX."societe as s";
-		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE c.rowid = cd.fk_commande";
 		$sql.= " AND c.fk_soc = s.rowid";
 		$sql.= " AND c.entity IN (".getEntity('commande').")";
 		$sql.= " AND cd.fk_product = ".$this->id;
-		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
+		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) $sql.= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if ($socid > 0)	$sql.= " AND c.fk_soc = ".$socid;
 		if ($filtrestatut <> '') $sql.= " AND c.fk_statut in (".$filtrestatut.")";
 
@@ -2202,11 +2203,12 @@ class Product extends CommonObject
 	/**
 	 *  Charge tableau des stats commande fournisseur pour le produit/service
 	 *
-	 *  @param    int		$socid       	Id societe pour filtrer sur une societe
-	 *  @param    string	$filtrestatut  	Id des statuts pour filtrer sur des statuts
-	 *  @return   array       				Tableau des stats
+	 *  @param    int      $socid           Id societe pour filtrer sur une societe
+	 *  @param    string   $filtrestatut    Id des statuts pour filtrer sur des statuts
+	 *  @param    int      $forVirtualStock Ignore rights filter for virtual stock calculation.
+	 *  @return   array                     Tableau des stats
 	 */
-	function load_stats_commande_fournisseur($socid=0,$filtrestatut='')
+	function load_stats_commande_fournisseur($socid=0,$filtrestatut='', $forVirtualStock = 0)
 	{
 		global $conf,$user;
 
@@ -2215,12 +2217,12 @@ class Product extends CommonObject
 		$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd";
 		$sql.= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
 		$sql.= ", ".MAIN_DB_PREFIX."societe as s";
-		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE c.rowid = cd.fk_commande";
 		$sql.= " AND c.fk_soc = s.rowid";
 		$sql.= " AND c.entity IN (".getEntity('supplier_order').")";
 		$sql.= " AND cd.fk_product = ".$this->id;
-		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
+		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) $sql.= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if ($socid > 0) $sql.= " AND c.fk_soc = ".$socid;
 		if ($filtrestatut != '') $sql.= " AND c.fk_statut in (".$filtrestatut.")"; // Peut valoir 0
 
@@ -2244,11 +2246,12 @@ class Product extends CommonObject
 	/**
 	 *  Charge tableau des stats expedition client pour le produit/service
 	 *
-	 *  @param    int	$socid       	Id societe pour filtrer sur une societe
-	 *  @param    int	$filtrestatut  	Id statut pour filtrer sur un statut
-	 *  @return   array       			Tableau des stats
+	 *  @param    int    $socid           Id societe pour filtrer sur une societe
+	 *  @param    string $filtrestatut    Id statut pour filtrer sur un statut
+	 *  @param    int    $forVirtualStock Ignore rights filter for virtual stock calculation.
+	 *  @return   array                   Tableau des stats
 	 */
-	function load_stats_sending($socid=0,$filtrestatut='')
+	function load_stats_sending($socid=0,$filtrestatut='', $forVirtualStock = 0)
 	{
 		global $conf,$user;
 
@@ -2259,14 +2262,14 @@ class Product extends CommonObject
 		$sql.= ", ".MAIN_DB_PREFIX."commande as c";
 		$sql.= ", ".MAIN_DB_PREFIX."expedition as e";
 		$sql.= ", ".MAIN_DB_PREFIX."societe as s";
-		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE e.rowid = ed.fk_expedition";
 		$sql.= " AND c.rowid = cd.fk_commande";
 		$sql.= " AND e.fk_soc = s.rowid";
 		$sql.= " AND e.entity IN (".getEntity('expedition').")";
 		$sql.= " AND ed.fk_origin_line = cd.rowid";
 		$sql.= " AND cd.fk_product = ".$this->id;
-		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND e.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
+		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) $sql.= " AND e.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if ($socid > 0)	$sql.= " AND e.fk_soc = ".$socid;
 		if ($filtrestatut <> '') $sql.= " AND c.fk_statut in (".$filtrestatut.")";
 
@@ -2290,11 +2293,12 @@ class Product extends CommonObject
 	/**
 	 *  Charge tableau des stats réception fournisseur pour le produit/service
 	 *
-	 *  @param    int	$socid       	Id societe pour filtrer sur une societe
-	 *  @param    int	$filtrestatut  	Id statut pour filtrer sur un statut
-	 *  @return   array       			Tableau des stats
+	 *  @param    int    $socid           Id societe pour filtrer sur une societe
+	 *  @param    string $filtrestatut    Id statut pour filtrer sur un statut
+	 *  @param    int    $forVirtualStock Ignore rights filter for virtual stock calculation.
+	 *  @return   array                   Tableau des stats
 	 */
-	function load_stats_reception($socid=0,$filtrestatut='')
+	function load_stats_reception($socid=0,$filtrestatut='', $forVirtualStock = 0)
 	{
 		global $conf,$user;
 
@@ -2303,12 +2307,12 @@ class Product extends CommonObject
 		$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as fd";
 		$sql.= ", ".MAIN_DB_PREFIX."commande_fournisseur as cf";
 		$sql.= ", ".MAIN_DB_PREFIX."societe as s";
-		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE cf.rowid = fd.fk_commande";
 		$sql.= " AND cf.fk_soc = s.rowid";
 		$sql.= " AND cf.entity IN (".getEntity('supplier_order').")";
 		$sql.= " AND fd.fk_product = ".$this->id;
-		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND cf.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
+		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) $sql.= " AND cf.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if ($socid > 0)	$sql.= " AND cf.fk_soc = ".$socid;
 		if ($filtrestatut <> '') $sql.= " AND cf.fk_statut in (".$filtrestatut.")";
 
@@ -3801,23 +3805,23 @@ class Product extends CommonObject
 
         if (! empty($conf->commande->enabled))
         {
-            $result=$this->load_stats_commande(0,'1,2');
+            $result=$this->load_stats_commande(0,'1,2', 1);
             if ($result < 0) dol_print_error($this->db,$this->error);
             $stock_commande_client=$this->stats_commande['qty'];
         }
         if (! empty($conf->expedition->enabled))
         {
-            $result=$this->load_stats_sending(0,'1,2');
+            $result=$this->load_stats_sending(0,'1,2', 1);
             if ($result < 0) dol_print_error($this->db,$this->error);
             $stock_sending_client=$this->stats_expedition['qty'];
         }
         if (! empty($conf->fournisseur->enabled))
         {
-            $result=$this->load_stats_commande_fournisseur(0,'1,2,3,4');
+            $result=$this->load_stats_commande_fournisseur(0,'1,2,3,4', 1);
             if ($result < 0) dol_print_error($this->db,$this->error);
             $stock_commande_fournisseur=$this->stats_commande_fournisseur['qty'];
 
-            $result=$this->load_stats_reception(0,'4');
+            $result=$this->load_stats_reception(0,'4', 1);
             if ($result < 0) dol_print_error($this->db,$this->error);
             $stock_reception_fournisseur=$this->stats_reception['qty'];
         }
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 4d1eed9d5e1..1daff124764 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -655,7 +655,7 @@ if ($id > 0 || $ref)
 		{
 		    if ($found) $helpondiff.='<br>'; else $found=1;
 		    $helpondiff.=$langs->trans("ProductQtyInCustomersOrdersRunning").': '.$object->stats_commande['qty'];
-		    $result=$object->load_stats_commande(0,'0');
+		    $result=$object->load_stats_commande(0,'0', 1);
 		    if ($result < 0) dol_print_error($db,$object->error);
 		    $helpondiff.=' ('.$langs->trans("ProductQtyInDraft").': '.$object->stats_commande['qty'].')';
 		}
@@ -664,7 +664,7 @@ if ($id > 0 || $ref)
 		if (! empty($conf->expedition->enabled))
 		{
 		    if ($found) $helpondiff.='<br>'; else $found=1;
-		    $result=$object->load_stats_sending(0,'2');
+		    $result=$object->load_stats_sending(0,'2', 1);
 		    $helpondiff.=$langs->trans("ProductQtyInShipmentAlreadySent").': '.$object->stats_expedition['qty'];
 		}
 
@@ -672,9 +672,9 @@ if ($id > 0 || $ref)
 		if (! empty($conf->fournisseur->enabled))
 		{
 		    if ($found) $helpondiff.='<br>'; else $found=1;
-		    $result=$object->load_stats_commande_fournisseur(0,'3,4');
+		    $result=$object->load_stats_commande_fournisseur(0,'3,4', 1);
 		    $helpondiff.=$langs->trans("ProductQtyInSuppliersOrdersRunning").': '.$object->stats_commande_fournisseur['qty'];
-		    $result=$object->load_stats_commande_fournisseur(0,'0,1,2');
+		    $result=$object->load_stats_commande_fournisseur(0,'0,1,2', 1);
 		    if ($result < 0) dol_print_error($db,$object->error);
 		    $helpondiff.=' ('.$langs->trans("ProductQtyInDraftOrWaitingApproved").': '.$object->stats_commande_fournisseur['qty'].')';
 		}

From 42183877e8a1ce122b3cc39e97b0ba899cf099b9 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Tue, 4 Jul 2017 09:30:53 +0200
Subject: [PATCH 15/17] Fix sql syntax

---
 htdocs/install/mysql/migration/5.0.0-6.0.0.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index f418a5e6a1f..600503a8b7e 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -346,7 +346,7 @@ ALTER TABLE llx_product_fournisseur_price_log ADD COLUMN multicurrency_tx	     d
 ALTER TABLE llx_product_fournisseur_price_log ADD COLUMN multicurrency_price	 double(24,8) DEFAULT NULL;
 ALTER TABLE llx_product_fournisseur_price_log ADD COLUMN multicurrency_price_ttc double(24,8) DEFAULT NULL;
 
-UPDATE TABLE llx_contrat set ref = rowid where ref is null or ref = '';
+UPDATE llx_contrat set ref = rowid where ref is null or ref = '';
 
 create table llx_payment_various
 (

From 1816b2249e7545807a3d5cd0271d87eac7776342 Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Wed, 5 Jul 2017 11:24:24 +0200
Subject: [PATCH 16/17] fix class error

---
 htdocs/ecm/class/ecmfiles.class.php           | 52 +++++++++++++------
 .../template/class/myobject.class.php         |  2 +-
 2 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index 9a8c503ac2e..c854231307f 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -65,7 +65,7 @@ class EcmFiles //extends CommonObject
 
 	/**
 	 */
-	
+
 
 	/**
 	 * Constructor
@@ -88,13 +88,13 @@ class EcmFiles //extends CommonObject
 	public function create(User $user, $notrigger = false)
 	{
 	    global $conf;
-	    
+
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$error = 0;
 
 		// Clean parameters
-		
+
 		if (isset($this->label)) {
 			 $this->label = trim($this->label);
 		}
@@ -135,13 +135,13 @@ class EcmFiles //extends CommonObject
 			 $this->acl = trim($this->acl);
 		}
         if (empty($this->date_c)) $this->date_c = dol_now();
-		
+
         $maxposition=0;
 		if (empty($this->position))   // Get max used
 		{
 		    $sql = "SELECT MAX(position) as maxposition FROM " . MAIN_DB_PREFIX . $this->table_element;
 		    $sql.= " WHERE filepath ='".$this->db->escape($this->filepath)."'";
-		    
+
 		    $resql = $this->db->query($sql);
 		    if ($resql)
 		    {
@@ -204,7 +204,7 @@ class EcmFiles //extends CommonObject
 		if (!$error) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
             $this->position = $maxposition;
-            
+
 			if (!$notrigger) {
 				// Uncomment this and change MYOBJECT to your own tag if you
 				// want this action to call a trigger.
@@ -299,7 +299,7 @@ class EcmFiles //extends CommonObject
 				$this->fk_user_m = $obj->fk_user_m;
 				$this->acl = $obj->acl;
 			}
-			
+
 			// Retrieve all extrafields for invoice
 			// fetch optionals attributes and labels
 			/*
@@ -309,7 +309,7 @@ class EcmFiles //extends CommonObject
 			$this->fetch_optionals($this->id,$extralabels);
             */
 			// $this->fetch_lines();
-			
+
 			$this->db->free($resql);
 
 			if ($numrows) {
@@ -393,7 +393,7 @@ class EcmFiles //extends CommonObject
 				$line = new EcmfilesLine();
 
 				$line->id = $obj->rowid;
-				
+
 				$line->label = $obj->label;
 				$line->entity = $obj->entity;
 				$line->filename = $obj->filename;
@@ -437,7 +437,7 @@ class EcmFiles //extends CommonObject
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		// Clean parameters
-		
+
 		if (isset($this->label)) {
 			 $this->label = trim($this->label);
 		}
@@ -562,7 +562,7 @@ class EcmFiles //extends CommonObject
 		}
 
 		// If you need to delete child tables to, you can insert them here
-		
+
 		if (!$error) {
 			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
 			$sql .= ' WHERE rowid=' . $this->id;
@@ -651,7 +651,7 @@ class EcmFiles //extends CommonObject
         global $menumanager;
 
         if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
-        
+
         $result = '';
         $companylink = '';
 
@@ -660,7 +660,7 @@ class EcmFiles //extends CommonObject
         $label.= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
 
         $url = DOL_URL_ROOT.'/ecm/'.$this->table_name.'_card.php?id='.$this->id;
-        
+
         $linkclose='';
         if (empty($notooltip))
         {
@@ -673,7 +673,7 @@ class EcmFiles //extends CommonObject
             $linkclose.=' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
         }
         else $linkclose = ($morecss?' class="'.$morecss.'"':'');
-        
+
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart.=$linkclose.'>';
 		$linkend='</a>';
@@ -757,9 +757,9 @@ class EcmFiles //extends CommonObject
 	public function initAsSpecimen()
 	{
 	    global $conf,$user;
-	    
+
 		$this->id = 0;
-		
+
 		$this->label = '0a1b2c3e4f59999999';
 		$this->entity = '1';
 		$this->filename = 'myspecimenfilefile.pdf';
@@ -780,3 +780,23 @@ class EcmFiles //extends CommonObject
 
 }
 
+
+class EcmfilesLine
+{
+	public $label;
+	public $entity;
+	public $filename;
+	public $filepath;
+	public $fullpath_orig;
+	public $description;
+	public $keywords;
+	public $cover;
+	public $position;
+	public $gen_or_uploaded;       // can be 'generated', 'uploaded', 'unknown'
+	public $extraparams;
+	public $date_c = '';
+	public $date_m = '';
+	public $fk_user_c;
+	public $fk_user_m;
+	public $acl;
+}
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index c66110fddf6..9ef593367c9 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -433,7 +433,7 @@ class MyObject extends CommonObject
 
 		global $user;
 		$error = 0;
-		$object = new MyModuleObject($this->db);
+		$object = new self($this->db);
 
 		$this->db->begin();
 

From 857e45baf31b1e27367d6498ec0c22a4a78bcd67 Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Thu, 6 Jul 2017 15:34:10 +0200
Subject: [PATCH 17/17] Fix comment

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

diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index cb31de75892..f9037c32517 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -573,7 +573,7 @@ else
     			print '&nbsp;';
     			print '</td>';
     		}
-			// Number buying Price
+			// WAP
 			if (! empty($arrayfields['p.pmp']['checked']))
     		{
     			print '<td class="liste_titre">';