lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.7' into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2015-01-31 00:09:37 +01:00
commit 29d399ba79
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/commande/card.php
View File

@ -932,6 +932,10 @@ if (empty($reshook))
$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
}
}
else
{
setEventMessages($object->error, $object->errors, 'errors');
}
}
}

6
htdocs/compta/facture.php
View File

@ -2538,7 +2538,8 @@ if ($action == 'create')
}
// Confirmation de la validation
if ($action == 'valid') {
if ($action == 'valid')
{
// on verifie si l'objet est en numerotation provisoire
$objectref = substr($object->ref, 1, 4);
if ($objectref == 'PROV') {
@ -2569,7 +2570,8 @@ if ($action == 'create')
$qualified_for_stock_change = $object->hasProductsOrServices(1);
}
if ($object->type != Facture::TYPE_DEPOSIT && ! empty($conf->global->STOCK_CALCULATE_ON_BILL) && $qualified_for_stock_change) {
if ($object->type != Facture::TYPE_DEPOSIT && ! 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';
require_once DOL_DOCUMENT_ROOT . '/product/stock/class/entrepot.class.php';

2
htdocs/fourn/class/fournisseur.facture.class.php
View File

@ -947,7 +947,7 @@ class FactureFournisseur extends CommonInvoice
}
// Triggers call
if (! $error && $notrigger)
if (! $error && empty($notrigger))
{
// Call trigger
$result=$this->call_trigger('BILL_SUPPLIER_VALIDATE',$user);

4
htdocs/fourn/commande/card.php
View File

@ -534,8 +534,8 @@ if ($action == 'confirm_valid' && $confirm == 'yes' &&
}
}
else
{
setEventMessage($object->error, 'errors');
{
setEventMessages($object->error, $object->errors, 'errors');
}
// If we have permission, and if we don't need to provide the idwarehouse, we go directly on approved step

3
htdocs/fourn/facture/card.php
View File

@ -157,8 +157,7 @@ elseif ($action == 'confirm_valid' && $confirm == 'yes' &&
$result = $object->validate($user,'',$idwarehouse);
if ($result < 0)
{
setEventMessage($object->error,'errors');
setEventMessage($object->errors,'errors');
setEventMessages($object->error,$object->errors,'errors');
}
}
}