From ab4a3dcaa7793e0a51c6acbf80bd0bc95c90e4eb Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Mon, 22 Apr 2013 10:18:03 +0200
Subject: [PATCH 01/13] Fix: missing rename field

---
 htdocs/core/modules/modFacture.class.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index 666bcb9a22a..4d18c3d8757 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -198,10 +198,10 @@ class modFacture extends DolibarrModules
 		$this->export_label[$r]='CustomersInvoicesAndPayments';	// Translation key (used only if key ExportDataset_xxx_z not found)
 		$this->export_icon[$r]='bill';
 		$this->export_permission[$r]=array(array("facture","facture","export"));
-		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','c.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','s.tva_intra'=>'VATIntra','f.rowid'=>"InvoiceId",'f.facnumber'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.date_lim_reglement'=>"DateDue",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus','f.note'=>"NotePrivate",'f.note_public'=>"NotePublic",'p.rowid'=>'PaymentId','pf.amount'=>'AmountPayment','p.datep'=>'DatePayment','p.num_paiement'=>'PaymentNumber');
-		//$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','s.tva_intra'=>'Text','f.rowid'=>"List:facture:facnumber",'f.facnumber'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.date_lim_reglement'=>"Date",'f.total'=>"Number",'f.total_ttc'=>"Number",'f.tva'=>"Number",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note'=>"Text",'f.note_public'=>"Text",'pf.amount'=>'Number','p.datep'=>'Date','p.num_paiement'=>'Number');
-		$this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','s.tva_intra'=>'Text','f.rowid'=>"List:facture:facnumber",'f.facnumber'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.date_lim_reglement'=>"Date",'f.total'=>"Number",'f.total_ttc'=>"Number",'f.tva'=>"Number",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note'=>"Text",'f.note_public'=>"Text",'pf.amount'=>'Number','p.datep'=>'Date','p.num_paiement'=>'Number');
-		$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','c.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company','s.tva_intra'=>'company','f.rowid'=>"invoice",'f.facnumber'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.date_lim_reglement'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",'f.tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note'=>"invoice",'f.note_public'=>"invoice",'p.rowid'=>'payment','pf.amount'=>'payment','p.datep'=>'payment','p.num_paiement'=>'payment');
+		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','c.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','s.tva_intra'=>'VATIntra','f.rowid'=>"InvoiceId",'f.facnumber'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.date_lim_reglement'=>"DateDue",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus','f.note_private'=>"NotePrivate",'f.note_public'=>"NotePublic",'p.rowid'=>'PaymentId','pf.amount'=>'AmountPayment','p.datep'=>'DatePayment','p.num_paiement'=>'PaymentNumber');
+		//$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','s.tva_intra'=>'Text','f.rowid'=>"List:facture:facnumber",'f.facnumber'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.date_lim_reglement'=>"Date",'f.total'=>"Number",'f.total_ttc'=>"Number",'f.tva'=>"Number",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_private'=>"Text",'f.note_public'=>"Text",'pf.amount'=>'Number','p.datep'=>'Date','p.num_paiement'=>'Number');
+		$this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','s.tva_intra'=>'Text','f.rowid'=>"List:facture:facnumber",'f.facnumber'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.date_lim_reglement'=>"Date",'f.total'=>"Number",'f.total_ttc'=>"Number",'f.tva'=>"Number",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_private'=>"Text",'f.note_public'=>"Text",'pf.amount'=>'Number','p.datep'=>'Date','p.num_paiement'=>'Number');
+		$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','c.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company','s.tva_intra'=>'company','f.rowid'=>"invoice",'f.facnumber'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.date_lim_reglement'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",'f.tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note_private'=>"invoice",'f.note_public'=>"invoice",'p.rowid'=>'payment','pf.amount'=>'payment','p.datep'=>'payment','p.num_paiement'=>'payment');
 		$this->export_dependencies_array[$r]=array('payment'=>'p.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 
 		$this->export_sql_start[$r]='SELECT DISTINCT ';

From ee843924dd56d1d5b47346a99125bb3f2e8f91c4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 Apr 2013 10:33:06 +0200
Subject: [PATCH 02/13] Fix: Some translation change to have things more clear.

---
 htdocs/core/class/html.form.class.php  |  4 ++--
 htdocs/langs/en_US/products.lang       | 12 +++++++-----
 htdocs/langs/fr_FR/products.lang       | 16 +++++++++-------
 htdocs/product/class/product.class.php |  7 ++++---
 htdocs/product/composition/fiche.php   | 15 ++++++++++-----
 5 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 944f364ee4b..97658572831 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -344,7 +344,7 @@ class Form
      *	Show a text and picto with tooltip on text or picto
      *
      *	@param	string		$text				Text to show
-     *	@param	string		$htmltext			Content html of tooltip. Must be HTML/UTF8 encoded.
+     *	@param	string		$htmltext			HTML content of tooltip. Must be HTML/UTF8 encoded.
      *	@param	int			$tooltipon			1=tooltip sur texte, 2=tooltip sur picto, 3=tooltip sur les 2
      *	@param	int			$direction			-1=Le picto est avant, 0=pas de picto, 1=le picto est apres
      *	@param	string		$img				Code img du picto (use img_xxx() function to get it)
@@ -383,7 +383,7 @@ class Form
         //if ($text != '')	$s.='<'.$tag.$paramfortooltiptd.'>'.(($direction < 0)?'&nbsp;':'').$text.(($direction > 0)?'&nbsp;':'').'</'.$tag.'>';
         $paramfortooltiptd.= (($direction < 0)?' style="padding-left: 3px !important;"':'');
         $paramfortooltiptd.= (($direction > 0)?' style="padding-right: 3px !important;"':'');
-        if ($text != '')	$s.='<'.$tag.$paramfortooltiptd.'>'.$text.'</'.$tag.'>';
+        if ((string) $text != '')	$s.='<'.$tag.$paramfortooltiptd.'>'.$text.'</'.$tag.'>';
         if ($direction > 0)	$s.='<'.$tag.$paramfortooltipimg.' valign="top" width="14">'.$img.'</'.$tag.'>';
         if (empty($notabs))	$s.='</tr></table>';
 
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index b58dec53dcb..6ba653600e4 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -111,10 +111,12 @@ ServiceLimitedDuration=If product is a service with limited duration:
 MultiPricesAbility=Activate the multi-prices
 MultiPricesNumPrices=Number of price
 MultiPriceLevelsName=Price categories
-AssociatedProductsAbility=Activate the sub-products 
-AssociatedProducts=Sub-products
-AssociatedProductsNumber=Number of products composing this product
-ParentProductsNumber=Number of parent product
+AssociatedProductsAbility=Activate the virtual products feature 
+AssociatedProducts=Virtual product
+AssociatedProductsNumber=Number of products composing this virtual product
+ParentProductsNumber=Number of parent virtual product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
 EditAssociate=Associate
 Translation=Translation
 KeywordFilter=Keyword filter
@@ -124,7 +126,7 @@ AddDel=Add/Delete
 Quantity=Quantity
 NoMatchFound=No match found
 ProductAssociationList=List of related products/services: name of product/service (quantity affected)
-ProductParentList=List of products/services with this product as a component
+ProductParentList=List of virtual products/services with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index 3d27fdd9d6d..f5ce6482353 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -111,11 +111,13 @@ ServiceLimitedDuration=Si produit de type service à durée limitée :
 MultiPricesAbility=Prise en charge de prix multiples
 MultiPricesNumPrices=Nombre de prix
 MultiPriceLevelsName=Catégorie de prix
-AssociatedProductsAbility=Prise en charge des produits composés
-AssociatedProducts=Composition
-AssociatedProductsNumber=Nbre de sous-produits composant ce produit
-ParentProductsNumber=Nbre de produits parent
-EditAssociate=Composer
+AssociatedProductsAbility=Prise en charge des produits virtuels
+AssociatedProducts=Produit virtuel
+AssociatedProductsNumber=Nbre de sous-produits constituant ce produit virtuel
+ParentProductsNumber=Nbre de produits virtuels parent
+IfZeroItIsNotAVirtualProduct=Si 0, ce produit n'est pas un produit virtuel
+IfZeroItIsNotUsedByVirtualProduct=Si 0, ce produit n'est pas utilisé par un produit virtuel
+EditAssociate=Composer comme produit virtuel
 Translation=Traduction 
 KeywordFilter=Filtre par mot-clé
 CategoryFilter=Filtre par catégorie
@@ -123,8 +125,8 @@ ProductToAddSearch=Recherche des produits à ajouter
 AddDel=Ajouter/Retirer
 Quantity=Quantité
 NoMatchFound=Aucun résultat n'a été trouvé 
-ProductAssociationList=Liste des produits/services composant ce produit: Le nombre entre parenthèse est la quantité affectée dans cette composition.
-ProductParentList=Liste des produits/services avec ce produit comme composante
+ProductAssociationList=Liste des produits/services composant ce produit virtuel: Le nombre entre parenthèse est la quantité affectée dans cette composition.
+ProductParentList=Liste des produits/services virtuels avec ce produit comme composante
 ErrorAssociationIsFatherOfThis=L'un des produits sélectionnés est parent du produit en cours
 DeleteProduct=Supprimer un produit/service
 ConfirmDeleteProduct=Êtes-vous sûr de vouloir supprimer ce produit/service ?
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index a8803d6e5e8..f6219d5acd4 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2137,6 +2137,7 @@ class Product extends CommonObject
 				$id=(! empty($desc_pere[0]) ? $desc_pere[0] :'');
 				$nb=(! empty($desc_pere[1]) ? $desc_pere[1] :'');
 				$type=(! empty($desc_pere[2]) ? $desc_pere[2] :'');
+				$label=(! empty($desc_pere[3]) ? $desc_pere[3] :'');
 
 				if ($multiply)
 				{
@@ -2157,10 +2158,10 @@ class Product extends CommonObject
 */								'id'=>$id,					// Id product
 								'nb'=>$nb,					// Nb of units that compose parent product
 								'nb_total'=>$nb*$multiply,	// Nb of units for all nb of product
-								'stock'=>$this->stock_warehouse[1]->real,		// Stock
+								'stock'=>$this->stock_warehouse[1]->real,	// Stock
 								'stock_alert'=>$this->seuil_stock_alerte,	// Stock alert
-								'fullpath' => $compl_path.$nom_pere,	// Label
-								'type'=>$type					// Nb of units that compose parent product
+								'fullpath' => $compl_path.$label,			// Label
+								'type'=>$type				// Nb of units that compose parent product
 								);
 				}
 				else
