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

Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7

Browse Source
This commit is contained in:
Laurent Destailleur 2014-12-18 10:10:09 +01:00
commit 87ec59a05c
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/expedition/card.php
View File

@ -90,8 +90,10 @@ $hookmanager->initHooks(array('expeditioncard','globalcard'));
*/ */
$warehousecanbeselectedlater=1; $warehousecanbeselectedlater=1;
if (! empty($conf->productbatch->enabled)) if (($action == 'create') || ($action == 'add'))
{ {
if (! empty($conf->productbatch->enabled))
{
if (! (GETPOST('entrepot_id','int') > 0)) if (! (GETPOST('entrepot_id','int') > 0))
{ {
$langs->load("errors"); $langs->load("errors");
@ -99,9 +101,9 @@ if (! empty($conf->productbatch->enabled))
header("Location: ".DOL_URL_ROOT.'/expedition/shipment.php?id='.$id); header("Location: ".DOL_URL_ROOT.'/expedition/shipment.php?id='.$id);
exit; exit;
} }
}
} }
$parameters=array(); $parameters=array();
$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

4
htdocs/webservices/demo_wsclient_actioncomm.php-NORUN
View File

@ -53,8 +53,8 @@ if ($soapclient)
$authentication=array( $authentication=array(
'dolibarrkey'=>$conf->global->WEBSERVICES_KEY, 'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
'sourceapplication'=>'DEMO', 'sourceapplication'=>'DEMO',
'login'=>'admin_dolibarDev', 'login'=>'admin',
'password'=>'homedread', 'password'=>'changeme',
'entity'=>'1'); 'entity'=>'1');