From 9fa37fc5f156d0e0c8713ca7aed6f26261b89bdb Mon Sep 17 00:00:00 2001 From: Christophe Battarel Date: Sun, 8 Sep 2013 21:51:08 +0200 Subject: [PATCH] Fix: Edit propal line was losing product supplier price id Conflicts: ChangeLog --- ChangeLog | 1 + htdocs/comm/propal/class/propal.class.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index efdc41b902a..27494cab5fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ Fix: Mailing module : if an email is already in destinaires list all other email Fix: Localtaxes balance not showing Fix: Intervention box links to contracts id Fix: Compatiblity with multicompany module +Fix: Edit propal line was losing product supplier price id ***** ChangeLog for 3.4 compared to 3.3.* ***** For users: diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index db8dd255b6c..b6964b1981d 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -2924,7 +2924,7 @@ class PropaleLigne if (empty($this->info_bits)) $this->info_bits=0; if (empty($this->special_code)) $this->special_code=0; if (empty($this->fk_parent_line)) $this->fk_parent_line=0; - if (empty($this->fk_parent_line)) $this->fk_fournprice=0; + if (empty($this->fk_fournprice)) $this->fk_fournprice=0; if (empty($this->pa_ht)) $this->pa_ht=0;