From acc9879c7c9b19a5b0932ce2395dfb56fff78e6a Mon Sep 17 00:00:00 2001
From: fmarcet <fmarcet@2byte.es>
Date: Mon, 1 Feb 2016 13:05:14 +0100
Subject: [PATCH] FIX: It doesn't check if there is enough stock to update the
lines of orders/invoices
---
htdocs/commande/class/commande.class.php | 23 ++++++++++++++++++-
htdocs/compta/facture/class/facture.class.php | 14 +++++++++++
2 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 5d2907041b2..d807d67cb1e 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -8,6 +8,7 @@
* Copyright (C) 2012-2014 Christophe Battarel <christophe.battarel@altairis.fr>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2014 Marcos García <marcosgdf@gmail.com>
+ * Copyright (C) 2016 Ferran Marcet <fmarcet@2byte.es>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -2372,7 +2373,7 @@ class Commande extends CommonOrder
*/
function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0.0,$txlocaltax2=0.0, $price_base_type='HT', $info_bits=0, $date_start='', $date_end='', $type=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0, $label='', $special_code=0, $array_option=0)
{
- global $conf, $mysoc;
+ global $conf, $mysoc, $langs;
dol_syslog(get_class($this)."::updateline id=$rowid, desc=$desc, pu=$pu, qty=$qty, remise_percent=$remise_percent, txtva=$txtva, txlocaltax1=$txlocaltax1, txlocaltax2=$txlocaltax2, price_base_type=$price_base_type, info_bits=$info_bits, date_start=$date_start, date_end=$date_end, type=$type, fk_parent_line=$fk_parent_line, pa_ht=$pa_ht, special_code=$special_code");
include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
@@ -2426,6 +2427,26 @@ class Commande extends CommonOrder
$line = new OrderLine($this->db);
$line->fetch($rowid);
+ if (!empty($line->fk_product))
+ {
+ $product=new Product($this->db);
+ $result=$product->fetch($line->fk_product);
+ $product_type=$product->type;
+
+ if (! empty($conf->global->STOCK_MUST_BE_ENOUGH_FOR_ORDER) && $product_type == 0 && $product->stock_reel < $qty)
+ {
+ $this->error=$langs->trans('ErrorStockIsNotEnough');
+ dol_syslog(get_class($this)."::addline error=Product ".$product->ref.": ".$this->error, LOG_ERR);
+ $this->db->rollback();
+ unset($_POST['productid']);
+ unset($_POST['tva_tx']);
+ unset($_POST['price_ht']);
+ unset($_POST['qty']);
+ unset($_POST['buying_price']);
+ return self::STOCK_NOT_ENOUGH_FOR_ORDER;
+ }
+ }
+
$staticline = clone $line;
$line->oldline = $staticline;
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index b1ec15f7536..705a52074c9 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -12,6 +12,7 @@
* Copyright (C) 2012-2014 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2013 Cedric Gross <c.gross@kreiz-it.fr>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
+ * Copyright (C) 2016 Ferran Marcet <fmarcet@2byte.es>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -2199,6 +2200,19 @@ class Facture extends CommonInvoice
$line = new FactureLigne($this->db);
$line->fetch($rowid);
+ if (!empty($line->fk_product))
+ {
+ $product=new Product($this->db);
+ $result=$product->fetch($line->fk_product);
+ $product_type=$product->type;
+
+ if (! empty($conf->global->STOCK_MUST_BE_ENOUGH_FOR_INVOICE) && $product_type == 0 && $product->stock_reel < $qty) {
+ $this->error=$langs->trans('ErrorStockIsNotEnough');
+ $this->db->rollback();
+ return -3;
+ }
+ }
+
$staticline = clone $line;
$line->oldline = $staticline;
--
GitLab