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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2019-04-08 14:05:14 +02:00
commit f4efc86dd3
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/expedition/shipment.php
View File

@ -893,7 +893,7 @@ if ($id > 0 || ! empty($ref))
print $langs->trans("WarehouseSource"); print $langs->trans("WarehouseSource");
//print '</td>'; //print '</td>';
//print '<td>'; //print '<td>';
print $formproduct->selectWarehouses(! empty($object->warehouse_id)?$object->warehouse_id:-1, 'entrepot_id', '', 1, 0, 0, '', 0, 0, array(), 'minwidth200'); print $formproduct->selectWarehouses(! empty($object->warehouse_id)?$object->warehouse_id:'ifone', 'entrepot_id', '', 1, 0, 0, '', 0, 0, array(), 'minwidth200');
if (count($formproduct->cache_warehouses) <= 0) if (count($formproduct->cache_warehouses) <= 0)
{ {
print ' &nbsp; '.$langs->trans("WarehouseSourceNotDefined").' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create">'.$langs->trans("AddOne").'</a>'; print ' &nbsp; '.$langs->trans("WarehouseSourceNotDefined").' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create">'.$langs->trans("AddOne").'</a>';

2
htdocs/projet/activity/perday.php
View File

@ -38,6 +38,8 @@ require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
// Load translation files required by the page // Load translation files required by the page
$langs->loadLangs(array('projects','users','companies')); $langs->loadLangs(array('projects','users','companies'));
$hookmanager->initHooks(array('timesheetperdaycard'));
$action=GETPOST('action','aZ09'); $action=GETPOST('action','aZ09');
$mode=GETPOST("mode",'alpha'); $mode=GETPOST("mode",'alpha');
$id=GETPOST('id','int'); $id=GETPOST('id','int');

2
htdocs/projet/activity/perweek.php
View File

@ -38,6 +38,8 @@ require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
// Load translation files required by the page // Load translation files required by the page
$langs->loadLangs(array('projects','users','companies')); $langs->loadLangs(array('projects','users','companies'));
$hookmanager->initHooks(array('timesheetperweekcard'));
$action=GETPOST('action','aZ09'); $action=GETPOST('action','aZ09');
$mode=GETPOST("mode",'alpha'); $mode=GETPOST("mode",'alpha');
$id=GETPOST('id','int'); $id=GETPOST('id','int');