diff --git a/htdocs/product/composition/fiche.php b/htdocs/product/composition/fiche.php
index 804759afe3a..471631cc464 100644
--- a/htdocs/product/composition/fiche.php
+++ b/htdocs/product/composition/fiche.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
@@ -200,12 +200,15 @@ if ($id || $ref)
 			// Number of subproducts
 			$prodsfather = $product->getFather(); //Parent Products
 			$product->get_sousproduits_arbo();
-			print '<tr><td>'.$langs->trans("AssociatedProductsNumber").'</td><td>'.count($product->get_arbo_each_prod()).'</td>';
+			$nbofsubproducts=count($product->get_arbo_each_prod());
+			print '<tr><td>'.$langs->trans("AssociatedProductsNumber").'</td><td>';
+			print $form->textwithpicto($nbofsubproducts, $langs->trans('IfZeroItIsNotAVirtualProduct'));
+			print '</td>';
 
 			dol_fiche_end();
 
 
-			// List of subproducts
+			// List of products into this virtual product
 			$prods_arbo = $product->get_arbo_each_prod();
 			if (count($prods_arbo) > 0)
 			{
@@ -231,8 +234,10 @@ if ($id || $ref)
 				print '</td></tr>';
 			}
 
-			// Number of parent products
-			print '<tr><td>'.$langs->trans("ParentProductsNumber").'</td><td>'.count($prodsfather).'</td>';
+			// Number of parent virtual products
+			print '<tr><td>'.$langs->trans("ParentProductsNumber").'</td><td>';
+			print $form->textwithpicto(count($prodsfather), $langs->trans('IfZeroItIsNotUsedByVirtualProduct'));
+			print '</td>';
 
 			if (count($prodsfather) > 0)
 			{

From 5b4b0583998752ac9993d1e1745d58475ba5c2ae Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 Apr 2013 12:30:52 +0200
Subject: [PATCH 03/13] Perf: Minor perf enhancement

---
 htdocs/product/composition/fiche.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/product/composition/fiche.php b/htdocs/product/composition/fiche.php
index 206dd87ceae..d02253b4d24 100644
--- a/htdocs/product/composition/fiche.php
+++ b/htdocs/product/composition/fiche.php
@@ -198,9 +198,10 @@ if ($id || $ref)
 			print '</tr>';
 
 			// Number of subproducts
-			$prodsfather = $product->getFather(); //Parent Products
+			$prodsfather = $product->getFather(); // Parent Products
 			$product->get_sousproduits_arbo();
-			$nbofsubproducts=count($product->get_arbo_each_prod());
+			$prods_arbo=$product->get_arbo_each_prod();
+			$nbofsubproducts=count($prods_arbo);
 			print '<tr><td>'.$langs->trans("AssociatedProductsNumber").'</td><td>';
 			print $form->textwithpicto($nbofsubproducts, $langs->trans('IfZeroItIsNotAVirtualProduct'));
 			print '</td>';
@@ -209,7 +210,6 @@ if ($id || $ref)
 
 
 			// List of products into this virtual product
-			$prods_arbo = $product->get_arbo_each_prod();
 			if (count($prods_arbo) > 0)
 			{
 				print '<tr><td colspan="2">';
@@ -226,7 +226,8 @@ if ($id || $ref)
 					//print $productstatic->getNomUrl(1).'<br>';
 					//print $value[0];	// This contains a tr line.
 					print '<tr>';
-					print '<td>'.$productstatic->getNomUrl(1,'composition').' ('.$value['nb'].') &nbsp &nbsp</td>';
+					//print '<td>'.$productstatic->getNomUrl(1,'composition').' ('.$value['nb'].($value['nb_total'] > $value['nb']?'->'.$value['nb_total']:'').') &nbsp &nbsp</td>';
+					print '<td>'.$productstatic->getNomUrl(1,'composition').' ('.$value['nb_total'].') &nbsp &nbsp</td>';
 					if (! empty($conf->stock->enabled)) print '<td>'.$langs->trans("Stock").' : <b>'.$productstatic->stock_reel.'</b></td>';
 					print '</tr>';
 				}

From 54040bed1d4b5280cd76eb4c751335f439c29941 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 Apr 2013 12:48:56 +0200
Subject: [PATCH 04/13] Fix: No slash alone

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

diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index d01c0456250..695b6deb2c1 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -47,7 +47,7 @@ function societe_prepare_head($object)
     {
         $head[$h][0] = DOL_URL_ROOT.'/comm/fiche.php?socid='.$object->id;
         if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && ($object->client==2 || $object->client==3)) $head[$h][1] = $langs->trans("Prospect");
-        if ($object->client==3)                       $head[$h][1] .= '/';
+        if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && $object->client==3) $head[$h][1] .= '/';
         if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && ($object->client==1 || $object->client==3)) $head[$h][1] .= $langs->trans("Customer");
         $head[$h][2] = 'customer';
         $h++;

From c87c7703cd4a50b78fd4f3ad4882b5cde4d83d4d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 Apr 2013 13:01:22 +0200
Subject: [PATCH 05/13] Qual: Make code simpler.

