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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2019-02-28 10:30:37 +01:00
commit b91a458af4
1 changed files with 1 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
htdocs/product/stock/movement_list.php
View File

@ -404,28 +404,6 @@ if ($action == "transfert_stock" && ! $cancel)
} }
/*
* Build document
*/
/* The builddoc action for object of a movement must be on the movement card
// Actions to build doc
$upload_dir = $conf->stock->dir_output;
$permissioncreate = $user->rights->stock->creer;
include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
*/
if (empty($reshook) && $action != 'remove_file')
{
$objectclass='MouvementStock';
$objectlabel='Movements';
$permtoread = $user->rights->stock->lire;
$permtodelete = $user->rights->stock->supprimer;
$uploaddir = $conf->stock->dir_output;
include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
}
/* /*
* View * View
*/ */
@ -1070,7 +1048,7 @@ if ($resql)
{ {
// Inventory code // Inventory code
print '<td>'.'<a href="' print '<td>'.'<a href="'
.DOL_URL_ROOT.'/product/stock/movement_list.php' .DOL_URL_ROOT.'/product/stock/movement_card.php'
.'?id='.$objp->entrepot_id .'?id='.$objp->entrepot_id
.'&amp;search_inventorycode='.$objp->inventorycode .'&amp;search_inventorycode='.$objp->inventorycode
.'&amp;search_type_mouvement='.$objp->type_mouvement .'&amp;search_type_mouvement='.$objp->type_mouvement
@ -1180,54 +1158,6 @@ else
} }
/*
* Documents generes
*/
/* Area for doc and last events of warehouse are stored on the main card of warehouse
$modulepart='mouvement';
if ($action != 'create' && $action != 'edit' && $action != 'delete' && $id>0)
{
print '<br/>';
print '<div class="fichecenter"><div class="fichehalfleft">';
print '<a name="builddoc"></a>'; // ancre
// Documents
$objectref = dol_sanitizeFileName($object->ref);
// Add inventorycode & type_mouvement to filename of the pdf
if(!empty($search_inventorycode)) $objectref.="_".$id."_".$search_inventorycode;
if($search_type_mouvement) $objectref.="_".$search_type_mouvement;
$relativepath = $comref . '/' . $objectref . '.pdf';
$filedir = $conf->stock->dir_output . '/movement/' . $objectref;
$urlsource=$_SERVER["PHP_SELF"]."?id=".$object->id."&search_inventorycode=".$search_inventorycode."&search_type_mouvement=$search_type_mouvement";
$genallowed=$usercanread;
$delallowed=$usercancreate;
$genallowed=$user->rights->stock->mouvement->lire;
$delallowed=$user->rights->stock->mouvement->creer;
print $formfile->showdocuments($modulepart,$objectref,$filedir,$urlsource,$genallowed,$delallowed,'',0,0,0,28,0,'',0,'',$object->default_lang, '', $object);
$somethingshown=$formfile->numoffiles;
print '</div><div class="fichehalfright"><div class="ficheaddleft">';
$MAXEVENT = 10;
$morehtmlright = '<a href="'.DOL_URL_ROOT.'/product/agenda.php?id='.$object->id.'">';
$morehtmlright.= $langs->trans("SeeAll");
$morehtmlright.= '</a>';
// List of actions on element
include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
$formactions = new FormActions($db);
$somethingshown = $formactions->showactions($object, 'stock', 0, 1, '', $MAXEVENT, '', $morehtmlright); // Show all action for product
print '</div></div></div>';
}
*/
// End of page // End of page
llxFooter(); llxFooter();
$db->close(); $db->close();