From 322ec32ff53a442a82838ce521429df74f2a1fb2 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Wed, 7 Aug 2019 20:16:53 +0200
Subject: [PATCH 1/2] FIX duration when creating service

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

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 847c6325b50..ca3cec982df 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1028,7 +1028,7 @@ else
         if ($type == 1)
         {
             print '<tr><td>'.$langs->trans("Duration").'</td><td colspan="3">';
-            print '<input name="surface" size="4" value="'.GETPOST('duration_value', 'int').'">';
+            print '<input name="duration_value" size="4" value="'.GETPOST('duration_value', 'int').'">';
             print $formproduct->selectMeasuringUnits("duration_unit", "time", GETPOST('duration_value', 'alpha'), 0, 1);
             print '</td></tr>';
         }

From 0b831ccdf73f7bd6bc8a5d1a59c270d4f0270fb1 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Fri, 9 Aug 2019 09:33:14 +0200
Subject: [PATCH 2/2] FIX better help message with multicompany

---
 htdocs/product/admin/product.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index 67bca85cfe0..fff393ffc2a 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -556,7 +556,14 @@ if (! empty($conf->fournisseur->enabled)) $rowspan++;
 
 
 print '<tr class="oddeven">';
-print '<td>'.$langs->trans("PricingRule").'</td>';
+if (empty($conf->multicompany->enabled))
+{
+	print '<td>'.$langs->trans("PricingRule").'</td>';
+}
+else
+{
+	print '<td>'.$form->textwithpicto($langs->trans("PricingRule"), $langs->trans("SamePriceAlsoForSharedCompanies"), 1).'</td>';
+}
 print '<td width="60" class="right">';
 $current_rule = 'PRODUCT_PRICE_UNIQ';
 if (!empty($conf->global->PRODUIT_MULTIPRICES)) $current_rule='PRODUIT_MULTIPRICES';
@@ -564,10 +571,6 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) $current_rule='PRODUI
 if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) $current_rule='PRODUIT_CUSTOMER_PRICES';
 if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) $current_rule='PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES';
 print $form->selectarray("princingrule", $select_pricing_rules, $current_rule);
-if ( empty($conf->multicompany->enabled))
-{
-    print $langs->trans("SamePriceAlsoForSharedCompanies");
-}
 print '</td><td rowspan="'.$rowspan.'" class="nohover right">';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 print '</td>';