From 03c60f1b7db0698e3983e58889cd37dcb78f1bcc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 1 Oct 2016 13:55:07 +0200
Subject: [PATCH] FIX #5802 Incoterms not set
---
htdocs/comm/propal/class/propal.class.php | 6 +++++-
htdocs/commande/card.php | 9 ++++++++-
htdocs/compta/facture.php | 9 ++++++++-
3 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index aaa8bf123cd..fa2d214f5da 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -3224,7 +3224,11 @@ class PropaleLigne extends CommonObjectLine
if (empty($this->fk_fournprice)) $this->fk_fournprice=0;
if (! is_numeric($this->qty)) $this->qty = 0;
if (empty($this->pa_ht)) $this->pa_ht=0;
-
+ if (empty($this->multicurrency_subprice)) $this->multicurrency_subprice=0;
+ if (empty($this->multicurrency_total_ht)) $this->multicurrency_total_ht=0;
+ if (empty($this->multicurrency_total_vat)) $this->multicurrency_total_vat=0;
+ if (empty($this->multicurrency_total_ttc)) $this->multicurrency_total_ttc=0;
+
// if buy price not defined, define buyprice as configured in margin admin
if ($this->pa_ht == 0 && $pa_ht_isemptystring)
{
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 1fcab20500f..dd9a45eae3d 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1595,7 +1595,14 @@ if ($action == 'create' && $user->rights->commande->creer)
print '<tr>';
print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), $objectsrc->libelle_incoterms, 1).'</label></td>';
print '<td colspan="3" class="maxwidthonsmartphone">';
- print $form->select_incoterms((!empty($objectsrc->fk_incoterms) ? $objectsrc->fk_incoterms : ''), (!empty($objectsrc->location_incoterms)?$objectsrc->location_incoterms:''));
+ $incoterm_id = GETPOST('incoterm_id');
+ $incoterm_location = GETPOST('location_incoterms');
+ if (empty($incoterm_id))
+ {
+ $incoterm_id = (!empty($objectsrc->fk_incoterms) ? $objectsrc->fk_incoterms : $soc->fk_incoterms);
+ $incoterm_location = (!empty($objectsrc->location_incoterms) ? $objectsrc->location_incoterms : $soc->location_incoterms);
+ }
+ print $form->select_incoterms($incoterm_id, $incoterm_location);
print '</td></tr>';
}
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index a19262144eb..abce93d9d90 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -2441,7 +2441,14 @@ if ($action == 'create')
print '<tr>';
print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), $objectsrc->libelle_incoterms, 1).'</label></td>';
print '<td colspan="2" class="maxwidthonsmartphone">';
- print $form->select_incoterms((!empty($objectsrc->fk_incoterms) ? $objectsrc->fk_incoterms : ''), (!empty($objectsrc->location_incoterms)?$objectsrc->location_incoterms:''));
+ $incoterm_id = GETPOST('incoterm_id');
+ $incoterm_location = GETPOST('location_incoterms');
+ if (empty($incoterm_id))
+ {
+ $incoterm_id = (!empty($objectsrc->fk_incoterms) ? $objectsrc->fk_incoterms : $soc->fk_incoterms);
+ $incoterm_location = (!empty($objectsrc->location_incoterms) ? $objectsrc->location_incoterms : $soc->location_incoterms);
+ }
+ print $form->select_incoterms($incoterm_id, $incoterm_location);
print '</td></tr>';
}
--
GitLab