Fix fix as Eldy wish it

htdocs/admin/stock.php

@@ -62,8 +62,7 @@ if ($action == 'STOCK_CALCULATE_ON_BILL'
 // Mode of stock increase
 if ($action == 'STOCK_CALCULATE_ON_SUPPLIER_BILL'
 || $action == 'STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER'
-|| $action == 'STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER' 
+|| $action == 'STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER')
-|| $action == 'STOCK_CALCULATE_ON_DELETE_INVOICE')
 {
 	$db->begin();
 	$res=dolibarr_set_const($db, "STOCK_CALCULATE_ON_SUPPLIER_BILL", '','chaine',0,'',$conf->entity);
@@ -73,7 +72,6 @@ if ($action == 'STOCK_CALCULATE_ON_SUPPLIER_BILL'
 	if ($action == 'STOCK_CALCULATE_ON_SUPPLIER_BILL')           $res=dolibarr_set_const($db, "STOCK_CALCULATE_ON_SUPPLIER_BILL", GETPOST('STOCK_CALCULATE_ON_SUPPLIER_BILL','alpha'),'chaine',0,'',$conf->entity);
 	if ($action == 'STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER') $res=dolibarr_set_const($db, "STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER", GETPOST('STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER','alpha'),'chaine',0,'',$conf->entity);
 	if ($action == 'STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER') $res=dolibarr_set_const($db, "STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER", GETPOST('STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER','alpha'),'chaine',0,'',$conf->entity);
-	if ($action == 'STOCK_CALCULATE_ON_DELETE_INVOICE') $res=dolibarr_set_const($db, "STOCK_CALCULATE_ON_DELETE_INVOICE", GETPOST('STOCK_CALCULATE_ON_DELETE_INVOICE','alpha'),'chaine',0,'',$conf->entity);
 }
 
 if($action)

htdocs/compta/facture.php

@@ -159,15 +159,14 @@ else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->fact
 
 	$idwarehouse=GETPOST('idwarehouse');
 
-	//Check for warehouse
+	$qualified_for_stock_change=0;
-	if ($object->type != 3 && ! empty($conf->global->STOCK_CALCULATE_ON_DELETE_INVOICE) && $object->hasProductsOrServices(1) && $object->statut>=1)
+	if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
 	{
-		if (! $idwarehouse || $idwarehouse == -1)
+		$qualified_for_stock_change=$object->hasProductsOrServices(2);
-		{
-			$error++;
-			setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Warehouse")),'errors');
-			$action='';
 	}
+	else
+	{
+		$qualified_for_stock_change=$object->hasProductsOrServices(1);
 	}
 
 	$result = $object->delete(0,0,$idwarehouse);
@@ -403,8 +402,18 @@ else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->factu
 		}
 	}
 
+	$qualified_for_stock_change=0;
+	if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
+	{
+		$qualified_for_stock_change=$object->hasProductsOrServices(2);
+	}
+	else
+	{
+		$qualified_for_stock_change=$object->hasProductsOrServices(1);
+	}
+
 	//Check for warehouse
