';
-
- // #
- if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
- print ''.($i + 1).' ';
- }
-
- // Predefined product or service
- if ($lines[$i]->fk_product > 0) {
- // Define output language
- if (getDolGlobalInt('MAIN_MULTILANGS') && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
- $prod = new Product($db);
- $prod->fetch($lines[$i]->fk_product);
- $label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $lines[$i]->product_label;
- } else {
- $label = (!empty($lines[$i]->label) ? $lines[$i]->label : $lines[$i]->product_label);
- }
-
- print '';
-
- // Show product and description
- $product_static->type = $lines[$i]->fk_product_type;
- $product_static->id = $lines[$i]->fk_product;
- $product_static->ref = $lines[$i]->ref;
- $product_static->status = $lines[$i]->product_tosell;
- $product_static->status_buy = $lines[$i]->product_tobuy;
- $product_static->status_batch = $lines[$i]->product_tobatch;
-
- $product_static->weight = $lines[$i]->weight;
- $product_static->weight_units = $lines[$i]->weight_units;
- $product_static->length = $lines[$i]->length;
- $product_static->length_units = $lines[$i]->length_units;
- $product_static->width = !empty($lines[$i]->width) ? $lines[$i]->width : 0;
- $product_static->width_units = !empty($lines[$i]->width_units) ? $lines[$i]->width_units : 0;
- $product_static->height = !empty($lines[$i]->height) ? $lines[$i]->height : 0;
- $product_static->height_units = !empty($lines[$i]->height_units) ? $lines[$i]->height_units : 0;
- $product_static->surface = $lines[$i]->surface;
- $product_static->surface_units = $lines[$i]->surface_units;
- $product_static->volume = $lines[$i]->volume;
- $product_static->volume_units = $lines[$i]->volume_units;
-
- $text = $product_static->getNomUrl(1);
- $text .= ' - '.$label;
- $description = (getDolGlobalInt('PRODUIT_DESC_IN_FORM_ACCORDING_TO_DEVICE') ? '' : dol_htmlentitiesbr($lines[$i]->description));
- print $form->textwithtooltip($text, $description, 3, '', '', $i);
- print_date_range(!empty($lines[$i]->date_start) ? $lines[$i]->date_start : '', !empty($lines[$i]->date_end) ? $lines[$i]->date_end : '');
- if (getDolGlobalInt('PRODUIT_DESC_IN_FORM_ACCORDING_TO_DEVICE')) {
- print (!empty($lines[$i]->description) && $lines[$i]->description != $lines[$i]->product) ? ' \n";
+ // Predefined product or service
+ if ($lines[$i]->fk_product > 0) {
+ // Define output language
+ if (getDolGlobalInt('MAIN_MULTILANGS') && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
+ $prod = new Product($db);
+ $prod->fetch($lines[$i]->fk_product);
+ $label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $lines[$i]->product_label;
} else {
- print '';
- if ($lines[$i]->product_type == Product::TYPE_SERVICE) {
- $text = img_object($langs->trans('Service'), 'service');
- } else {
- $text = img_object($langs->trans('Product'), 'product');
- }
-
- if (!empty($lines[$i]->label)) {
- $text .= ' '.$lines[$i]->label.' ';
- print $form->textwithtooltip($text, $lines[$i]->description, 3, '', '', $i);
- } else {
- print $text.' '.nl2br($lines[$i]->description);
- }
-
- print_date_range($lines[$i]->date_start, $lines[$i]->date_end);
- print " \n";
+ $label = (!empty($lines[$i]->label) ? $lines[$i]->label : $lines[$i]->product_label);
}
- $unit_order = '';
- if (!empty($conf->global->PRODUCT_USE_UNITS)) {
- $unit_order = measuringUnitString($lines[$i]->fk_unit);
+ print '';
+
+ // Show product and description
+ $product_static->type = $lines[$i]->fk_product_type;
+ $product_static->id = $lines[$i]->fk_product;
+ $product_static->ref = $lines[$i]->ref;
+ $product_static->status = $lines[$i]->product_tosell;
+ $product_static->status_buy = $lines[$i]->product_tobuy;
+ $product_static->status_batch = $lines[$i]->product_tobatch;
+
+ $product_static->weight = $lines[$i]->weight;
+ $product_static->weight_units = $lines[$i]->weight_units;
+ $product_static->length = $lines[$i]->length;
+ $product_static->length_units = $lines[$i]->length_units;
+ $product_static->width = !empty($lines[$i]->width) ? $lines[$i]->width : 0;
+ $product_static->width_units = !empty($lines[$i]->width_units) ? $lines[$i]->width_units : 0;
+ $product_static->height = !empty($lines[$i]->height) ? $lines[$i]->height : 0;
+ $product_static->height_units = !empty($lines[$i]->height_units) ? $lines[$i]->height_units : 0;
+ $product_static->surface = $lines[$i]->surface;
+ $product_static->surface_units = $lines[$i]->surface_units;
+ $product_static->volume = $lines[$i]->volume;
+ $product_static->volume_units = $lines[$i]->volume_units;
+
+ $text = $product_static->getNomUrl(1);
+ $text .= ' - '.$label;
+ $description = (getDolGlobalInt('PRODUIT_DESC_IN_FORM_ACCORDING_TO_DEVICE') ? '' : dol_htmlentitiesbr($lines[$i]->description));
+ print $form->textwithtooltip($text, $description, 3, '', '', $i);
+ print_date_range(!empty($lines[$i]->date_start) ? $lines[$i]->date_start : '', !empty($lines[$i]->date_end) ? $lines[$i]->date_end : '');
+ if (getDolGlobalInt('PRODUIT_DESC_IN_FORM_ACCORDING_TO_DEVICE')) {
+ print (!empty($lines[$i]->description) && $lines[$i]->description != $lines[$i]->product) ? ' \n";
+ } else {
+ print '';
+ if ($lines[$i]->product_type == Product::TYPE_SERVICE) {
+ $text = img_object($langs->trans('Service'), 'service');
+ } else {
+ $text = img_object($langs->trans('Product'), 'product');
}
- // Qty ordered
- print ' '.$lines[$i]->qty_asked.' '.$unit_order.' ';
+ if (!empty($lines[$i]->label)) {
+ $text .= ' '.$lines[$i]->label.' ';
+ print $form->textwithtooltip($text, $lines[$i]->description, 3, '', '', $i);
+ } else {
+ print $text.' '.nl2br($lines[$i]->description);
+ }
- // Qty in other shipments (with shipment and warehouse used)
- if ($origin && $origin_id > 0) {
- print '';
- foreach ($alreadysent as $key => $val) {
- if ($lines[$i]->fk_origin_line == $key) {
- $j = 0;
- foreach ($val as $shipmentline_id => $shipmentline_var) {
- if ($shipmentline_var['shipment_id'] == $lines[$i]->fk_expedition) {
- continue; // We want to show only "other shipments"
- }
+ print_date_range($lines[$i]->date_start, $lines[$i]->date_end);
+ print " \n";
+ }
- $j++;
- if ($j > 1) {
- print ''.$lines[$i]->qty_asked.' '.$unit_order.' ';
+
+ // Qty in other shipments (with shipment and warehouse used)
+ if ($origin && $origin_id > 0) {
+ print '';
+ foreach ($alreadysent as $key => $val) {
+ if ($lines[$i]->fk_origin_line == $key) {
+ $j = 0;
+ foreach ($val as $shipmentline_id => $shipmentline_var) {
+ if ($shipmentline_var['shipment_id'] == $lines[$i]->fk_expedition) {
+ continue; // We want to show only "other shipments"
}
+
+ $j++;
+ if ($j > 1) {
+ print ' ';
}
+ print '';
+ }
- if ($action == 'editline' && $lines[$i]->id == $line_id) {
- // edit mode
- print '';
- if (is_array($lines[$i]->detail_batch) && count($lines[$i]->detail_batch) > 0) {
- print '';
- $line = new ExpeditionLigne($db);
- foreach ($lines[$i]->detail_batch as $detail_batch) {
- print '';
- // Qty to ship or shipped
- print ''.$formproduct->selectLotStock($detail_batch->fk_origin_stock, 'batchl'.$detail_batch->fk_expeditiondet.'_'.$detail_batch->fk_origin_stock, '', 1, 0, $lines[$i]->fk_product, $entrepot_id).' ';
- print ' ';
- }
- // add a 0 qty lot row to be able to add a lot
+ if ($action == 'editline' && $lines[$i]->id == $line_id) {
+ // edit mode
+ print '';
+ if (is_array($lines[$i]->detail_batch) && count($lines[$i]->detail_batch) > 0) {
+ print '';
+ $line = new ExpeditionLigne($db);
+ foreach ($lines[$i]->detail_batch as $detail_batch) {
print '';
// Qty to ship or shipped
- print ''.$formproduct->selectLotStock('', 'batchl'.$line_id.'_0', '', 1, 0, $lines[$i]->fk_product).' ';
+ if ($lines[$i]->entrepot_id == 0) {
+ // only show lot numbers from src warehouse when shipping from multiple warehouses
+ $line->fetch($detail_batch->fk_expeditiondet);
+ }
+ $entrepot_id = !empty($detail_batch->entrepot_id)?$detail_batch->entrepot_id:$lines[$i]->entrepot_id;
+ print ''.$formproduct->selectLotStock($detail_batch->fk_origin_stock, 'batchl'.$detail_batch->fk_expeditiondet.'_'.$detail_batch->fk_origin_stock, '', 1, 0, $lines[$i]->fk_product, $entrepot_id).' ';
print ' ';
- } elseif (isModEnabled('stock')) {
- if ($lines[$i]->fk_product > 0) {
- if ($lines[$i]->entrepot_id > 0) {
- print '';
- print '';
- // Qty to ship or shipped
- print ''.$formproduct->selectWarehouses($lines[$i]->entrepot_id, 'entl'.$line_id, '', 1, 0, $lines[$i]->fk_product, '', 1).' ';
- // Batch number managment
- print ' - '.$langs->trans("NA").' ';
- print ' ';
- } elseif (count($lines[$i]->details_entrepot) > 1) {
- print '';
- foreach ($lines[$i]->details_entrepot as $detail_entrepot) {
- print '';
- // Qty to ship or shipped
- print ''.$formproduct->selectWarehouses($detail_entrepot->entrepot_id, 'entl'.$detail_entrepot->line_id, '', 1, 0, $lines[$i]->fk_product, '', 1).' ';
- // Batch number managment
- print ' - '.$langs->trans("NA").' ';
- print ' ';
- }
- } else {
- print '';
- print ''.$langs->trans("NotEnoughStock").' ';
+ // Qty to ship or shipped
+ print ''.$formproduct->selectLotStock('', 'batchl'.$line_id.'_0', '', 1, 0, $lines[$i]->fk_product).' ';
+ print ' ';
+ } elseif (isModEnabled('stock')) {
+ if ($lines[$i]->fk_product > 0) {
+ if ($lines[$i]->entrepot_id > 0) {
+ print '';
print '';
// Qty to ship or shipped
print ''.$formproduct->selectWarehouses($lines[$i]->entrepot_id, 'entl'.$line_id, '', 1, 0, $lines[$i]->fk_product, '', 1).' ';
// Batch number managment
- print ' - '.$langs->trans("NA").' ';
print ' ';
+ } elseif (count($lines[$i]->details_entrepot) > 1) {
+ print '';
+ foreach ($lines[$i]->details_entrepot as $detail_entrepot) {
+ print '';
+ // Qty to ship or shipped
+ print ''.$formproduct->selectWarehouses($detail_entrepot->entrepot_id, 'entl'.$detail_entrepot->line_id, '', 1, 0, $lines[$i]->fk_product, '', 1).' ';
+ // Batch number managment
+ print ' - '.$langs->trans("NA").' ';
+ print ' ';
+ }
+ } else {
+ print '';
+ print ''.$langs->trans("NotEnoughStock").' ';
// Qty to ship or shipped
- print ' ';
}
-
- print '
';
// Qty to ship or shipped
- print ''.$lines[$i]->qty_shipped.' '.$unit_order.' ';
-
+ print '';
- if ($lines[$i]->entrepot_id > 0) {
- $entrepot = new Entrepot($db);
- $entrepot->fetch($lines[$i]->entrepot_id);
- print $entrepot->getNomUrl(1);
- } elseif (count($lines[$i]->details_entrepot) > 1) {
- $detail = '';
- foreach ($lines[$i]->details_entrepot as $detail_entrepot) {
- if ($detail_entrepot->entrepot_id > 0) {
- $entrepot = new Entrepot($db);
- $entrepot->fetch($detail_entrepot->entrepot_id);
- $detail .= $langs->trans("DetailWarehouseFormat", $entrepot->libelle, $detail_entrepot->qty_shipped).' ';
+ }
+
+ print '
'.$lines[$i]->qty_shipped.' '.$unit_order.' ';
+
+ // Warehouse source
+ if (isModEnabled('stock')) {
+ print '';
+ if ($lines[$i]->entrepot_id > 0) {
+ $entrepot = new Entrepot($db);
+ $entrepot->fetch($lines[$i]->entrepot_id);
+ print $entrepot->getNomUrl(1);
+ } elseif (count($lines[$i]->details_entrepot) > 1) {
+ $detail = '';
+ foreach ($lines[$i]->details_entrepot as $detail_entrepot) {
+ if ($detail_entrepot->entrepot_id > 0) {
+ $entrepot = new Entrepot($db);
+ $entrepot->fetch($detail_entrepot->entrepot_id);
+ $detail .= $langs->trans("DetailWarehouseFormat", $entrepot->libelle, $detail_entrepot->qty_shipped).' ';
+ }
+
+ // Batch number managment
+ if (isModEnabled('productbatch')) {
+ if (isset($lines[$i]->detail_batch)) {
+ print '';
+ print '';
+ if ($lines[$i]->product_tobatch) {
+ $detail = '';
+ foreach ($lines[$i]->detail_batch as $dbatch) { // $dbatch is instance of ExpeditionLineBatch
+ $detail .= $langs->trans("Batch").': '.$dbatch->batch;
+ if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+ $detail .= ' - '.$langs->trans("SellByDate").': '.dol_print_date($dbatch->sellby, "day");
+ }
+ if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+ $detail .= ' - '.$langs->trans("EatByDate").': '.dol_print_date($dbatch->eatby, "day");
+ }
+ $detail .= ' - '.$langs->trans("Qty").': '.$dbatch->qty;
+ $detail .= ' ';
- }
-
- // Batch number managment
- if (isModEnabled('productbatch')) {
- if (isset($lines[$i]->detail_batch)) {
- print '';
- print '';
- if ($lines[$i]->product_tobatch) {
- $detail = '';
- foreach ($lines[$i]->detail_batch as $dbatch) { // $dbatch is instance of ExpeditionLineBatch
- $detail .= $langs->trans("Batch").': '.$dbatch->batch;
- if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
- $detail .= ' - '.$langs->trans("SellByDate").': '.dol_print_date($dbatch->sellby, "day");
- }
- if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
- $detail .= ' - '.$langs->trans("EatByDate").': '.dol_print_date($dbatch->eatby, "day");
- }
- $detail .= ' - '.$langs->trans("Qty").': '.$dbatch->qty;
- $detail .= ' ';
- } else {
- print '';
- if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) {
- print $lines[$i]->weight * $lines[$i]->qty_shipped.' '.measuringUnitString(0, "weight", $lines[$i]->weight_units);
- } else {
- print ' ';
- }
- print ' ';
-
- // Volume
- print '';
- if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) {
- print $lines[$i]->volume * $lines[$i]->qty_shipped.' '.measuringUnitString(0, "volume", $lines[$i]->volume_units);
- } else {
- print ' ';
- }
- print ' ';
-
- // Size
- //print ''.$lines[$i]->volume*$lines[$i]->qty_shipped.' '.measuringUnitString(0, "volume", $lines[$i]->volume_units).' ';
-
- if ($action == 'editline' && $lines[$i]->id == $line_id) {
- print '';
- print ' ';
- } elseif ($object->statut == Expedition::STATUS_DRAFT) {
- // edit-delete buttons
- print '';
- print 'id.'">'.img_edit().' ';
- print ' ';
- print '';
- print 'id.'">'.img_delete().' ';
- print ' ';
-
- // Display lines extrafields
- if (!empty($rowExtrafieldsStart)) {
- print $rowExtrafieldsStart;
- print $rowExtrafieldsView;
- print $rowEnd;
- }
- }
- print " ";
-
- // Display lines extrafields.
- // $line is a line of shipment
- if (!empty($extrafields)) {
- $colspan = 6;
- if ($origin && $origin_id > 0) {
- $colspan++;
- }
- if (isModEnabled('productbatch')) {
- $colspan++;
- }
- if (isModEnabled('stock')) {
- $colspan++;
- }
-
- $line = $lines[$i];
- $line->fetch_optionals();
-
- // TODO Show all in same line by setting $display_type = 'line'
- if ($action == 'editline' && $line->id == $line_id) {
- print $lines[$i]->showOptionals($extrafields, 'edit', array('colspan'=>$colspan), !empty($indiceAsked) ? $indiceAsked : '', '', 0, 'card');
} else {
- print $lines[$i]->showOptionals($extrafields, 'view', array('colspan'=>$colspan), !empty($indiceAsked) ? $indiceAsked : '', '', 0, 'card');
+ print '