';
+print '';
+print " | ".$langs->trans("RuleForStockAvailability")." | \n";
+print " | \n";
+print '
'."\n";
+
+if($conf->invoice->enabled) {
+ $var = !$var;
+ print "";
+ print '| '.$langs->trans("StockMustBeEnoughForInvoice").' | ';
+ print '';
+ print "';
+ print " | \n";
+ print "
\n";
+}
+
+if($conf->order->enabled) {
+ $var = !$var;
+ print "";
+ print '| '.$langs->trans("StockMustBeEnoughForOrder").' | ';
+ print '';
+ print "';
+ print " | \n";
+ print "
\n";
+}
+
+if($conf->expedition->enabled) {
+ $var = !$var;
+ print "";
+ print '| '.$langs->trans("StockMustBeEnoughForShipment").' | ';
+ print '';
+ print "';
+ print " | \n";
+ print "
\n";
+}
+print '
';
+
$virtualdiffersfromphysical=0;
if (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 814c58b92f3..7609d58afb2 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1038,7 +1038,7 @@ class Commande extends CommonOrder
*/
function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $info_bits=0, $fk_remise_except=0, $price_base_type='HT', $pu_ttc=0, $date_start='', $date_end='', $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=null, $pa_ht=0, $label='',$array_option=0)
{
- global $mysoc;
+ global $mysoc, $conf, $langs;
$commandeid=$this->id;
@@ -1103,6 +1103,20 @@ class Commande extends CommonOrder
$rangmax = $this->line_max($fk_parent_line);
$rangtouse = $rangmax + 1;
}
+
+ $product_type=$type;
+ if (!empty($fk_product))
+ {
+ $product=new Product($this->db);
+ $result=$product->fetch($fk_product);
+ $product_type=$product->type;
+
+ if($conf->global->STOCK_MUST_BE_ENOUGH_FOR_ORDER && $product_type == 0 && $product->stock_reel < $qty) {
+ $this->error=$langs->trans('ErrorStockIsNotEnough');
+ $this->db->rollback();
+ return -3;
+ }
+ }
// TODO A virer
// Anciens indicateurs: $price, $remise (a ne plus utiliser)
@@ -1127,6 +1141,7 @@ class Commande extends CommonOrder
$this->line->localtax1_type = $localtaxes_type[0];
$this->line->localtax2_type = $localtaxes_type[2];
$this->line->fk_product=$fk_product;
+ $this->line->product_type=$product_type;
$this->line->fk_remise_except=$fk_remise_except;
$this->line->remise_percent=$remise_percent;
$this->line->subprice=$pu_ht;
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 07470503ec2..81794f24c55 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -2003,7 +2003,7 @@ class Facture extends CommonInvoice
*/
function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits=0, $fk_remise_except='', $price_base_type='HT', $pu_ttc=0, $type= self::TYPE_STANDARD, $rang=-1, $special_code=0, $origin='', $origin_id=0, $fk_parent_line=0, $fk_fournprice=null, $pa_ht=0, $label='',$array_option=0)
{
- global $mysoc;
+ global $mysoc, $conf, $langs;
$facid=$this->id;
@@ -2070,11 +2070,17 @@ class Facture extends CommonInvoice
}
$product_type=$type;
- if ($fk_product)
+ if (!empty($fk_product))
{
$product=new Product($this->db);
$result=$product->fetch($fk_product);
$product_type=$product->type;
+
+ if($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;
+ }
}
// Insert line
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index c7d3843dd0f..1a59167a503 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -711,12 +711,33 @@ class Expedition extends CommonObject
*/
function addline($entrepot_id, $id, $qty)
{
+ global $conf, $langs;
+
$num = count($this->lines);
$line = new ExpeditionLigne($this->db);
$line->entrepot_id = $entrepot_id;
$line->origin_line_id = $id;
$line->qty = $qty;
+
+ if($conf->global->STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT) {
+ $orderline = new OrderLine($this->db);
+ $orderline->fetch($id);
+ $fk_product = $orderline->fk_product;
+
+ if (!empty($orderline->fk_product))
+ {
+ $product=new Product($this->db);
+ $result=$product->fetch($fk_product);
+ $product_type=$product->type;
+
+ if($product_type == 0 && $product->stock_reel < $qty) {
+ $this->error=$langs->trans('ErrorStockIsNotEnough');
+ $this->db->rollback();
+ return -3;
+ }
+ }
+ }
$this->lines[$num] = $line;
}
diff --git a/htdocs/langs/en_US/deliveries.lang b/htdocs/langs/en_US/deliveries.lang
index c440bea0163..fc4ff2436d4 100644
--- a/htdocs/langs/en_US/deliveries.lang
+++ b/htdocs/langs/en_US/deliveries.lang
@@ -22,4 +22,5 @@ ToAndDate=To___________________________________ on ____/_____/__________
GoodStatusDeclaration=Have received the goods above in good condition,
Deliverer=Deliverer :
Sender=Sender
-Recipient=Recipient
\ No newline at end of file
+Recipient=Recipient
+ErrorStockIsNotEnough=There's not enough stock
\ No newline at end of file