From b1a4b8e7d0aa8ff376e5dbfcf89260eb6e189d62 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Tue, 25 Nov 2014 21:20:13 +0100
Subject: [PATCH] Fix: [ bug #1624 ] POS set buy price for margin
Use lowest buying price for margin when selling with POS or external
module. A POS user does not worry about suppliers.
---
ChangeLog | 1 +
htdocs/comm/propal/class/propal.class.php | 20 +++++++++++++++++--
htdocs/commande/class/commande.class.php | 20 +++++++++++++++++--
htdocs/compta/facture/class/facture.class.php | 18 ++++++++++++++++-
4 files changed, 54 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 05f46019350..bae7da7ce64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,7 @@ English Dolibarr ChangeLog
- Fix: [ bug #1622 ] Requesting holiday than spans across two years cause high CPU usage by Apache
- Fix: [ bug #1595 ] Selected boolean extrafield in intervention creation page, does not save state
- Fix: Show sender Country on PDF docs when sender Country <> receiver Country
+- Fix: [ bug #1624 ] Use lowest buying price for margin when selling with POS
***** ChangeLog for 3.6.1 compared to 3.6.* *****
For users:
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 363776c7e6f..846bb5acb10 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -413,7 +413,15 @@ class Propal extends CommonObject
// infos marge
- $this->line->fk_fournprice = $fk_fournprice;
+ if (!empty($fk_product) && empty($fk_fournprice) && empty($pa_ht)) {
+ // by external module, take lowest buying price
+ include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+ $productFournisseur = new ProductFournisseur($this->db);
+ $productFournisseur->find_min_price_product_fournisseur($fk_product);
+ $this->line->fk_fournprice = $productFournisseur->product_fourn_price_id;
+ } else {
+ $this->line->fk_fournprice = $fk_fournprice;
+ }
$this->line->pa_ht = $pa_ht;
// Mise en option de la ligne
@@ -565,7 +573,15 @@ class Propal extends CommonObject
$this->line->skip_update_total = $skip_update_total;
// infos marge
- $this->line->fk_fournprice = $fk_fournprice;
+ if (!empty($fk_product) && empty($fk_fournprice) && empty($pa_ht)) {
+ // by external module, take lowest buying price
+ include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+ $productFournisseur = new ProductFournisseur($this->db);
+ $productFournisseur->find_min_price_product_fournisseur($fk_product);
+ $this->line->fk_fournprice = $productFournisseur->product_fourn_price_id;
+ } else {
+ $this->line->fk_fournprice = $fk_fournprice;
+ }
$this->line->pa_ht = $pa_ht;
$this->line->date_start=$date_start;
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 001a4972dd7..8501f04e8b8 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1214,7 +1214,15 @@ class Commande extends CommonOrder
$this->line->date_end=$date_end;
// infos marge
- $this->line->fk_fournprice = $fk_fournprice;
+ if (!empty($fk_product) && empty($fk_fournprice) && empty($pa_ht)) {
+ // by external module, take lowest buying price
+ include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+ $productFournisseur = new ProductFournisseur($this->db);
+ $productFournisseur->find_min_price_product_fournisseur($fk_product);
+ $this->line->fk_fournprice = $productFournisseur->product_fourn_price_id;
+ } else {
+ $this->line->fk_fournprice = $fk_fournprice;
+ }
$this->line->pa_ht = $pa_ht;
// TODO Ne plus utiliser
@@ -2421,7 +2429,15 @@ class Commande extends CommonOrder
$this->line->skip_update_total=$skip_update_total;
// infos marge
- $this->line->fk_fournprice = $fk_fournprice;
+ if (!empty($fk_product) && empty($fk_fournprice) && empty($pa_ht)) {
+ //by external module, take lowest buying price
+ include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+ $productFournisseur = new ProductFournisseur($this->db);
+ $productFournisseur->find_min_price_product_fournisseur($fk_product);
+ $this->line->fk_fournprice = $productFournisseur->product_fourn_price_id;
+ } else {
+ $this->line->fk_fournprice = $fk_fournprice;
+ }
$this->line->pa_ht = $pa_ht;
// TODO deprecated
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 6def5560deb..1df0696486c 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -2213,7 +2213,15 @@ class Facture extends CommonInvoice
$this->line->skip_update_total = $skip_update_total;
// infos marge
- $this->line->fk_fournprice = $fk_fournprice;
+ if (!empty($fk_product) && empty($fk_fournprice) && empty($pa_ht)) {
+ // POS or external module, take lowest buying price
+ include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+ $productFournisseur = new ProductFournisseur($this->db);
+ $productFournisseur->find_min_price_product_fournisseur($fk_product);
+ $this->line->fk_fournprice = $productFournisseur->product_fourn_price_id;
+ } else {
+ $this->line->fk_fournprice = $fk_fournprice;
+ }
$this->line->pa_ht = $pa_ht;
if (is_array($array_option) && count($array_option)>0) {
@@ -3477,6 +3485,14 @@ class FactureLigne extends CommonInvoiceLine
return -1;
}
}
+
+ // POS or by external module, take lowest buying price
+ if (!empty($this->fk_product) && empty($this->fk_fournprice) && empty($this->pa_ht)) {
+ include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+ $productFournisseur = new ProductFournisseur($this->db);
+ $productFournisseur->find_min_price_product_fournisseur($this->fk_product);
+ $this->fk_fournprice = $productFournisseur->product_fourn_price_id;
+ }
$this->db->begin();
--
GitLab