---
 htdocs/product/class/product.class.php | 95 +++++++++-----------------
 htdocs/product/composition/fiche.php   | 16 +++--
 2 files changed, 43 insertions(+), 68 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 9422eed8250..8cac5ebe573 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1803,7 +1803,7 @@ class Product extends CommonObject
 
 		$result=$this->del_sousproduit($id_pere, $id_fils);
 		if ($result < 0) return $result;
-		
+
 		// Check not already father of id_pere (to avoid father -> child -> father links)
 		$sql = 'SELECT fk_product_pere from '.MAIN_DB_PREFIX.'product_association';
 		$sql .= ' WHERE fk_product_pere  = '.$id_fils.' AND fk_product_fils = '.$id_pere;
@@ -1852,11 +1852,11 @@ class Product extends CommonObject
 	{
 		if (! is_numeric($fk_parent)) $fk_parent=0;
 		if (! is_numeric($fk_child)) $fk_child=0;
-		
+
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_association";
 		$sql.= " WHERE fk_product_pere  = ".$fk_parent;
 		$sql.= " AND fk_product_fils = ".$fk_child;
-		
+
 		dol_syslog(get_class($this).'::del_sousproduit sql='.$sql);
 		if (! $this->db->query($sql))
 		{
@@ -2122,7 +2122,7 @@ class Product extends CommonObject
 	 * 	Define value of this->res
 	 *
 	 *	@param		array	$prod			Products array
-	 *	@param		string	$compl_path		Directory path
+	 *	@param		string	$compl_path		Directory path of parents to add before
 	 *	@param		int		$multiply		Because each sublevel must be multiplicated by parent nb
 	 *	@param		int		$level			Init level
 	 *  @return 	void
@@ -2132,7 +2132,8 @@ class Product extends CommonObject
 		global $conf,$langs;
 
 		$product = new Product($this->db);
-		foreach($prod as $nom_pere => $desc_pere)
+		//var_dump($prod);
+		foreach($prod as $id_product => $desc_pere)	// nom_pere is 0 or id of sub_product
 		{
 			if (is_array($desc_pere))	// If this parent desc is an array, this is an array of childs
 			{
@@ -2140,58 +2141,27 @@ class Product extends CommonObject
 				$nb=(! empty($desc_pere[1]) ? $desc_pere[1] :'');
 				$type=(! empty($desc_pere[2]) ? $desc_pere[2] :'');
 				$label=(! empty($desc_pere[3]) ? $desc_pere[3] :'');
+				if ($multiply < 1) $multiply=1;
 
-				if ($multiply)
-				{
-					//print "XXX ".$desc_pere[1]." multiply=".$multiply;
-					$img="";
-					$this->fetch($id);
-					$this->load_stock();
-					if ($this->stock_warehouse[1]->real < $this->seuil_stock_alerte)
-					{
-						$img=img_warning($langs->trans("StockTooLow"));
-					}
-					$this->res[]= array(
-/*								"<tr><td>&nbsp; &nbsp; &nbsp; ->
-                                <a href=\"".DOL_URL_ROOT."/product/fiche.php?id=".$desc_pere[0]."\">".$compl_path.stripslashes($nom_pere)."
-                                </a> (".$desc_pere[1].")</td><td align=\"center\"> ".($desc_pere[1]*$multiply)."</td><td>&nbsp</td><td>&nbsp</td>
-                                <td align=\"center\">".$this->stock_entrepot[1]." ".$img."</td></tr>",
-								$desc_pere[0],							// Id product
-*/								'id'=>$id,					// Id product
-								'nb'=>$nb,					// Nb of units that compose parent product
-								'nb_total'=>$nb*$multiply,	// Nb of units for all nb of product
-								'stock'=>$this->stock_warehouse[1]->real,	// Stock
-								'stock_alert'=>$this->seuil_stock_alerte,	// Stock alert
-								'fullpath' => $compl_path.$label,			// Label
-								'type'=>$type				// Nb of units that compose parent product
-								);
-				}
-				else
-				{
-					$this->fetch($desc_pere[0]);
-					$this->load_stock();
-					$this->res[]= array(
-/*					$compl_path.$nom_pere." (".$desc_pere[1].")",
-					$desc_pere[0],							// Id product
-*/					'id'=>$id,					// Id product
+				//print "XXX We add id=".$id." - label=".$label." - nb=".$nb." - multiply=".$multiply." fullpath=".$compl_path.$label."\n";
+				$this->fetch($id);
+				$this->load_stock();
+				$this->res[]= array(
+					'id'=>$id,					// Id product
 					'nb'=>$nb,					// Nb of units that compose parent product
-					'nb_total'=>$nb,				// Nb of units for all nb of product
-					'stock'=>$this->stock_warehouse[1]->real,		// Stock
+					'nb_total'=>$nb*$multiply,	// Nb of units for all nb of product
+					'stock'=>$this->stock_warehouse[1]->real,	// Stock
 					'stock_alert'=>$this->seuil_stock_alerte,	// Stock alert
-					'fullpath' => $compl_path.$nom_pere,	// Label
-					'type'=>$type					// Nb of units that compose parent product
-					);
-				}
-			}
-			else if($nom_pere != "0" && $nom_pere != "1")
-			{
-				$this->res[]= array($compl_path.$nom_pere,$desc_pere);
+					'fullpath' => $compl_path.$label,			// Label
+					'type'=>$type				// Nb of units that compose parent product
+				);
 			}
 
 			// Recursive call if child is an array
-			if (is_array($desc_pere[0]))
+			if (is_array($desc_pere['childs']))
 			{
-				$this ->fetch_prod_arbo($desc_pere[0], $nom_pere." -> ", $desc_pere[1]*$multiply, $level+1);
+				//print 'YYY We go down for '.$desc_pere[3]." -> \n";
+				$this ->fetch_prod_arbo($desc_pere['childs'], $compl_path.$desc_pere[3]." -> ", $desc_pere[1]*$multiply, $level+1);
 			}
 		}
 	}
@@ -2228,11 +2198,12 @@ class Product extends CommonObject
 		$this->res = array();
 		if (isset($this->sousprods) && is_array($this->sousprods))
 		{
-			foreach($this->sousprods as $nom_pere => $desc_pere)
+			foreach($this->sousprods as $prod_name => $desc_product)
 			{
-				if (is_array($desc_pere)) $this->fetch_prod_arbo($desc_pere,"",$multiply);
+				if (is_array($desc_product)) $this->fetch_prod_arbo($desc_product,"",$multiply);
 			}
 		}
+		//var_dump($this->res);
 		return $this->res;
 	}
 
@@ -2293,7 +2264,7 @@ class Product extends CommonObject
 
 
 	/**
-	 *  Return all parent products fo current product
+	 *  Return all direct parent products fo current product
 	 *
 	 *  @return 	array prod
 	 */
@@ -2324,19 +2295,19 @@ class Product extends CommonObject
 	}
 
 	/**
-	 *  Return childs of product with if fk_parent
+	 *  Return childs of product $id
 	 *
-	 * 	@param		int		$fk_parent	Id of product to search childs of
+	 * 	@param		int		$id			Id of product to search childs of
 	 *  @return     array       		Prod
 	 */
-	function getChildsArbo($fk_parent)
+	function getChildsArbo($id)
 	{
 		$sql = "SELECT p.rowid, p.label as label, pa.qty as qty, pa.fk_product_fils as id, p.fk_product_type";
 		$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
 		$sql.= ", ".MAIN_DB_PREFIX."product_association as pa";
 		$sql.= " WHERE p.rowid = pa.fk_product_fils";
-		$sql.= " AND pa.fk_product_pere = ".$fk_parent;
-		$sql.= " AND pa.fk_product_fils != ".$fk_parent;	// This should not happens, it is to avoid invinite loop if it happens
+		$sql.= " AND pa.fk_product_pere = ".$id;
+		$sql.= " AND pa.fk_product_fils != ".$id;	// This should not happens, it is to avoid infinite loop if it happens
 
 		dol_syslog(get_class($this).'::getChildsArbo sql='.$sql);
 		$res  = $this->db->query($sql);
@@ -2351,7 +2322,7 @@ class Product extends CommonObject
 				$listofchilds=$this->getChildsArbo($rec['id']);
 				foreach($listofchilds as $keyChild => $valueChild)
 				{
-					$prods[$rec['rowid']][$keyChild] = $valueChild;
+					$prods[$rec['rowid']]['childs'][$keyChild] = $valueChild;
 				}
 			}
 
