*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -37,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
// Load translation files required by the page
-$langs->loadLangs(array('products', 'stocks', 'productbatch'));
+$langs->loadLangs(array('products', 'stocks', 'productbatch', 'categories'));
$action = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
$massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
@@ -48,7 +49,7 @@ $mode = GETPOST('mode', 'aZ');
$sref = GETPOST("sref", 'alpha');
$snom = GETPOST("snom", 'alpha');
-$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
+$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
$type = GETPOSTISSET('type') ? GETPOST('type', 'int') : Product::TYPE_PRODUCT;
$search_barcode = GETPOST("search_barcode", 'alpha');
$search_warehouse = GETPOST('search_warehouse', 'alpha');
@@ -82,6 +83,7 @@ if (GETPOSTISSET('catid')) {
} else {
$search_categ = GETPOST('search_categ', 'int');
}
+$search_warehouse_categ = GETPOST('search_warehouse_categ', 'int');
// Fetch optionals attributes and labels
$extrafields->fetch_name_optionals_label($object->table_element);
@@ -173,11 +175,12 @@ if (empty($reshook)) {
$search['eatby_dtend'] = '';
$sref = "";
$snom = "";
- $sall = "";
+ $search_all = "";
$tosell = "";
$tobuy = "";
$search_sale = "";
$search_categ = "";
+ $search_warehouse_categ = "";
$search_toolowstock = '';
$search_subjecttolotserial = '';
$search_batch = '';
@@ -255,8 +258,24 @@ if (!empty($search_categ) && $search_categ != '-1') {
}
$sql .= ")";
}
-if ($sall) {
- $sql .= natural_search(array('p.ref', 'p.label', 'p.description', 'p.note'), $sall);
+if (!empty($search_warehouse_categ) && $search_warehouse_categ != '-1') {
+ $sql .= " AND ";
+ if ($search_warehouse_categ == -2) {
+ $sql .= " NOT EXISTS ";
+ } else {
+ $sql .= " EXISTS ";
+ }
+ $sql .= "(";
+ $sql .= " SELECT cp.fk_categorie, cp.fk_warehouse";
+ $sql .= " FROM " . MAIN_DB_PREFIX . "categorie_warehouse as cp";
+ $sql .= " WHERE cp.fk_warehouse = e.rowid"; // Join for the needed table to filter by categ
+ if ($search_warehouse_categ > 0) {
+ $sql .= " AND cp.fk_categorie = " . ((int) $search_warehouse_categ);
+ }
+ $sql .= ")";
+}
+if ($search_all) {
+ $sql .= natural_search(array('p.ref', 'p.label', 'p.description', 'p.note'), $search_all);
}
// if the type is not 1, we show all products (type = 0,2,3)
if (dol_strlen($type)) {
@@ -402,7 +421,7 @@ $num = $db->num_rows($resql);
$i = 0;
-if ($num == 1 && GETPOST('autojumpifoneonly') && ($sall or $snom or $sref)) {
+if ($num == 1 && GETPOST('autojumpifoneonly') && ($search_all or $snom or $sref)) {
$objp = $db->fetch_object($resql);
header("Location: card.php?id=$objp->rowid");
exit;
@@ -443,8 +462,8 @@ foreach ($search as $key => $val) {
if ($optioncss != '') {
$param .= '&optioncss='.urlencode($optioncss);
}
-if ($sall) {
- $param .= "&sall=".urlencode($sall);
+if ($search_all) {
+ $param .= "&search_all=".urlencode($search_all);
}
if ($tosell) {
$param .= "&tosell=".urlencode($tosell);
@@ -485,6 +504,9 @@ if ($search_sale) {
if (!empty($search_categ) && $search_categ != '-1') {
$param .= "&search_categ=".urlencode($search_categ);
}
+if (!empty($search_warehouse_categ) && $search_warehouse_categ != '-1') {
+ $param .= "&search_warehouse_categ=".urlencode($search_warehouse_categ);
+}
if ($search_stock_physique) {
$param .= '&search_stock_physique=' . urlencode($search_stock_physique);
}
@@ -508,7 +530,7 @@ print '';
print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'product', 0, '', '', $limit, 0, 0, 1);
-
+/*
if ($search_categ > 0) {
print "";
$c = new Categorie($db);
@@ -517,17 +539,27 @@ if ($search_categ > 0) {
print " > ".$ways[0]."
\n";
print "
";
}
+*/
// Filter on categories
$moreforfilter = '';
if (isModEnabled('categorie')) {
$moreforfilter .= '';
- $moreforfilter .= img_picto($langs->trans('Categories'), 'category', 'class="pictofixedwidth"');
- $moreforfilter .= $htmlother->select_categories(Categorie::TYPE_PRODUCT, $search_categ, 'search_categ', 1);
+ $moreforfilter .= img_picto($langs->trans('ProductsCategoriesShort'), 'category', 'class="pictofixedwidth"');
+ $moreforfilter .= $htmlother->select_categories(Categorie::TYPE_PRODUCT, $search_categ, 'search_categ', 1, $langs->trans("ProductsCategoryShort"), 'maxwidth400');
$moreforfilter .= '
';
}
+// Filter on warehouse categories
+if (isModEnabled('categorie')) {
+ $moreforfilter .= '';
+ $moreforfilter .= img_picto($langs->trans('StockCategoriesShort'), 'category', 'class="pictofixedwidth"');
+ $moreforfilter .= $htmlother->select_categories(Categorie::TYPE_WAREHOUSE, $search_warehouse_categ, 'search_warehouse_categ', 1, $langs->trans("StockCategoriesShort"), 'maxwidth400');
+ $moreforfilter .= '
';
+}
+
$moreforfilter.='';
+
if (!empty($moreforfilter)) {
print '';
print $moreforfilter;
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 083ea381015..b596ac551b1 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -301,7 +301,9 @@ class MouvementStock extends CommonObject
// If not found, we add record
$sql = "SELECT pb.rowid, pb.batch, pb.eatby, pb.sellby FROM ".$this->db->prefix()."product_lot as pb";
$sql .= " WHERE pb.fk_product = ".((int) $fk_product)." AND pb.batch = '".$this->db->escape($batch)."'";
+
dol_syslog(get_class($this)."::_create scan serial for this product to check if eatby and sellby match", LOG_DEBUG);
+
$resql = $this->db->query($sql);
if ($resql) {
$num = $this->db->num_rows($resql);
@@ -560,6 +562,10 @@ class MouvementStock extends CommonObject
if (!$error && isModEnabled('productbatch') && $product->hasbatch() && !$skip_batch) {
if ($id_product_batch > 0) {
$result = $this->createBatch($id_product_batch, $qty);
+ if ($result == -2 && $fk_product_stock > 0) { // The entry for this product batch does not exists anymore, bu we already have a llx_product_stock, so we recreate the batch entry in product_batch
+ $param_batch = array('fk_product_stock' =>$fk_product_stock, 'batchnumber'=>$batch);
+ $result = $this->createBatch($param_batch, $qty);
+ }
} else {
$param_batch = array('fk_product_stock' =>$fk_product_stock, 'batchnumber'=>$batch);
$result = $this->createBatch($param_batch, $qty);
@@ -863,10 +869,10 @@ class MouvementStock extends CommonObject
* Create or update batch record (update table llx_product_batch). No check is done here, done by parent.
*
* @param array|int $dluo Could be either
- * - int if row id of product_batch table
+ * - int if row id of product_batch table (for update)
* - or complete array('fk_product_stock'=>, 'batchnumber'=>)
* @param int $qty Quantity of product with batch number. May be a negative amount.
- * @return int <0 if KO, else return productbatch id
+ * @return int <0 if KO, -2 if we try to update a product_batchid that does not exist, else return productbatch id
*/
private function createBatch($dluo, $qty)
{
diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index 56d39ae0e88..72f36220185 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -50,20 +50,23 @@ if (isModEnabled('productbatch')) {
$langs->load("productbatch");
}
-$id = GETPOST('id', 'int');
-$ref = GETPOST('ref', 'alpha');
-$msid = GETPOST('msid', 'int');
-$product_id = GETPOST("product_id", 'int');
$action = GETPOST('action', 'aZ09');
$massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
$confirm = GETPOST('confirm', 'alpha'); // Result of a confirmation
$cancel = GETPOST('cancel', 'alpha');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'movementlist';
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : str_replace('_', '', basename(dirname(__FILE__)).basename(__FILE__, '.php')); // To manage different context of search
$toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
$backtopage = GETPOST("backtopage", "alpha");
+$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+$mode = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+$msid = GETPOST('msid', 'int');
$idproduct = GETPOST('idproduct', 'int');
-$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
+$product_id = GETPOST("product_id", 'int');
+
+$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
$search_date_startday = GETPOST('search_date_startday', 'int');
$search_date_startmonth = GETPOST('search_date_startmonth', 'int');
$search_date_startyear = GETPOST('search_date_startyear', 'int');
@@ -83,7 +86,7 @@ $search_batch = trim(GETPOST("search_batch"));
$search_qty = trim(GETPOST("search_qty"));
$search_type_mouvement = GETPOST('search_type_mouvement', 'int');
$search_fk_projet=GETPOST("search_fk_projet", 'int');
-$optioncss = GETPOST('optioncss', 'alpha');
+
$type = GETPOST("type", "int");
// Load variable for pagination
@@ -108,15 +111,15 @@ if (!$sortorder) {
$pdluoid = GETPOST('pdluoid', 'int');
-// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+// Initialize technical objects
$object = new MouvementStock($db);
$extrafields = new ExtraFields($db);
$diroutputmassaction = $conf->stock->dir_output.'/temp/massgeneration/'.$user->id;
-$hookmanager->initHooks(array('movementlist'));
+$hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes
$formfile = new FormFile($db);
-// fetch optionals attributes and labels
+// Fetch optionals attributes and labels
$extrafields->fetch_name_optionals_label($object->table_element);
$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
@@ -224,7 +227,7 @@ if (empty($reshook)) {
$search_batch = "";
$search_qty = '';
$search_fk_projet=0;
- $sall = "";
+ $search_all = "";
$toselect = array();
$search_array_options = array();
}
@@ -588,18 +591,21 @@ if ($action == "transfert_stock" && !$cancel) {
* View
*/
-$productlot = new ProductLot($db);
-$productstatic = new Product($db);
-$warehousestatic = new Entrepot($db);
-$movement = new MouvementStock($db);
-$userstatic = new User($db);
$form = new Form($db);
$formproduct = new FormProduct($db);
if (!empty($conf->project->enabled)) {
$formproject = new FormProjets($db);
}
+$productlot = new ProductLot($db);
+$productstatic = new Product($db);
+$warehousestatic = new Entrepot($db);
+$movement = new MouvementStock($db);
+$userstatic = new User($db);
+
+$now = dol_now();
// Build and execute select
+// --------------------------------------------------------------------
$sql = "SELECT p.rowid, p.ref as product_ref, p.label as produit, p.tosell, p.tobuy, p.tobatch, p.fk_product_type as type, p.entity,";
$sql .= " e.ref as warehouse_ref, e.rowid as entrepot_id, e.lieu, e.fk_parent, e.statut,";
$sql .= " m.rowid as mid, m.value as qty, m.datem, m.fk_user_author, m.label, m.inventorycode, m.fk_origin, m.origintype,";
@@ -616,7 +622,7 @@ if (!empty($extrafields->attributes[$object->table_element]['label'])) {
}
// Add fields from hooks
$parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
$sql .= $hookmanager->resPrint;
$sql = preg_replace('/,\s*$/', '', $sql);
@@ -697,7 +703,7 @@ if ($search_type_mouvement != '' && $search_type_mouvement != '-1') {
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
// Add where from hooks
$parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
$sql .= $hookmanager->resPrint;
// Count total nb of records
@@ -714,7 +720,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
dol_print_error($db);
}
- if (($page * $limit) > $nbtotalofrecords) { // if total resultset is smaller then paging size (filtering), goto and load page 0
+ if (($page * $limit) > $nbtotalofrecords) { // if total resultset is smaller than the paging size (filtering), goto and load page 0
$page = 0;
$offset = 0;
}
@@ -733,6 +739,9 @@ if (!$resql) {
exit;
}
+$num = $db->num_rows($resql);
+
+
$product = new Product($db);
$object = new Entrepot($db);
@@ -746,8 +755,6 @@ if ($id > 0 || $ref) {
}
}
-$num = $db->num_rows($resql);
-
// Output page
// --------------------------------------------------------------------
@@ -767,9 +774,11 @@ if ($msid) {
}
}
-llxHeader('', $title, $help_url);
-$arrayofselected = is_array($toselect) ? $toselect : array();
+// Output page
+// --------------------------------------------------------------------
+
+llxHeader('', $title, $help_url);
/*
* Show tab only if we ask a particular warehouse
@@ -939,7 +948,12 @@ if ((empty($action) || $action == 'list') && $id > 0) {
print '
';
}
+$arrayofselected = is_array($toselect) ? $toselect : array();
+
$param = '';
+if (!empty($mode)) {
+ $param .= '&mode='.urlencode($mode);
+}
if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
$param .= '&contextpage='.urlencode($contextpage);
}
@@ -996,6 +1010,10 @@ if ($idproduct > 0) {
}
// Add $param from extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+// Add $param from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+$param .= $hookmanager->resPrint;
// List of mass actions available
$arrayofmassactions = array();
@@ -1023,10 +1041,15 @@ print '';
print '';
print '';
print '';
+print '';
+print '';
if ($id > 0) {
print '';
}
+
+$newcardbutton = '';
+
if ($id > 0) {
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'movement', 0, '', '', $limit, 0, 0, 1);
} else {
@@ -1040,17 +1063,20 @@ $objecttmp = new MouvementStock($db);
$trackid = 'mov'.$object->id;
include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
-if ($sall) {
+if ($search_all) {
+ $setupstring = '';
foreach ($fieldstosearchall as $key => $val) {
$fieldstosearchall[$key] = $langs->trans($val);
+ $setupstring .= $key."=".$val.";";
}
- print ''.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'
';
+ print ''."\n";
+ print ''.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'
'."\n";
}
$moreforfilter = '';
$parameters = array('arrayfields'=>&$arrayfields);
-$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
if (empty($reshook)) {
$moreforfilter .= $hookmanager->resPrint;
} else {
@@ -1064,7 +1090,7 @@ if (!empty($moreforfilter)) {
}
$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
print ''; // You can use div-table-responsive-no-min if you dont need reserved height for your table
@@ -1073,6 +1099,13 @@ print '
';
+// Action column
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+ print '| ';
+ $searchpicto = $form->showFilterButtons('left');
+ print $searchpicto;
+ print ' | ';
+}
if (!empty($arrayfields['m.rowid']['checked'])) {
// Ref
print '';
@@ -1185,7 +1218,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
// Fields from hook
$parameters = array('arrayfields'=>$arrayfields);
-$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Date creation
if (!empty($arrayfields['m.datec']['checked'])) {
@@ -1198,16 +1231,25 @@ if (!empty($arrayfields['m.tms']['checked'])) {
print ' | ';
}
// Action column
-print '';
-$searchpicto = $form->showFilterButtons();
-print $searchpicto;
-print ' | ';
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+ print '';
+ $searchpicto = $form->showFilterButtons();
+ print $searchpicto;
+ print ' | ';
+}
print ''."\n";
+$totalarray = array();
+$totalarray['nbfield'] = 0;
// Fields title label
// --------------------------------------------------------------------
print '';
+// Action column
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+ print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+ $totalarray['nbfield']++;
+}
if (!empty($arrayfields['m.rowid']['checked'])) {
print_liste_field_titre($arrayfields['m.rowid']['label'], $_SERVER["PHP_SELF"], 'm.rowid', '', $param, '', $sortfield, $sortorder);
}
@@ -1262,8 +1304,8 @@ if (!empty($arrayfields['m.price']['checked'])) {
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
// Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
-$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>&$totalarray);
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
if (!empty($arrayfields['m.datec']['checked'])) {
print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
@@ -1272,7 +1314,10 @@ if (!empty($arrayfields['m.tms']['checked'])) {
print_liste_field_titre($arrayfields['p.tms']['label'], $_SERVER["PHP_SELF"], "p.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
}
// Action column
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+ print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+ $totalarray['nbfield']++;
+}
print '
'."\n";
@@ -1282,9 +1327,11 @@ $arrayofuniqueproduct = array();
// Loop on record
// --------------------------------------------------------------------
$i = 0;
+$savnbfield = $totalarray['nbfield'];
$totalarray = array();
$totalarray['nbfield'] = 0;
-while ($i < ($limit ? min($num, $limit) : $num)) {
+$imaxinloop = ($limit ? min($num, $limit) : $num);
+while ($i < $imaxinloop) {
$obj = $db->fetch_object($resql);
if (empty($obj)) {
break; // Should not happen
@@ -1346,139 +1393,193 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
$origin = '';
}
- print '';
- // Id movement
- if (!empty($arrayfields['m.rowid']['checked'])) {
- print '| ';
- print img_picto($langs->trans("StockMovement"), 'movement', 'class="pictofixedwidth"');
- print $obj->mid;
- print ' | '; // This is primary not movement id
- }
- if (!empty($arrayfields['m.datem']['checked'])) {
- // Date
- print ''.dol_print_date($db->jdate($obj->datem), 'dayhour', 'tzuserrel').' | ';
- }
- if (!empty($arrayfields['p.ref']['checked'])) {
- // Product ref
- print '';
- print $productstatic->getNomUrl(1, 'stock', 16);
- print " | \n";
- }
- if (!empty($arrayfields['p.label']['checked'])) {
- // Product label
- print '';
- print $productstatic->label;
- print " | \n";
- }
- if (!empty($arrayfields['m.batch']['checked'])) {
- print '';
- if ($productlot->id > 0) {
- print $productlot->getNomUrl(1);
- } else {
- print $productlot->batch; // the id may not be defined if movement was entered when lot was not saved or if lot was removed after movement.
+ if ($mode == 'kanban') {
+ if ($i == 0) {
+ print ' |
| ';
+ print ' ';
}
- print ' | ';
- }
- if (!empty($arrayfields['pl.eatby']['checked'])) {
- print ''.dol_print_date($obj->eatby, 'day').' | ';
- }
- if (!empty($arrayfields['pl.sellby']['checked'])) {
- print ''.dol_print_date($obj->sellby, 'day').' | ';
- }
- // Warehouse
- if (!empty($arrayfields['e.ref']['checked'])) {
- print '';
- print $warehousestatic->getNomUrl(1);
- print " | \n";
- }
- // Author
- if (!empty($arrayfields['m.fk_user_author']['checked'])) {
- print '';
- print $userstatic->getNomUrl(-1);
- print " | \n";
- }
- if (!empty($arrayfields['m.inventorycode']['checked'])) {
- // Inventory code
- print 'inventorycode.'$').'&search_type_mouvement='.urlencode($obj->type_mouvement).'">'.$obj->inventorycode.' | ';
- }
- if (!empty($arrayfields['m.label']['checked'])) {
- // Label of movement
- print ''.$obj->label.' | ';
- }
- if (!empty($arrayfields['origin']['checked'])) {
- // Origin of movement
- print ''.$origin.' | ';
- }
- if (!empty($arrayfields['m.fk_projet']['checked'])) {
- // fk_project
- print '';
- if ($obj->fk_project != 0) {
- print $movement->get_origin($obj->fk_project, 'project');
+ // Output Kanban
+ if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+ $selected = 0;
+ if (in_array($object->id, $arrayofselected)) {
+ $selected = 1;
+ }
}
- print ' | ';
- }
- if (!empty($arrayfields['m.type_mouvement']['checked'])) {
- // Type of movement
- print '';
- print $movement->getTypeMovement();
- print ' | ';
- }
- if (!empty($arrayfields['m.value']['checked'])) {
- // Qty
- print '';
- if ($obj->qty > 0) {
- print '';
- print '+';
- print $obj->qty;
- print '';
- } else {
- print '';
- print $obj->qty;
- print '';
+ print $object->getKanbanView('');
+ if ($i == ($imaxinloop - 1)) {
+ print '';
+ print ' |
';
}
- print '';
- }
- if (!empty($arrayfields['m.price']['checked'])) {
- // Price
- print '';
- if ($obj->price != 0) {
- print price($obj->price);
+ } else {
+ // Show here line of result
+ $j = 0;
+ print ' | ';
+ // Action column
+ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+ print '| ';
+ if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+ $selected = 0;
+ if (in_array($obj->mid, $arrayofselected)) {
+ $selected = 1;
+ }
+ print '';
+ }
+ print ' | ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+ // Id movement
+ if (!empty($arrayfields['m.rowid']['checked'])) {
+ print '';
+ print img_picto($langs->trans("StockMovement"), 'movement', 'class="pictofixedwidth"');
+ print $obj->mid;
+ print ' | '; // This is primary not movement id
+ }
+ if (!empty($arrayfields['m.datem']['checked'])) {
+ // Date
+ print ''.dol_print_date($db->jdate($obj->datem), 'dayhour', 'tzuserrel').' | ';
+ }
+ if (!empty($arrayfields['p.ref']['checked'])) {
+ // Product ref
+ print '';
+ print $productstatic->getNomUrl(1, 'stock', 16);
+ print " | \n";
+ }
+ if (!empty($arrayfields['p.label']['checked'])) {
+ // Product label
+ print '';
+ print $productstatic->label;
+ print " | \n";
+ }
+ if (!empty($arrayfields['m.batch']['checked'])) {
+ print '';
+ if ($productlot->id > 0) {
+ print $productlot->getNomUrl(1);
+ } else {
+ print $productlot->batch; // the id may not be defined if movement was entered when lot was not saved or if lot was removed after movement.
+ }
+ print ' | ';
+ }
+ if (!empty($arrayfields['pl.eatby']['checked'])) {
+ print ''.dol_print_date($obj->eatby, 'day').' | ';
+ }
+ if (!empty($arrayfields['pl.sellby']['checked'])) {
+ print ''.dol_print_date($obj->sellby, 'day').' | ';
+ }
+ // Warehouse
+ if (!empty($arrayfields['e.ref']['checked'])) {
+ print '';
+ print $warehousestatic->getNomUrl(1);
+ print " | \n";
+ }
+ // Author
+ if (!empty($arrayfields['m.fk_user_author']['checked'])) {
+ print '';
+ print $userstatic->getNomUrl(-1);
+ print " | \n";
+ }
+ if (!empty($arrayfields['m.inventorycode']['checked'])) {
+ // Inventory code
+ print 'inventorycode.'$').'&search_type_mouvement='.urlencode($obj->type_mouvement).'">'.$obj->inventorycode.' | ';
+ }
+ if (!empty($arrayfields['m.label']['checked'])) {
+ // Label of movement
+ print ''.$obj->label.' | ';
+ }
+ if (!empty($arrayfields['origin']['checked'])) {
+ // Origin of movement
+ print ''.$origin.' | ';
+ }
+ if (!empty($arrayfields['m.fk_projet']['checked'])) {
+ // fk_project
+ print '';
+ if ($obj->fk_project != 0) {
+ print $movement->get_origin($obj->fk_project, 'project');
+ }
+ print ' | ';
+ }
+ if (!empty($arrayfields['m.type_mouvement']['checked'])) {
+ // Type of movement
+ print '';
+ print $movement->getTypeMovement();
+ print ' | ';
+ }
+ if (!empty($arrayfields['m.value']['checked'])) {
+ // Qty
+ print '';
+ if ($obj->qty > 0) {
+ print '';
+ print '+';
+ print $obj->qty;
+ print '';
+ } else {
+ print '';
+ print $obj->qty;
+ print '';
+ }
+ print ' | ';
+ }
+ if (!empty($arrayfields['m.price']['checked'])) {
+ // Price
+ print '';
+ if ($obj->price != 0) {
+ print price($obj->price);
+ }
+ print ' | ';
}
- print '';
- }
- // Extra fields
- $object = $movement;
- include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
- // Fields from hook
- $parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
- $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
- print $hookmanager->resPrint;
+ // Extra fields
+ $object = $movement;
+ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+ // Fields from hook
+ $parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+ $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
- // Action column
- print '';
- if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
- $selected = 0;
- if (in_array($obj->mid, $arrayofselected)) {
- $selected = 1;
+ // Action column
+ if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+ print ' | ';
+ if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+ $selected = 0;
+ if (in_array($obj->mid, $arrayofselected)) {
+ $selected = 1;
+ }
+ print '';
+ }
+ print ' | ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
}
- print '';
- }
- print '';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- print '
'."\n";
+ print ''."\n";
+ }
$i++;
}
+// If no record found
+if ($num == 0) {
+ $colspan = 1;
+ foreach ($arrayfields as $key => $val) {
+ if (!empty($val['checked'])) {
+ $colspan++;
+ }
+ }
+ print '| '.$langs->trans("NoRecordFound").' |
';
+}
+
$db->free($resql);
-print "
";
-print '