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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2019-01-26 14:30:59 +01:00
commit 3118e92d2b
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/tpl/contacts.tpl.php
View File

@ -207,7 +207,7 @@ if ($permission) {
if ($tab[$i]['source']=='external') if ($tab[$i]['source']=='external')
{ {
$contactstatic->fetch($tab[$i]['id']); $contactstatic->fetch($tab[$i]['id']);
echo $contactstatic->getNomUrl(1, '', 0, 0, 0, 0, '', 'valignmiddle'); echo $contactstatic->getNomUrl(1, '', 0, '', 0, 0, '', 'valignmiddle');
} }
?> ?>
</div> </div>

6
htdocs/product/inventory/card.php
View File

@ -78,12 +78,12 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be inclu
if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) if (empty($conf->global->MAIN_USE_ADVANCED_PERMS))
{ {
$permissiontoadd = $user->rights->stock->write; $permissiontoadd = $user->rights->stock->creer;
$permissiontodelete = $user->rights->stock->write; $permissiontodelete = $user->rights->stock->supprimer;
} }
else else
{ {
$permissiontoadd = $user->rights->stock->inventory_advance->create; $permissiontoadd = $user->rights->stock->inventory_advance->write;
$permissiontodelete = $user->rights->stock->inventory_advance->write; $permissiontodelete = $user->rights->stock->inventory_advance->write;
} }

2
htdocs/takepos/takepos.php
View File

@ -58,7 +58,7 @@ top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
$categorie = new Categorie($db); $categorie = new Categorie($db);
$categories = $categorie->get_full_arbo('product'); $categories = $categorie->get_full_arbo('product');
?> ?>
var categories = JSON.parse( '<?php echo json_encode($categories);?>' ); var categories = <?php echo json_encode($categories); ?>;
var currentcat; var currentcat;
var pageproducts=0; var pageproducts=0;
var pagecategories=0; var pagecategories=0;