@@ -2373,14 +2344,14 @@ class Product extends CommonObject
 	function get_sousproduits_arbo()
 	{
 		$parent = $this->getParent();
-		foreach($parent as $key => $value)
+		foreach($parent as $key => $value)		// key=label, value[0]=id
 		{
 			foreach($this->getChildsArbo($value[0]) as $keyChild => $valueChild)
 			{
 				$parent[$key][$keyChild] = $valueChild;
 			}
 		}
-		foreach($parent as $key => $value)
+		foreach($parent as $key => $value)		// key=label, value is array of childs
 		{
 			$this->sousprods[$key] = $value;
 		}
@@ -2418,7 +2389,7 @@ class Product extends CommonObject
         else if ($option == 'category')
         {
         	$lien = '<a href="'.DOL_URL_ROOT.'/categories/categorie.php?id='.$this->id.'&type=0">';
-        }        
+        }
         else
 		{
 			$lien = '<a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$this->id.'">';
diff --git a/htdocs/product/composition/fiche.php b/htdocs/product/composition/fiche.php
index d02253b4d24..71ce35c76e1 100644
--- a/htdocs/product/composition/fiche.php
+++ b/htdocs/product/composition/fiche.php
@@ -227,7 +227,7 @@ if ($id || $ref)
 					//print $value[0];	// This contains a tr line.
 					print '<tr>';
 					//print '<td>'.$productstatic->getNomUrl(1,'composition').' ('.$value['nb'].($value['nb_total'] > $value['nb']?'->'.$value['nb_total']:'').') &nbsp &nbsp</td>';
-					print '<td>'.$productstatic->getNomUrl(1,'composition').' ('.$value['nb_total'].') &nbsp &nbsp</td>';
+					print '<td>'.$productstatic->getNomUrl(1,'composition').' ('.$value['nb'].') &nbsp &nbsp</td>';
 					if (! empty($conf->stock->enabled)) print '<td>'.$langs->trans("Stock").' : <b>'.$productstatic->stock_reel.'</b></td>';
 					print '</tr>';
 				}
@@ -292,12 +292,14 @@ if ($id || $ref)
 		// Number of subproducts
 		$prodsfather = $product->getFather(); //Parent Products
 		$product->get_sousproduits_arbo();
-		print '<tr><td>'.$langs->trans("AssociatedProductsNumber").'</td><td>'.count($product->get_arbo_each_prod()).'</td>';
+		$prods_arbo=$product->get_arbo_each_prod();
+		$nbofsubproducts=count($prods_arbo);
+		print '<tr><td>'.$langs->trans("AssociatedProductsNumber").'</td><td>';
+		print $form->textwithpicto($nbofsubproducts, $langs->trans('IfZeroItIsNotAVirtualProduct'));
+		print '</td>';
 		print '</tr>';
 
 		// List of subproducts
-		$prods_arbo = $product->get_arbo_each_prod();
-		//var_dump($prods_arbo);
 		if(count($prods_arbo) > 0)
 		{
 			print '<tr><td colspan="2">';
@@ -322,8 +324,10 @@ if ($id || $ref)
 			print '</td></tr>';
 		}
 