-    if ($object->type != 3 && ! empty($conf->global->STOCK_CALCULATE_ON_BILL) && $object->hasProductsOrServices(1))
+	if ($object->type != 3 && ! empty($conf->global->STOCK_CALCULATE_ON_BILL) && $qualified_for_stock_change)
 	{
 		if (! $idwarehouse || $idwarehouse == -1)
 		{
@@ -450,8 +459,18 @@ else if ($action == 'confirm_modif' && ((empty($conf->global->MAIN_USE_ADVANCED_
 	$object->fetch($id);
 	$object->fetch_thirdparty();
 
+	$qualified_for_stock_change=0;
+	if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
+	{
+		$qualified_for_stock_change=$object->hasProductsOrServices(2);
+	}
+	else
+	{
+		$qualified_for_stock_change=$object->hasProductsOrServices(1);
+	}
+
 	// Check parameters
-    if ($object->type != 3 && ! empty($conf->global->STOCK_CALCULATE_ON_BILL) && $object->hasProductsOrServices(1))
+	if ($object->type != 3 && ! empty($conf->global->STOCK_CALCULATE_ON_BILL) && $qualified_for_stock_change)
 	{
 		if (! $idwarehouse || $idwarehouse == -1)
 		{
@@ -823,11 +842,21 @@ else if ($action == 'add' && $user->rights->facture->creer)
 				}
 
 				// For compatibility
-                if ($element == 'order')    { $element = $subelement = 'commande'; }
+				if ($element == 'order')    {
-                if ($element == 'propal')   { $element = 'comm/propal'; $subelement = 'propal'; }
+					$element = $subelement = 'commande';
-                if ($element == 'contract') { $element = $subelement = 'contrat'; }
+				}
-                if ($element == 'inter')    { $element = $subelement = 'ficheinter'; }
+				if ($element == 'propal')   {
-                if ($element == 'shipping') { $element = $subelement = 'expedition'; }
+					$element = 'comm/propal'; $subelement = 'propal';
+				}
+				if ($element == 'contract') {
+					$element = $subelement = 'contrat';
+				}
+				if ($element == 'inter')    {
+					$element = $subelement = 'ficheinter';
+				}
+				if ($element == 'shipping') {
+					$element = $subelement = 'expedition';
+				}
 
 				$object->origin    = $_POST['origin'];
 				$object->origin_id = $_POST['originid'];
@@ -1579,7 +1608,9 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 					include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
 					$interface=new Interfaces($db);
 					$result=$interface->run_triggers('BILL_SENTBYMAIL',$object,$user,$langs,$conf);
-                        if ($result < 0) { $error++; $this->errors=$interface->errors; }
+					if ($result < 0) {
+						$error++; $this->errors=$interface->errors;
+					}
 					// Fin appel triggers
 
 					if ($error)
@@ -1825,10 +1856,18 @@ if ($action == 'create')
 			else
 			{
 				// For compatibility
-            if ($element == 'order' || $element == 'commande')    { $element = $subelement = 'commande'; }
+				if ($element == 'order' || $element == 'commande')    {
-            if ($element == 'propal')   { $element = 'comm/propal'; $subelement = 'propal'; }
+					$element = $subelement = 'commande';
-            if ($element == 'contract') { $element = $subelement = 'contrat'; }
+				}
-            if ($element == 'shipping') { $element = $subelement = 'expedition'; }
+				if ($element == 'propal')   {
+					$element = 'comm/propal'; $subelement = 'propal';
+				}
+				if ($element == 'contract') {
+					$element = $subelement = 'contrat';
+				}
+				if ($element == 'shipping') {
+					$element = $subelement = 'expedition';
+				}
 
 				dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
 
@@ -2350,7 +2389,18 @@ else if ($id > 0 || ! empty($ref))
 			{
 				$text=$langs->trans('ConfirmDeleteBill',$object->ref);
 				$formquestion=array();
-            if ($object->type != 3 && ! empty($conf->global->STOCK_CALCULATE_ON_DELETE_INVOICE) && $object->hasProductsOrServices(1) &&  $object->statut>=1)
+				
+				$qualified_for_stock_change=0;
+				if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
+				{
+					$qualified_for_stock_change=$object->hasProductsOrServices(2);
+				}
+				else
+				{
+					$qualified_for_stock_change=$object->hasProductsOrServices(1);
+				}
+				
+				if ($object->type != 3 && ! empty($conf->global->STOCK_CALCULATE_ON_BILL) && $qualified_for_stock_change && $object->statut>=1)
 				{
 					$langs->load("stocks");
 					require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
@@ -2360,7 +2410,7 @@ else if ($id > 0 || ! empty($ref))
 					//'text' => $langs->trans("ConfirmClone"),
 					//array('type' => 'checkbox', 'name' => 'clone_content',   'label' => $langs->trans("CloneMainAttributes"),   'value' => 1),
 					//array('type' => 'checkbox', 'name' => 'update_prices',   'label' => $langs->trans("PuttingPricesUpToDate"),   'value' => 1),
-            	array('type' => 'other', 'name' => 'idwarehouse',   'label' => $label,   'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse'),'idwarehouse','',1)));
+					array('type' => 'other', 'name' => 'idwarehouse',   'label' => $label,   'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse'),'idwarehouse','',1,0,0,$langs->trans("NoStockAction"))));
 					$formconfirm=$form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$object->id,$langs->trans('DeleteBill'),$text,'confirm_delete',$formquestion,"yes",1);
 				}else {
 					$formconfirm=$form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$object->id,$langs->trans('DeleteBill'),$text,'confirm_delete','','',1);
@@ -2398,7 +2448,17 @@ else if ($id > 0 || ! empty($ref))
 				}
 				$formquestion=array();
 
-            if ($object->type != 3 && ! empty($conf->global->STOCK_CALCULATE_ON_BILL) && $object->hasProductsOrServices(1))
+				$qualified_for_stock_change=0;
+				if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
+				{
+					$qualified_for_stock_change=$object->hasProductsOrServices(2);
+				}
+				else
+				{
+					$qualified_for_stock_change=$object->hasProductsOrServices(1);
+				}
+
+				if ($object->type != 3 && ! empty($conf->global->STOCK_CALCULATE_ON_BILL) && $qualified_for_stock_change)
 				{
 					$langs->load("stocks");
 					require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
@@ -2422,7 +2482,17 @@ else if ($id > 0 || ! empty($ref))
 			{
 				$text=$langs->trans('ConfirmUnvalidateBill',$object->ref);
 				$formquestion=array();
-            if ($object->type != 3 && ! empty($conf->global->STOCK_CALCULATE_ON_BILL) && $object->hasProductsOrServices(1))
+
+				$qualified_for_stock_change=0;
+				if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
+				{
+					$qualified_for_stock_change=$object->hasProductsOrServices(2);
+				}
+				else
+				{
+					$qualified_for_stock_change=$object->hasProductsOrServices(1);
+				}
+				if ($object->type != 3 && ! empty($conf->global->STOCK_CALCULATE_ON_BILL) && $qualified_for_stock_change)
 				{
 					$langs->load("stocks");
 					require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';

htdocs/compta/facture/class/facture.class.php

@@ -1298,7 +1298,7 @@ class Facture extends CommonInvoice
 			}
 
 			// If we decrament stock on invoice validation, we increment
-			if ($this->type != 3 && $result >= 0 && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_DELETE_INVOICE))
+			if ($this->type != 3 && $result >= 0 && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_BILL) && $idwarehouse!=-1)
 			{
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 				$langs->load("agenda");

htdocs/core/class/commonobject.class.php

@@ -2310,7 +2310,7 @@ abstract class CommonObject
     /**
      *  Function to say how many lines object contains
      *
-     *	@param	int		$predefined		-1=All, 0=Count free product/service only, 1=Count predefined product/service only
+     *	@param	int		$predefined		-1=All, 0=Count free product/service only, 1=Count predefined product/service only, 2=Count predefined product, 3=Count predefined service
      *  @return	int						<0 if KO, 0 if no predefined products, nb of lines with predefined products if found
      */
     function hasProductsOrServices($predefined=-1)
@@ -2323,6 +2323,8 @@ abstract class CommonObject
             if ($predefined == -1) $qualified=1;
             if ($predefined == 1 && $val->fk_product > 0) $qualified=1;
             if ($predefined == 0 && $val->fk_product <= 0) $qualified=1;
+            if ($predefined == 2 && $val->fk_product > 0 && $val->product_type==0) $qualified=1;
+            if ($predefined == 3 && $val->fk_product > 0 && $val->product_type==1) $qualified=1;
             if ($qualified) $nb++;
         }
         dol_syslog(get_class($this).'::hasProductsOrServices we found '.$nb.' qualified lines of products/servcies');

htdocs/langs/en_US/stocks.lang

@@ -87,4 +87,5 @@ PersonalStock=Personal stock %s
 ThisWarehouseIsPersonalStock=This warehouse represents personal stock of %s %s
 SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
 SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
+NoStockAction=No stock action
 LastWaitingSupplierOrders=Orders waiting for receptions

htdocs/langs/es_ES/stocks.lang

@@ -86,4 +86,5 @@ PersonalStock=Stock personal %s
 ThisWarehouseIsPersonalStock=Este almacén representa el stock personal de %s %s
 SelectWarehouseForStockDecrease=Seleccione el almacén a usar en el decremento de stock
 SelectWarehouseForStockIncrease=Seleccione el almacén a usar en el incremento de stock
+NoStockAction=Sin acciones sobre el stock
 LastWaitingSupplierOrders=Pedidos en espera de recepción

htdocs/langs/fr_FR/stocks.lang

@@ -87,4 +87,5 @@ PersonalStock=Stock personnel %s
 ThisWarehouseIsPersonalStock=Cet entrepôt représente le stock personnel de %s %s 
 SelectWarehouseForStockDecrease=Sélectionner l'entrepôt à utiliser pour la décrémentation du stock
 SelectWarehouseForStockIncrease=Sélectionner l'entrepôt à utiliser pour l'incrémentation du stock
+NoStockAction=Pas d'action sur l'entrepot
 LastWaitingSupplierOrders=Commandes en attente de réception

htdocs/product/class/html.formproduct.class.php

@@ -109,9 +109,10 @@ class FormProduct
 	 *  @param  int		$empty			1=Can be empty, 0 if not
 	 * 	@param	int		$disabled		1=Select is disabled
 	 * 	@param	int		$fk_product		Add quantity of stock in label for product with id fk_product. Nothing if 0.
+	 *  @param	string	$empty_label	Empty label if needed (only if $empty=1) 
 	 * 	@return	string					HTML select
 	 */
-	function selectWarehouses($selected='',$htmlname='idwarehouse',$filtertype='',$empty=0,$disabled=0,$fk_product=0)
+	function selectWarehouses($selected='',$htmlname='idwarehouse',$filtertype='',$empty=0,$disabled=0,$fk_product=0,$empty_label='')
 	{
 		global $langs,$user;
 
@@ -120,7 +121,7 @@ class FormProduct
 		$this->loadWarehouses($fk_product);
 
 		$out='<select class="flat"'.($disabled?' disabled="disabled"':'').' id="'.$htmlname.'" name="'.($htmlname.($disabled?'_disabled':'')).'">';
-		if ($empty) $out.='<option value="-1">&nbsp;</option>';
+		if ($empty) $out.='<option value="-1">'.($empty_label?$empty_label:'&nbsp;').'</option>';
 		foreach($this->cache_warehouses as $id => $arraytypes)
 		{
 			$out.='<option value="'.$id.'"';