From f04af6c1b3a4e4b5014cd69ed72a7358b3d1f521 Mon Sep 17 00:00:00 2001 From: gauthier Date: Wed, 29 Nov 2017 11:06:33 +0100 Subject: [PATCH 1/3] FIX : test for filter fk_status --- htdocs/compta/facture/stats/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php index 4d9fdebeb64..6670ed763e1 100644 --- a/htdocs/compta/facture/stats/index.php +++ b/htdocs/compta/facture/stats/index.php @@ -84,7 +84,7 @@ dol_mkdir($dir); $stats = new FactureStats($db, $socid, $mode, ($userid>0?$userid:0)); if ($mode == 'customer') { - if ($object_status != '' && $object_status >= -1) $stats->where .= ' AND f.fk_statut IN ('.$object_status.')'; + if ($object_status != '' && $object_status >= 0) $stats->where .= ' AND f.fk_statut IN ('.$object_status.')'; } if ($mode == 'supplier') { From b7f26ea788c49724069d0c244f9ec91224aed1d7 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 30 Nov 2017 11:10:01 +0100 Subject: [PATCH 2/3] FIX add line bad price and ref --- htdocs/fourn/commande/card.php | 2 +- htdocs/product/class/product.class.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index 05bbc26e5fc..3af489e1ca5 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -390,7 +390,7 @@ if (empty($reshook)) $localtax1_tx, $localtax2_tx, $idprod, - $productsupplier->id, + $productsupplier->product_fourn_price_id , $productsupplier->fourn_ref, $remise_percent, 'HT', diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 2e2f3007540..07aaf32cbb3 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -1384,6 +1384,7 @@ class Product extends CommonObject $this->fourn_pu = $obj->price / $obj->quantity; // Unit price of product of supplier $this->fourn_price_base_type = 'HT'; // Price base type $this->ref_fourn = $obj->ref_fourn; // deprecated + $this->product_fourn_price_id = $obj->rowid; // supplier price id $this->ref_supplier = $obj->ref_fourn; // Ref supplier $this->vatrate_supplier = $obj->tva_tx; // Vat ref supplier $result=$obj->fk_product; @@ -1428,6 +1429,7 @@ class Product extends CommonObject $this->fourn_qty = $obj->quantity; // min quantity for price for a virtual supplier $this->fourn_pu = $obj->price / $obj->quantity; // Unit price of product for a virtual supplier $this->fourn_price_base_type = 'HT'; // Price base type for a virtual supplier + $this->product_fourn_price_id = $obj->rowid; // supplier price id $this->ref_fourn = $obj->ref_supplier; // deprecated $this->ref_supplier = $obj->ref_supplier; // Ref supplier $this->vatrate_supplier = $obj->tva_tx; // Vat ref supplier From b2effa7cc8c93b0495a6209a31bb9b967459fa49 Mon Sep 17 00:00:00 2001 From: Alexis ALGOUD Date: Thu, 30 Nov 2017 11:36:35 +0100 Subject: [PATCH 3/3] fix travis --- htdocs/fourn/commande/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index 3af489e1ca5..c241b2a2ffa 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -390,7 +390,7 @@ if (empty($reshook)) $localtax1_tx, $localtax2_tx, $idprod, - $productsupplier->product_fourn_price_id , + $productsupplier->product_fourn_price_id, $productsupplier->fourn_ref, $remise_percent, 'HT',