-		// Number of parent products
-		print '<tr><td>'.$langs->trans("ParentProductsNumber").'</td><td>'.count($prodsfather).'</td>';
+		// Number of parent virtual products
+		print '<tr><td>'.$langs->trans("ParentProductsNumber").'</td><td>';
+		print $form->textwithpicto(count($prodsfather), $langs->trans('IfZeroItIsNotUsedByVirtualProduct'));
+		print '</td>';
 
 		if (count($prodsfather) > 0)
 		{

From 335c8cd5112df9a55c0e456d85729547213743fb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 Apr 2013 13:01:38 +0200
Subject: [PATCH 06/13] Look: Minor change

---
 htdocs/theme/eldy/style.css.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 43af5fc2482..bcfb9a051bd 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1326,7 +1326,7 @@ a.tabTitle {
     text-shadow:1px 1px 1px #ffffff;
 	font-family: <?php print $fontlist ?>;
 	font-weight: normal;
-    padding: 5px 6px 2px 6px;
+    padding: 4px 6px 2px 6px;
     margin: 0px 6px;
     text-decoration: none;
     white-space: nowrap;
@@ -1334,7 +1334,7 @@ a.tabTitle {
 
 a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
 	font-family: <?php print $fontlist ?>;
-    padding: 5px 6px 2px 6px;
+    padding: 4px 6px 2px 6px;
     margin: 0em 0.2em;
     text-decoration: none;
     white-space: nowrap;

From ed4c18b9d36fdb83c4d0fee00bd339879c61c0e5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 Apr 2013 13:15:33 +0200
Subject: [PATCH 07/13] Update changelog. Fix: Fix template ODS.

---
 ChangeLog                                     |  69 +++++++++---------
 .../thirdparties/template_thirdparty.ods      | Bin 14558 -> 13595 bytes
 2 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c4b8ccf1e55..a70c0f58da2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ English Dolibarr ChangeLog
 
 ***** ChangeLog for 3.4 compared to 3.3.2 *****
 For users:
+- New: Can use ODS templates as document templates.
 - New: Add link to autofill/reset with quantity to ship when creating a
   delivery receipt.
 - New: Event into calendar use different colors for different users.
@@ -11,46 +12,48 @@ For users:
 - New: Add a tab "consumption" on thirdparties to list products bought/sells.
 - New: Some performance enhancements.
 - New: Can attach files onto trip and expenses modules.
-- New: Add option MAIN_PDF_TITLE_BACKGROUND_COLOR.
+- New: Add hidden option MAIN_PDF_TITLE_BACKGROUND_COLOR.
 - New: Merge tab customer and prospect.
 - New: Add ES formated address country rule.
-- New: Can define a hierarchical responsible on user.
-- New: Add a hierarchical view for users.
+- New: Can define a hierarchical responsible on user and add a tree view to 
+  see hierarchy of users.
 - New: Can expand/collapse menus, categories and users list.
-- New: extra parameters are supported into ODT templates.
-- New: total per vat rate are available as tags for ODT templates.
-- New: Add more types for extra parameters (lists, phone, emails, checkbox, prices).
+- New: extra parameters are supported into ODT/ODS templates.
+- New: total per vat rate are available as tags for ODT/ODS templates.
 - New: Some part of interface use more CSS3 (ie: agenda)
-- New: [ task #707 ] Create option ProfIdx are mandatory to validate a invoice.
+- New: [ task #707 ] Create option "ProfIdx is mandatory to validate a invoice".
 - New: Can define if we want to use VAT or not for subscriptions (foundation module).
-- New: Can define a default choice for choice "More action when recording
-  a subscription" (foundation module).
-- New: Add link to check professional id for india.
+- New: Can define a default choice for "More action when recording a
+  subscription" (foundation module).
+- New: Add link to check professional id for India.
 - New: [ task #731 ] Uniformize ref generation
 - New: [ task #748 ] Add a link "Dolibarr" into left menu
-- New: Script email_unpaid_invoices_to_representative accepts now a parameter test
-  and a delay.
-- New: Can define a different clicktodial setup per user.
-- New: Add option INVOICE_CAN_NEVER_BE_REMOVED.
-- New: Enhance agenda module to reach RFC2445 (add busy information).
+- New: Script email_unpaid_invoices_to_representative accepts now a parameter "test"
+  and a "late delay".
+- New: Can define different clicktodial setups for each user.
+- New: Add hidden option INVOICE_CAN_NEVER_BE_REMOVED.
+- New: Enhance agenda module to reach RFC2445 ("type" not enabled by default and add
+  "busy" information).
 - New: Add module Opensurvey.
-- New: Default aprrover for holidays i sby default hierchical parent.
+- New: Default approver for holidays is set by default to hierchical parent.
 - First change to prepare feature "click to print" (IPP) for PDF.
-- New: [ task #350 ] Merge tab customer and prospect
-- New: [ task #710 ] Add substitution into mailing send (and HTML is now valid)
-- New: [ task #711 ] Add combobox for contact as done for product/thirdparty
-- New: [ task #714 ] In Emailing module admin autogenerate security key of READRECIEPT
-- New: [ task #743 ] GED : Add aministration option to disabled autotree to display
-- New: [ task #767 ] Customer Address fallback when a contact doesn't have an address
-- New: [ task #768 ] WYSIWYG for all mail
-- New: [ task #773 ] Add Project document in GED(ECM) modules
-- New: [ task #783 ] Add checkbox and radio into extrafield feature
-- New: [ task #798 ] Add range limit date on product/services as it is done on order and invoice
-- New: [ task #814 ] Add extrafield feature into Project/project tasks module
-- New: [ task #770 ] Add ODT document generation for Projects module
-- New: [ task #741 ] Add intervention box
-- New: [ task #826 ] Optionnal increase stock when deleting an invoice already validated
-- New: [ task #823 ] Shipping_validate email notification
+- New: [ task #350 ] Merge tab customer and prospect.
+- New: [ task #710 ] Add substitution into mailing send (and HTML is now valid).
+- New: [ task #711 ] Add combobox for contact, as done for product/thirdparty.
+- New: [ task #714 ] In Emailing module admin autogenerate security key of READRECEIPT.
+- New: [ task #743 ] GED : Add aministration option to disable autotree display.
+- New: [ task #767 ] Customer Address fallback when a contact doesn't have an address.
+- New: [ task #768 ] WYSIWYG for all mails.
+- New: [ task #773 ] Add Project document in GED(ECM) modules.
+- New: [ task #783 ] Add more types for extra parameters (lists, phone, emails, checkbox,
+  prices, radio).
+- New: [ task #798 ] Add range limit date on product/services as it is done on order 
+  and invoice.
+- New: [ task #814 ] Add extrafield feature for projects ands tasks.
+- New: [ task #770 ] Add ODT document generation for Projects module.
+- New: [ task #741 ] Add intervention box.
+- New: [ task #826 ] Optionnal increase stock when deleting an invoice already validated.
+- New: [ task #823 ] Shipping_validate email notification.
 
 For translators:
 - Update language files.
@@ -60,8 +63,8 @@ For developers:
 - An external module can force its theme.
 - Add function dol_set_focus('#xxx').
 - A mymodule can bring its own core/modules/mymodule/modules_mymodule.php file.
-- Removed not used libraries.
-- More web services. 
+- Removed some not used libraries.
+- More web services.
 - Renamed some database fields, code variables and parameters from french to english.
 - First change to manage margins on contracts.
 - Add hook getFormMail.
diff --git a/htdocs/install/doctemplates/thirdparties/template_thirdparty.ods b/htdocs/install/doctemplates/thirdparties/template_thirdparty.ods
index ad50961b562d95810ea98e692c74827e9ece247d..c715d7fb80f94399f3a39710b5d67c73a91db913 100644
GIT binary patch
literal 13595
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
ShJnF={BR?{z>Kg$@BR-DqdA)Z

literal 14558
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


From e65e6516c5bc7f781f1a6d881f2d500df07f83c3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 22 Apr 2013 14:33:47 +0200
Subject: [PATCH 08/13] Fix: Logon theme on amarok

---
 htdocs/core/tpl/login.tpl.php     | 2 +-
 htdocs/theme/amarok/style.css.php | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 8717225cd3f..7f10efcc1ec 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -179,7 +179,7 @@ if ($forgetpasslink || $helpcenterlink)
 <?php if ($main_home)
 {
 ?>
-	<center><div align="center" style="max-width: 80%">
+	<center><div align="center" class="login_main_home" style="max-width: 80%">
 	<?php echo $main_home; ?>
 	</div></center><br>
 <?php
diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php
index c5e92cdcb1b..ef50c010fec 100755
--- a/htdocs/theme/amarok/style.css.php
+++ b/htdocs/theme/amarok/style.css.php
@@ -349,6 +349,8 @@ div.tmenu ul li a.tmenusel {/* texte du menu principal sélectionné */
 
 /* Login */
 
+body.body center { color:white; margin-top: 100px; }
+
 form#login {
 	display:block;
 	border:solid 1px rgba(0,0,0,.4);
@@ -493,6 +495,10 @@ img.login, img.printer, img.entity {
 	font-weight:bold;
 }
 
+div.login_main_home {
+	color: #000000;
+}
+
 
 /* ============================================================================== */
 /* Menu gauche                                                                    */
@@ -913,7 +919,7 @@ div.fichehalfright {
 	<?php if (empty($conf->dol_optimize_smallscreen))   { print "width: 50%;\n"; } ?>
 }
 div.ficheaddleft {
-	<?php if (empty($conf->dol_optimize_smallscreen))   { print "padding-left: 16px;\n"; } 
+	<?php if (empty($conf->dol_optimize_smallscreen))   { print "padding-left: 16px;\n"; }
 	else print "margin-top: 10px;\n"; ?>
 }
 

From 1be6a2c1208c7e6b5337892712b1beb1c0d0d1aa Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Mon, 22 Apr 2013 12:35:31 +0200
Subject: [PATCH 09/13] Fix: broken features for fileupload

---
 htdocs/comm/action/document.php        |  2 +-
 htdocs/core/class/fileupload.class.php | 28 +++++++++++++++++++++++++-
 htdocs/projet/class/task.class.php     |  1 +
 htdocs/projet/tasks/document.php       |  8 ++++++--
 4 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index 9fcbca3e743..042f330b199 100755
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -263,7 +263,7 @@ if ($objectid > 0)
 
 		// Affiche formulaire upload
 	   	$formfile=new FormFile($db);
-		$formfile->form_attach_new_file(DOL_URL_ROOT.'/comm/action/document.php?id='.$act->id,'',0,0,($user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create));
+		$formfile->form_attach_new_file(DOL_URL_ROOT.'/comm/action/document.php?id='.$act->id,'',0,0,($user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create),50,$act);
 
 
 		// List of document
diff --git a/htdocs/core/class/fileupload.class.php b/htdocs/core/class/fileupload.class.php
index c5e83017940..a86073e6969 100644
--- a/htdocs/core/class/fileupload.class.php
+++ b/htdocs/core/class/fileupload.class.php
@@ -56,6 +56,8 @@ class FileUpload
 			$filename = $regs[2];
 		}
 
+		$parentForeignKey = '';
+
 		// For compatibility
 		if ($element == 'propal') {
 			$pathname = 'comm/propal';
@@ -69,6 +71,14 @@ class FileUpload
 			$element = $pathname = 'projet';
 			$dir_output=$conf->$element->dir_output;
 		}
+		elseif ($element == 'project_task') {
+			$pathname = 'projet'; $filename='task';
+			$dir_output=$conf->projet->dir_output;
+			$parentForeignKey = 'fk_project';
+			$parentClass = 'Project';
+			$parentElement = 'projet';
+			$parentObject = 'project';
+		}
 		elseif ($element == 'fichinter') {
 			$element='ficheinter';
 			$dir_output=$conf->$element->dir_output;
@@ -80,6 +90,10 @@ class FileUpload
 		elseif ($element == 'invoice_supplier') {
 			$pathname = 'fourn'; $filename='fournisseur.facture';
 			$dir_output=$conf->fournisseur->facture->dir_output;
+		}
+		elseif ($element == 'action') {
+			$pathname = 'comm/action'; $filename='actioncomm';
+			$dir_output=$conf->agenda->dir_output;
 		} else {
 			$dir_output=$conf->$element->dir_output;
 		}
@@ -97,11 +111,23 @@ class FileUpload
 		$object = new $classname($db);
 
 		$object->fetch($fk_element);
-		$object->fetch_thirdparty();
+		if (!empty($parentForeignKey)) {
+			dol_include_once('/'.$parentElement.'/class/'.$parentObject.'.class.php');
+			$parent = new $parentClass($db);
+			$parent->fetch($object->$parentForeignKey);
+			if (!empty($parent->socid)) {
+				$parent->fetch_thirdparty();
+			}
+			$object->$parentObject = dol_clone($parent);
+		} else {
+			$object->fetch_thirdparty();
+		}
 
 		$object_ref = dol_sanitizeFileName($object->ref);
 		if ($element == 'invoice_supplier') {
 			$object_ref = get_exdir($object->id, 2) . $object_ref;
+		} else if ($element == 'project_task') {
+			$object_ref = $object->project->ref . '/' . $object_ref;
 		}
 
 		$this->options = array(
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index ac29870106b..a177ddf838b 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -183,6 +183,7 @@ class Task extends CommonObject
         $sql.= " t.label,";
         $sql.= " t.description,";
         $sql.= " t.duration_effective,";
+        $sql.= " t.datec,";
         $sql.= " t.dateo,";
         $sql.= " t.datee,";
         $sql.= " t.fk_user_creat,";
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index 5d42a44d54b..90adc2925c2 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -93,7 +93,11 @@ if ($id > 0 || ! empty($ref))
 	{
 		$projectstatic->fetch($object->fk_project);
 
-		if (! empty($projectstatic->socid)) $projectstatic->societe->fetch($projectstatic->socid);
+		if (! empty($projectstatic->socid)) {
+			$projectstatic->fetch_thirdparty();
+		}
+
+		$object->project = dol_clone($projectstatic);
 
 		$upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($projectstatic->ref).'/'.dol_sanitizeFileName($object->ref);
 	}
@@ -114,7 +118,7 @@ if ($action=='delete')
 {
     $langs->load("other");
 	$file = $upload_dir . '/' . GETPOST('urlfile');	// Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
-	$ret=dol_delete_file($file);
+	$ret=dol_delete_file($file,0,0,0,$object);
 	if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
 	else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
     header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);

From 733872e9c90bcbbd263260c228f4e6eeb6b09d11 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Mon, 22 Apr 2013 14:47:37 +0200
Subject: [PATCH 10/13] Fix: merge problem

---
 htdocs/comm/action/document.php | 323 ++++++++++++++++----------------
 1 file changed, 162 insertions(+), 161 deletions(-)

diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index 042f330b199..6a576c580ca 100755
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -51,6 +51,19 @@ if ($user->societe_id > 0)
 	$socid = $user->societe_id;
 }
 
+$act = new ActionComm($db);
+
+if ($objectid > 0)
+{
+	$ret = $act->fetch($objectid);
+	if ($ret > 0) {
+		$company=new Societe($db);
+		$company->fetch($act->societe->id);
+		$act->societe=$company; // For backward compatibility
+		$act->thirdparty=$company;
+	}
+}
+
 // Get parameters
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
@@ -79,7 +92,7 @@ if ($action == 'delete')
 {
 	$upload_dir = $conf->agenda->dir_output.'/'.dol_sanitizeFileName($objectid);
 	$file = $upload_dir . '/' . $_GET['urlfile'];	// Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
-	$ret=dol_delete_file($file);
+	$ret=dol_delete_file($file,0,0,0,$act);
 	if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
 	else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
 	$action='';
@@ -96,184 +109,172 @@ $help_url='EN:Module_Agenda_En|FR:Module_Agenda|ES:M&omodulodulo_Agenda';
 llxHeader('',$langs->trans("Agenda"),$help_url);
 
 
-if ($objectid > 0)
+if ($act->id > 0)
 {
-	$act = new ActionComm($db);
-	if ($act->fetch($objectid))
+	$upload_dir = $conf->agenda->dir_output.'/'.dol_sanitizeFileName($objectid);
+
+	$author=new User($db);
+	$author->fetch($act->author->id);
+	$act->author=$author;
+
+	if ($act->contact->id) $act->fetch_contact($act->contact->id);
+
+	$head=actions_prepare_head($act);
+	dol_fiche_head($head, 'documents', $langs->trans("Action"),0,'action');
+
+	// Affichage fiche action en mode visu
+	print '<table class="border" width="100%">';
+
+	$linkback = '<a href="'.DOL_URL_ROOT.'/comm/action/index.php">'.$langs->trans("BackToList").'</a>';
+
+	// Ref
+	print '<tr><td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">';
+	print $form->showrefnav($act, 'id', $linkback, ($user->societe_id?0:1), 'id', 'ref', '');
+	print '</td></tr>';
+
+	// Type
+	if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
 	{
-		$upload_dir = $conf->agenda->dir_output.'/'.dol_sanitizeFileName($objectid);
+		print '<tr><td>'.$langs->trans("Type").'</td><td colspan="3">'.$act->type.'</td></tr>';
+	}
 
-		$company=new Societe($db);
-		$company->fetch($act->societe->id);
-		$act->societe=$company;
+	// Title
+	print '<tr><td>'.$langs->trans("Title").'</td><td colspan="3">'.$act->label.'</td></tr>';
 
-		$author=new User($db);
-		$author->fetch($act->author->id);
-		$act->author=$author;
+	// Full day event
+	print '<tr><td>'.$langs->trans("EventOnFullDay").'</td><td colspan="3">'.yn($act->fulldayevent).'</td></tr>';
 
-        if ($act->contact->id) $act->fetch_contact($act->contact->id);
+	// Date start
+	print '<tr><td width="30%">'.$langs->trans("DateActionStart").'</td><td colspan="2">';
+	if (! $act->fulldayevent) print dol_print_date($act->datep,'dayhour');
+	else print dol_print_date($act->datep,'day');
+	if ($act->percentage == 0 && $act->datep && $act->datep < ($now - $delay_warning)) print img_warning($langs->trans("Late"));
+	print '</td>';
+	print '<td rowspan="4" align="center" valign="middle" width="180">'."\n";
+	print '<form name="listactionsfiltermonth" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="action" value="show_month">';
+	print '<input type="hidden" name="year" value="'.dol_print_date($act->datep,'%Y').'">';
+	print '<input type="hidden" name="month" value="'.dol_print_date($act->datep,'%m').'">';
+	print '<input type="hidden" name="day" value="'.dol_print_date($act->datep,'%d').'">';
+	//print '<input type="hidden" name="day" value="'.dol_print_date($act->datep,'%d').'">';
+	print img_picto($langs->trans("ViewCal"),'object_calendar').' <input type="submit" style="width: 120px" class="button" name="viewcal" value="'.$langs->trans("ViewCal").'">';
+	print '</form>'."\n";
+	print '<form name="listactionsfilterweek" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="action" value="show_week">';
+	print '<input type="hidden" name="year" value="'.dol_print_date($act->datep,'%Y').'">';
+	print '<input type="hidden" name="month" value="'.dol_print_date($act->datep,'%m').'">';
+	print '<input type="hidden" name="day" value="'.dol_print_date($act->datep,'%d').'">';
+	//print '<input type="hidden" name="day" value="'.dol_print_date($act->datep,'%d').'">';
+	print img_picto($langs->trans("ViewCal"),'object_calendarweek').' <input type="submit" style="width: 120px" class="button" name="viewweek" value="'.$langs->trans("ViewWeek").'">';
+	print '</form>'."\n";
+	print '<form name="listactionsfilterday" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="action" value="show_day">';
+	print '<input type="hidden" name="year" value="'.dol_print_date($act->datep,'%Y').'">';
+	print '<input type="hidden" name="month" value="'.dol_print_date($act->datep,'%m').'">';
+	print '<input type="hidden" name="day" value="'.dol_print_date($act->datep,'%d').'">';
+	//print '<input type="hidden" name="day" value="'.dol_print_date($act->datep,'%d').'">';
+	print img_picto($langs->trans("ViewCal"),'object_calendarday').' <input type="submit" style="width: 120px" class="button" name="viewday" value="'.$langs->trans("ViewDay").'">';
+	print '</form>'."\n";
+	print '</td>';
+	print '</tr>';
 
-		$head=actions_prepare_head($act);
-		dol_fiche_head($head, 'documents', $langs->trans("Action"),0,'action');
+	// Date end
+	print '<tr><td>'.$langs->trans("DateActionEnd").'</td><td colspan="2">';
+	if (! $act->fulldayevent) print dol_print_date($act->datef,'dayhour');
+	else print dol_print_date($act->datef,'day');
+	if ($act->percentage > 0 && $act->percentage < 100 && $act->datef && $act->datef < ($now- $delay_warning)) print img_warning($langs->trans("Late"));
+	print '</td></tr>';
 
-		// Affichage fiche action en mode visu
-		print '<table class="border" width="100%">';
+	// Status
+	print '<tr><td nowrap>'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td><td colspan="2">';
+	print $act->getLibStatut(4);
+	print '</td></tr>';
 
-		$linkback = '<a href="'.DOL_URL_ROOT.'/comm/action/index.php">'.$langs->trans("BackToList").'</a>';
+	// Location
+	print '<tr><td>'.$langs->trans("Location").'</td><td colspan="2">'.$act->location.'</td></tr>';
 
-		// Ref
-		print '<tr><td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">';
-		print $form->showrefnav($act, 'id', $linkback, ($user->societe_id?0:1), 'id', 'ref', '');
-		print '</td></tr>';
 
-		// Type
-		if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
+	print '</table><br><br><table class="border" width="100%">';
+
+
+	// Third party - Contact
+	print '<tr><td width="30%">'.$langs->trans("ActionOnCompany").'</td><td>'.($act->societe->id?$act->societe->getNomUrl(1):$langs->trans("None"));
+	if ($act->societe->id && $act->type_code == 'AC_TEL')
+	{
+		if ($act->societe->fetch($act->societe->id))
 		{
-			print '<tr><td>'.$langs->trans("Type").'</td><td colspan="3">'.$act->type.'</td></tr>';
+			print "<br>".dol_print_phone($act->societe->tel);
 		}
-
-		// Title
-		print '<tr><td>'.$langs->trans("Title").'</td><td colspan="3">'.$act->label.'</td></tr>';
-
-        // Full day event
-        print '<tr><td>'.$langs->trans("EventOnFullDay").'</td><td colspan="3">'.yn($act->fulldayevent).'</td></tr>';
-
-		// Date start
-		print '<tr><td width="30%">'.$langs->trans("DateActionStart").'</td><td colspan="2">';
-		if (! $act->fulldayevent) print dol_print_date($act->datep,'dayhour');
-		else print dol_print_date($act->datep,'day');
-		if ($act->percentage == 0 && $act->datep && $act->datep < ($now - $delay_warning)) print img_warning($langs->trans("Late"));
-		print '</td>';
-		print '<td rowspan="4" align="center" valign="middle" width="180">'."\n";
-        print '<form name="listactionsfiltermonth" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST">';
-        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-        print '<input type="hidden" name="action" value="show_month">';
-        print '<input type="hidden" name="year" value="'.dol_print_date($act->datep,'%Y').'">';
-        print '<input type="hidden" name="month" value="'.dol_print_date($act->datep,'%m').'">';
-        print '<input type="hidden" name="day" value="'.dol_print_date($act->datep,'%d').'">';
-        //print '<input type="hidden" name="day" value="'.dol_print_date($act->datep,'%d').'">';
-        print img_picto($langs->trans("ViewCal"),'object_calendar').' <input type="submit" style="width: 120px" class="button" name="viewcal" value="'.$langs->trans("ViewCal").'">';
-        print '</form>'."\n";
-        print '<form name="listactionsfilterweek" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST">';
-        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-        print '<input type="hidden" name="action" value="show_week">';
-        print '<input type="hidden" name="year" value="'.dol_print_date($act->datep,'%Y').'">';
-        print '<input type="hidden" name="month" value="'.dol_print_date($act->datep,'%m').'">';
-        print '<input type="hidden" name="day" value="'.dol_print_date($act->datep,'%d').'">';
-        //print '<input type="hidden" name="day" value="'.dol_print_date($act->datep,'%d').'">';
-        print img_picto($langs->trans("ViewCal"),'object_calendarweek').' <input type="submit" style="width: 120px" class="button" name="viewweek" value="'.$langs->trans("ViewWeek").'">';
-        print '</form>'."\n";
-        print '<form name="listactionsfilterday" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST">';
-        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-        print '<input type="hidden" name="action" value="show_day">';
-        print '<input type="hidden" name="year" value="'.dol_print_date($act->datep,'%Y').'">';
-        print '<input type="hidden" name="month" value="'.dol_print_date($act->datep,'%m').'">';
-        print '<input type="hidden" name="day" value="'.dol_print_date($act->datep,'%d').'">';
-        //print '<input type="hidden" name="day" value="'.dol_print_date($act->datep,'%d').'">';
-        print img_picto($langs->trans("ViewCal"),'object_calendarday').' <input type="submit" style="width: 120px" class="button" name="viewday" value="'.$langs->trans("ViewDay").'">';
-        print '</form>'."\n";
-        print '</td>';
-		print '</tr>';
-
-		// Date end
-		print '<tr><td>'.$langs->trans("DateActionEnd").'</td><td colspan="2">';
-        if (! $act->fulldayevent) print dol_print_date($act->datef,'dayhour');
-		else print dol_print_date($act->datef,'day');
-		if ($act->percentage > 0 && $act->percentage < 100 && $act->datef && $act->datef < ($now- $delay_warning)) print img_warning($langs->trans("Late"));
-		print '</td></tr>';
-
-		// Status
-		print '<tr><td nowrap>'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td><td colspan="2">';
-		print $act->getLibStatut(4);
-		print '</td></tr>';
-
-        // Location
-        print '<tr><td>'.$langs->trans("Location").'</td><td colspan="2">'.$act->location.'</td></tr>';
-
-
-        print '</table><br><br><table class="border" width="100%">';
-
-
-        // Third party - Contact
-        print '<tr><td width="30%">'.$langs->trans("ActionOnCompany").'</td><td>'.($act->societe->id?$act->societe->getNomUrl(1):$langs->trans("None"));
-        if ($act->societe->id && $act->type_code == 'AC_TEL')
-        {
-            if ($act->societe->fetch($act->societe->id))
-            {
-                print "<br>".dol_print_phone($act->societe->tel);
-            }
-        }
-        print '</td>';
-        print '<td>'.$langs->trans("Contact").'</td>';
-        print '<td>';
-        if ($act->contact->id > 0)
-        {
-            print $act->contact->getNomUrl(1);
-            if ($act->contact->id && $act->type_code == 'AC_TEL')
-            {
-                if ($act->contact->fetch($act->contact->id))
-                {
-                    print "<br>".dol_print_phone($act->contact->phone_pro);
-                }
-            }
-        }
-        else
-        {
-            print $langs->trans("None");
-        }
-
-        print '</td></tr>';
-
-        // Project
-        if (! empty($conf->projet->enabled))
-        {
-            print '<tr><td valign="top">'.$langs->trans("Project").'</td><td colspan="3">';
-            if ($act->fk_project)
-            {
-                $project=new Project($db);
-                $project->fetch($act->fk_project);
-                print $project->getNomUrl(1);
-            }
-            print '</td></tr>';
-        }
-
-        // Priority
-        print '<tr><td nowrap>'.$langs->trans("Priority").'</td><td colspan="3">';
-        print ($act->priority?$act->priority:'');
-        print '</td></tr>';
-
-
-        print '</table><br><br><table class="border" width="100%">';
-
-		// Construit liste des fichiers
-		$filearray=dol_dir_list($upload_dir,"files",0,'','\.meta$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
-		$totalsize=0;
-		foreach($filearray as $key => $file)
+	}
+	print '</td>';
+	print '<td>'.$langs->trans("Contact").'</td>';
+	print '<td>';
+	if ($act->contact->id > 0)
+	{
+		print $act->contact->getNomUrl(1);
+		if ($act->contact->id && $act->type_code == 'AC_TEL')
 		{
-			$totalsize+=$file['size'];
+			if ($act->contact->fetch($act->contact->id))
+			{
+				print "<br>".dol_print_phone($act->contact->phone_pro);
+			}
 		}
-
-
-		print '<tr><td width="30%" nowrap>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-		print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
-		print '</table>';
-
-		print '</div>';
-
-
-		// Affiche formulaire upload
-	   	$formfile=new FormFile($db);
-		$formfile->form_attach_new_file(DOL_URL_ROOT.'/comm/action/document.php?id='.$act->id,'',0,0,($user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create),50,$act);
-
-
-		// List of document
-		$param='&id='.$act->id;
-		$formfile->list_of_documents($filearray,$act,'actions',$param,0,'',$user->rights->agenda->myactions->create);
 	}
 	else
 	{
-		dol_print_error($db);
+		print $langs->trans("None");
 	}
+
+	print '</td></tr>';
+
+	// Project
+	if (! empty($conf->projet->enabled))
+	{
+		print '<tr><td valign="top">'.$langs->trans("Project").'</td><td colspan="3">';
+		if ($act->fk_project)
+		{
+			$project=new Project($db);
+			$project->fetch($act->fk_project);
+			print $project->getNomUrl(1);
+		}
+		print '</td></tr>';
+	}
+
+	// Priority
+	print '<tr><td nowrap>'.$langs->trans("Priority").'</td><td colspan="3">';
+	print ($act->priority?$act->priority:'');
+	print '</td></tr>';
+
+
+	print '</table><br><br><table class="border" width="100%">';
+
+	// Construit liste des fichiers
+	$filearray=dol_dir_list($upload_dir,"files",0,'','\.meta$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+	$totalsize=0;
+	foreach($filearray as $key => $file)
+	{
+		$totalsize+=$file['size'];
+	}
+
+
+	print '<tr><td width="30%" nowrap>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+	print '</table>';
+
+	print '</div>';
+
+
+	// Affiche formulaire upload
+	$formfile=new FormFile($db);
+	$formfile->form_attach_new_file(DOL_URL_ROOT.'/comm/action/document.php?id='.$act->id,'',0,0,($user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create),50,$act);
+
+
+	// List of document
+	$param='&id='.$act->id;
+	$formfile->list_of_documents($filearray,$act,'actions',$param,0,'',$user->rights->agenda->myactions->create);
 }
 else
 {

From 29a8c10504369d925bc17b0814a28ef152c6ca49 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Mon, 22 Apr 2013 15:09:19 +0200
Subject: [PATCH 11/13] Fix: broken features

---
 htdocs/compta/sociales/class/chargesociales.class.php | 2 +-
 htdocs/compta/sociales/document.php                   | 4 ++--
 htdocs/core/class/fileupload.class.php                | 4 ++++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index 6fbd0a23143..f62b2fcc594 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
  */
 class ChargeSociales extends CommonObject
 {
-    public $element='rowid';
+    public $element='chargesociales';
     public $table='chargesociales';
     public $table_element='chargesociales';
 
diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php
index dcb082b41d7..452de21285a 100644
--- a/htdocs/compta/sociales/document.php
+++ b/htdocs/compta/sociales/document.php
@@ -79,7 +79,7 @@ if (GETPOST("sendit") && ! empty($conf->global->MAIN_UPLOAD_DOC))
 if ($action == 'delete')
 {
 	$file = $upload_dir . '/' . GETPOST("urlfile");	// Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
-	$ret=dol_delete_file($file);
+	$ret=dol_delete_file($file,0,0,0,$object);
 	if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
 	else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
 }
@@ -172,7 +172,7 @@ if ($object->id)
 
     // Affiche formulaire upload
    	$formfile=new FormFile($db);
-   	$formfile->form_attach_new_file(DOL_URL_ROOT.'/compta/sociales/document.php?id='.$object->id,'',0,0,$user->rights->tax->charges->creer);
+   	$formfile->form_attach_new_file(DOL_URL_ROOT.'/compta/sociales/document.php?id='.$object->id,'',0,0,$user->rights->tax->charges->creer,50,$object);
 
 
    	// List of document
diff --git a/htdocs/core/class/fileupload.class.php b/htdocs/core/class/fileupload.class.php
index a86073e6969..6bb5b9209d1 100644
--- a/htdocs/core/class/fileupload.class.php
+++ b/htdocs/core/class/fileupload.class.php
@@ -94,6 +94,10 @@ class FileUpload
 		elseif ($element == 'action') {
 			$pathname = 'comm/action'; $filename='actioncomm';
 			$dir_output=$conf->agenda->dir_output;
+		}
+		elseif ($element == 'chargesociales') {
+			$pathname = 'compta/sociales'; $filename='chargesociales';
+			$dir_output=$conf->tax->dir_output;
 		} else {
 			$dir_output=$conf->$element->dir_output;
 		}

From 28757c8d8888db695fedc32b62dcf69ec8e3a205 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Mon, 22 Apr 2013 15:26:14 +0200
Subject: [PATCH 12/13] Fix: missing commit

---
 htdocs/core/class/fileupload.class.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/core/class/fileupload.class.php b/htdocs/core/class/fileupload.class.php
index 6bb5b9209d1..910ad55e0a0 100644
--- a/htdocs/core/class/fileupload.class.php
+++ b/htdocs/core/class/fileupload.class.php
@@ -91,6 +91,9 @@ class FileUpload
 			$pathname = 'fourn'; $filename='fournisseur.facture';
 			$dir_output=$conf->fournisseur->facture->dir_output;
 		}
+		elseif ($element == 'product') {
+			$dir_output = $conf->product->multidir_output[$conf->entity];
+		}
 		elseif ($element == 'action') {
 			$pathname = 'comm/action'; $filename='actioncomm';
 			$dir_output=$conf->agenda->dir_output;

From de5a57a3c8c56823be209b806586b2349cc9919f Mon Sep 17 00:00:00 2001
From: simnandez <jmenent@2byte.es>
Date: Mon, 22 Apr 2013 16:23:59 +0200
Subject: [PATCH 13/13] Fix: Uniformize creation in orders

---
 htdocs/core/menus/standard/eldy.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index f4d7f3581db..ed73b895280 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -658,7 +658,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
             {
                 $langs->load("orders");
                 $newmenu->add("/commande/index.php?leftmenu=orders", $langs->trans("CustomersOrders"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders');
-                $newmenu->add("/societe/societe.php?leftmenu=orders", $langs->trans("NewOrder"), 1, $user->rights->commande->creer);
+                $newmenu->add("/commande/fiche.php?action=create", $langs->trans("NewOrder"), 1, $user->rights->commande->creer);
                 $newmenu->add("/commande/liste.php?leftmenu=orders", $langs->trans("List"), 1, $user->rights->commande->lire);
                 if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=0", $langs->trans("StatusOrderDraftShort"), 2, $user->rights->commande->lire);
                 if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=1", $langs->trans("StatusOrderValidated"), 2, $user->rights->commande->lire);