From f52ae35dc6eeb9b5cd56271d4a3443ec6d10de8d Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe.battarel@altairis.fr>
Date: Fri, 6 Nov 2015 16:14:00 +0100
Subject: [PATCH 1/2] NEW FEATURE PROPOSAL: on propale, order or invoice
 creation from scratch, reload page after customer selection so its
 informations can be loaded

---
 htdocs/comm/propal.php    | 13 ++++++++++++-
 htdocs/commande/card.php  | 15 +++++++++++++--
 htdocs/compta/facture.php | 11 +++++++++++
 3 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 08d4e31ec6b..5b60e0ec273 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -1276,7 +1276,7 @@ if ($action == 'create')
 
 	// Ref customer
 	print '<tr><td>' . $langs->trans('RefCustomer') . '</td><td colspan="2">';
-	print '<input type="text" name="ref_client" value=""></td>';
+	print '<input type="text" name="ref_client" value="'.GETPOST('ref_client').'"></td>';
 	print '</tr>';
 
 	// Third party
@@ -1290,6 +1290,17 @@ if ($action == 'create')
 	} else {
 		print '<td colspan="2">';
 		print $form->select_company('', 'socid', '(s.client = 1 OR s.client = 2 OR s.client = 3) AND status=1', 1);
+		// reload page to retrieve customer informations
+		print '<script type="text/javascript">
+		$(document).ready(function() {';
+		print '
+			$("#socid").change(function() {
+				var socid = $(this).val();
+				// reload page
+				window.location.href = "'.$_SERVER["PHP_SELF"].'?action=create&socid="+socid+"&ref_client="+$("input[name=ref_client]").val();
+			});
+		});
+		</script>';
 		print '</td>';
 	}
 	print '</tr>' . "\n";
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 4d7456af1fd..bbc255e0227 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1338,10 +1338,10 @@ if ($action == 'create' && $user->rights->commande->creer)
 
 	// Reference client
 	print '<tr><td>' . $langs->trans('RefCustomer') . '</td><td colspan="2">';
-	if (!empty($conf->global->MAIN_USE_PROPAL_REFCLIENT_FOR_ORDER))
+	if (!empty($conf->global->MAIN_USE_PROPAL_REFCLIENT_FOR_ORDER) && ! empty($origin) && ! empty($originid))
 		print '<input type="text" name="ref_client" value="'.$ref_client.'"></td>';
 	else
-		print '<input type="text" name="ref_client" value=""></td>';
+		print '<input type="text" name="ref_client" value="'.GETPOST('ref_client').'"></td>';
 	print '</tr>';
 
 	// Client
@@ -1355,6 +1355,17 @@ if ($action == 'create' && $user->rights->commande->creer)
 	} else {
 		print '<td colspan="2">';
 		print $form->select_company('', 'socid', 's.client = 1 OR s.client = 3', 1);
+		// reload page to retrieve customer informations
+		print '<script type="text/javascript">
+		$(document).ready(function() {';
+		print '
+			$("#socid").change(function() {
+				var socid = $(this).val();
+				// reload page
+				window.location.href = "'.$_SERVER["PHP_SELF"].'?action=create&socid="+socid+"&ref_client="+$("input[name=ref_client]").val();
+			});
+		});
+		</script>';
 		print '</td>';
 	}
 	print '</tr>' . "\n";
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 983331bd412..fd9f730fe09 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1959,6 +1959,17 @@ if ($action == 'create')
 	{
 		print '<td colspan="2">';
 		print $form->select_company('', 'socid', 's.client = 1 OR s.client = 3', 1);
+		// reload page to retrieve customer informations
+		print '<script type="text/javascript">
+		$(document).ready(function() {';
+		print '
+			$("#socid").change(function() {
+				var socid = $(this).val();
+				// reload page
+				window.location.href = "'.$_SERVER["PHP_SELF"].'?action=create&socid="+socid;
+			});
+		});
+		</script>';
 		print '</td>';
 	}
 	print '</tr>' . "\n";

From 0c40a6dda5b9411acc9d6a0bc2b431cd859b7bd5 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe.battarel@altairis.fr>
Date: Wed, 11 Nov 2015 15:32:42 +0100
Subject: [PATCH 2/2] add hidden constant

---
 htdocs/comm/propal.php    | 20 +++++++++++---------
 htdocs/commande/card.php  | 20 +++++++++++---------
 htdocs/compta/facture.php | 20 +++++++++++---------
 3 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 5b60e0ec273..625739b7128 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -1291,16 +1291,18 @@ if ($action == 'create')
 		print '<td colspan="2">';
 		print $form->select_company('', 'socid', '(s.client = 1 OR s.client = 2 OR s.client = 3) AND status=1', 1);
 		// reload page to retrieve customer informations
-		print '<script type="text/javascript">
-		$(document).ready(function() {';
-		print '
-			$("#socid").change(function() {
-				var socid = $(this).val();
-				// reload page
-				window.location.href = "'.$_SERVER["PHP_SELF"].'?action=create&socid="+socid+"&ref_client="+$("input[name=ref_client]").val();
+		if (!empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE))
+		{
+			print '<script type="text/javascript">
+			$(document).ready(function() {
+				$("#socid").change(function() {
+					var socid = $(this).val();
+					// reload page
+					window.location.href = "'.$_SERVER["PHP_SELF"].'?action=create&socid="+socid+"&ref_client="+$("input[name=ref_client]").val();
+				});
 			});
-		});
-		</script>';
+			</script>';
+		}
 		print '</td>';
 	}
 	print '</tr>' . "\n";
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index bbc255e0227..508c26f24ed 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1356,16 +1356,18 @@ if ($action == 'create' && $user->rights->commande->creer)
 		print '<td colspan="2">';
 		print $form->select_company('', 'socid', 's.client = 1 OR s.client = 3', 1);
 		// reload page to retrieve customer informations
-		print '<script type="text/javascript">
-		$(document).ready(function() {';
-		print '
-			$("#socid").change(function() {
-				var socid = $(this).val();
-				// reload page
-				window.location.href = "'.$_SERVER["PHP_SELF"].'?action=create&socid="+socid+"&ref_client="+$("input[name=ref_client]").val();
+		if (!empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE))
+		{
+			print '<script type="text/javascript">
+			$(document).ready(function() { 
+				$("#socid").change(function() {
+					var socid = $(this).val();
+					// reload page
+					window.location.href = "'.$_SERVER["PHP_SELF"].'?action=create&socid="+socid+"&ref_client="+$("input[name=ref_client]").val();
+				});
 			});
-		});
-		</script>';
+			</script>';
+		}
 		print '</td>';
 	}
 	print '</tr>' . "\n";
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index fd9f730fe09..ea309b83a26 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1960,16 +1960,18 @@ if ($action == 'create')
 		print '<td colspan="2">';
 		print $form->select_company('', 'socid', 's.client = 1 OR s.client = 3', 1);
 		// reload page to retrieve customer informations
-		print '<script type="text/javascript">
-		$(document).ready(function() {';
-		print '
-			$("#socid").change(function() {
-				var socid = $(this).val();
-				// reload page
-				window.location.href = "'.$_SERVER["PHP_SELF"].'?action=create&socid="+socid;
+		if (!empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE))
+		{
+			print '<script type="text/javascript">
+			$(document).ready(function() {
+				$("#socid").change(function() {
+					var socid = $(this).val();
+					// reload page
+					window.location.href = "'.$_SERVER["PHP_SELF"].'?action=create&socid="+socid;
+				});
 			});
-		});
-		</script>';
+			</script>';
+		}
 		print '</td>';
 	}
 	print '</tr>' . "\n";