|
@@ -251,11 +251,11 @@ discard block |
|
|
block discarded – undo |
|
251
|
251
|
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as c_dep ON c_dep.rowid = t.fk_departement"; |
|
252
|
252
|
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as ccount ON ccount.rowid = t.fk_pays"; |
|
253
|
253
|
if ($separatedPMP) { |
|
254
|
|
- $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_perentity as pa ON pa.fk_product = p.rowid AND pa.fk_product = ps.fk_product AND pa.entity = ". (int) $conf->entity; |
|
|
254
|
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_perentity as pa ON pa.fk_product = p.rowid AND pa.fk_product = ps.fk_product AND pa.entity = ".(int) $conf->entity; |
|
255
|
255
|
} |
|
256
|
256
|
$sql .= " WHERE t.entity IN (".getEntity('stock').")"; |
|
257
|
257
|
foreach ($search as $key => $val) { |
|
258
|
|
- if (array_key_exists($key, $object->fields)||$key == 'status') { |
|
|
258
|
+ if (array_key_exists($key, $object->fields) || $key == 'status') { |
|
259
|
259
|
$class_key = $key; |
|
260
|
260
|
if ($class_key == 'status') { |
|
261
|
261
|
$class_key = 'statut'; // remove this after refactoring entrepot.class property statut to status |
|
@@ -303,7 +303,7 @@ discard block |
|
|
block discarded – undo |
|
303
|
303
|
if ($searchCategoryWarehouseOperator == 0) { |
|
304
|
304
|
$searchCategoryWarehouseSqlList[] = " EXISTS (SELECT ck.fk_warehouse FROM ".MAIN_DB_PREFIX."categorie_warehouse as ck WHERE t.rowid = ck.fk_warehouse AND ck.fk_categorie = ".((int) $searchCategoryWarehouse).")"; |
|
305
|
305
|
} else { |
|
306
|
|
- $listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryWarehouse); |
|
|
306
|
+ $listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryWarehouse); |
|
307
|
307
|
} |
|
308
|
308
|
} |
|
309
|
309
|
} |
|
@@ -457,7 +457,7 @@ discard block |
|
|
block discarded – undo |
|
457
|
457
|
//'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"), |
|
458
|
458
|
); |
|
459
|
459
|
//if ($user->rights->stock->supprimer) $arrayofmassactions['predelete']=img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete"); |
|
460
|
|
-if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete','preaffecttag'))) { |
|
|
460
|
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete', 'preaffecttag'))) { |
|
461
|
461
|
$arrayofmassactions = array(); |
|
462
|
462
|
} |
|
463
|
463
|
if (isModEnabled('category') && $user->hasRight('stock', 'creer')) { |
|
@@ -532,7 +532,7 @@ discard block |
|
|
block discarded – undo |
|
532
|
532
|
} |
|
533
|
533
|
|
|
534
|
534
|
$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
|
535
|
|
-$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
|
535
|
+$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
536
|
536
|
$selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
|
537
|
537
|
$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
|
538
|
538
|
|
|
@@ -649,7 +649,7 @@ discard block |
|
|
block discarded – undo |
|
649
|
649
|
} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('id', 'rowid', 'ref', 'status')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) { |
|
650
|
650
|
$cssforfield .= ($cssforfield ? ' ' : '').'right'; |
|
651
|
651
|
} |
|
652
|
|
- $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
|
652
|
+ $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
653
|
653
|
if (!empty($arrayfields['t.'.$key]['checked'])) { |
|
654
|
654
|
print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''), 0, (empty($val['helplist']) ? '' : $val['helplist']))."\n"; |
|
655
|
655
|
$totalarray['nbfield']++; |
Dolibarr /
dolibarr
