From deb91ad7c17490934c988b36823a21ba03354733 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 15 Mar 2017 13:30:30 +0100
Subject: [PATCH] FIX Data lost during merge of thirdparties

---
 htdocs/langs/en_US/companies.lang             |  2 +-
 htdocs/societe/soc.php                        | 43 +++++++++++++++++--
 .../class/supplier_proposal.class.php         | 18 ++++++++
 3 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 166633ef2ae..355f9f3f31c 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -397,7 +397,7 @@ LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
-ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
+ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the thirdparty will be deleted.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 3da099390ac..b5bda51b4ba 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -123,15 +123,14 @@ if (empty($reshook))
 		$soc_origin_id = GETPOST('soc_origin', 'int');
 		$soc_origin = new Societe($db);
 
-		if ($soc_origin_id < 1)
+		if ($soc_origin_id <= 0)
 		{
 			$langs->load('errors');
 			$langs->load('companies');
-			setEventMessages($langs->trans('ErrorProdIdIsMandatory', $langs->trans('MergeOriginThirdparty')), null, 'errors');
+			setEventMessages($langs->trans('ErrorThirdPartyIdIsMandatory', $langs->trans('MergeOriginThirdparty')), null, 'errors');
 		}
 		else
 		{
-
 			if (!$errors && $soc_origin->fetch($soc_origin_id) < 1)
 			{
 				setEventMessages($langs->trans('ErrorRecordNotFound'), null, 'errors');
@@ -140,8 +139,44 @@ if (empty($reshook))
 
 			if (!$errors)
 			{
+			    // TODO Move the merge function into class of object.
+			    
 				$db->begin();
 
+				// Recopy some data
+				$object->client = $object->client | $soc_origin->client;
+				$object->fournisseur = $object->fournisseur | $soc_origin->fournisseur;
+				$listofproperties=array(
+				    'address', 'zip', 'town', 'state_id', 'country_id', 'phone', 'phone_pro', 'fax', 'email', 'skype', 'url', 'barcode', 'idprof1', 'idprof2', 'idprof3', 'idprof4', 'idprof5', 'idprof6',
+				    'tva_intra', 'effectif_id', 'forme_juridique', 'remise_percent', 'mode_reglement_supplier_id', 'cond_reglement_supplier_id', 'name_bis',
+				    'stcomm_id', 'outstanding_limit', 'price_level', 'parent', 'default_lang', 'ref', 'ref_ext', 'import_key', 'fk_incoterms', 'fk_multicurrency',
+				    'code_client', 'code_fournisseur', 'code_compta', 'code_compta_fournisseur',
+				    'model_pdf', 'fk_projet'
+				);
+				foreach ($listofproperties as $property)
+				{
+				    if (empty($object->$property)) $object->$property = $soc_origin->$property;
+				}
+				
+				// Concat some data
+				$listofproperties=array(
+				    'note_public', 'note_private' 
+				);
+				foreach ($listofproperties as $property)
+				{
+				    $object->$property = dol_concatdesc($object->$property, $soc_origin->$property);
+				}
+				
+				// Merge extrafields
+				foreach ($soc_origin->array_options as $key => $val)
+				{
+				    if (empty($object->array_options[$key])) $object->array_options[$key] = $val;
+				}
+
+				// TODO Merge categories
+				$object->update($object->id, $user);
+				
+				// Move links 
 				$objects = array(
 					'Adherent' => '/adherents/class/adherent.class.php',
 					'Societe' => '/societe/class/societe.class.php',
@@ -159,6 +194,7 @@ if (empty($reshook))
 					'Fichinter' => '/fichinter/class/fichinter.class.php',
 					'CommandeFournisseur' => '/fourn/class/fournisseur.commande.class.php',
 					'FactureFournisseur' => '/fourn/class/fournisseur.facture.class.php',
+					'SupplierProposal' => '/supplier_proposal/class/supplier_proposal.class.php',
 					'ProductFournisseur' => '/fourn/class/fournisseur.product.class.php',
 					'Livraison' => '/livraison/class/livraison.class.php',
 					'Product' => '/product/class/product.class.php',
@@ -451,6 +487,7 @@ if (empty($reshook))
                 if (empty($object->fournisseur)) $object->code_fournisseur='';
 
                 $result = $object->create($user);
+                
 				if ($result >= 0)
                 {
                     if ($object->particulier)
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 53e7bf8ad34..d666f421cdb 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -2532,6 +2532,24 @@ class SupplierProposal extends CommonObject
 		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
 	}
 
+	
+	/**
+	 * Function used to replace a thirdparty id with another one.
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param int $origin_id Old thirdparty id
+	 * @param int $dest_id New thirdparty id
+	 * @return bool
+	 */
+	public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
+	{
+	    $tables = array(
+	        'supplier_proposal'
+	    );
+	
+	    return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
+	}
+	
 }