From b2ec60d53b00340b36d3c1c13e579fb08a420502 Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Wed, 26 Jun 2019 14:08:51 +0200 Subject: [PATCH 1/4] Fix qty to negative if refund --- htdocs/societe/consumption.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php index afd3a51ec8e..e43bb759e72 100644 --- a/htdocs/societe/consumption.php +++ b/htdocs/societe/consumption.php @@ -595,7 +595,7 @@ if ($sql_select) print ''; //print ''.$prodreftxt.''; - + if ($type_element == 'invoice' && $objp->doc_type == '2') $objp->prod_qty=-($objp->prod_qty); print ''.$objp->prod_qty.''; $total_qty+=$objp->prod_qty; From 55bd67058bebb5a080f632daea36a4f1166e8a15 Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Wed, 26 Jun 2019 14:10:52 +0200 Subject: [PATCH 2/4] Update facture.php --- htdocs/product/stats/facture.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php index d60c4d835a5..f8aa4fa7ac0 100644 --- a/htdocs/product/stats/facture.php +++ b/htdocs/product/stats/facture.php @@ -234,7 +234,8 @@ if ($id > 0 || ! empty($ref)) while ($i < min($num, $limit)) { $objp = $db->fetch_object($result); - + + if ($objp->type == '2') $objp->qty=-($objp->qty); $total_ht+=$objp->total_ht; $total_qty+=$objp->qty; From 1b33952028e796864c77edccaaa99790384419a4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 28 Jun 2019 12:37:22 +0200 Subject: [PATCH 3/4] Update facture.php --- htdocs/product/stats/facture.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php index f8aa4fa7ac0..00f9c84338e 100644 --- a/htdocs/product/stats/facture.php +++ b/htdocs/product/stats/facture.php @@ -235,7 +235,7 @@ if ($id > 0 || ! empty($ref)) { $objp = $db->fetch_object($result); - if ($objp->type == '2') $objp->qty=-($objp->qty); + if ($objp->type == Facture::TYPE_CREDIT_NOTE) $objp->qty=-($objp->qty); $total_ht+=$objp->total_ht; $total_qty+=$objp->qty; From 0725ce0e3f4f7b656701c90ebbdf1d6b9e21c4b2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 28 Jun 2019 12:37:44 +0200 Subject: [PATCH 4/4] Update consumption.php --- htdocs/societe/consumption.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php index e43bb759e72..1c5c4b82a5d 100644 --- a/htdocs/societe/consumption.php +++ b/htdocs/societe/consumption.php @@ -595,7 +595,7 @@ if ($sql_select) print ''; //print ''.$prodreftxt.''; - if ($type_element == 'invoice' && $objp->doc_type == '2') $objp->prod_qty=-($objp->prod_qty); + if ($type_element == 'invoice' && $objp->doc_type == Facture::TYPE_CREDIT_NOTE) $objp->prod_qty=-($objp->prod_qty); print ''.$objp->prod_qty.''; $total_qty+=$objp->prod_qty;