";
-
- end_table(); // outertable
return $total_gl_value;
}
@@ -289,13 +332,18 @@ function display_gl_items(&$supp_trans, $mode=0)
function display_grn_items_for_selection(&$supp_trans, $k)
{
- global $table_style;
- if ($supp_trans->is_invoice)
+ if ($supp_trans->trans_type == ST_SUPPINVOICE)
$result = get_grn_items(0, $supp_trans->supplier_id, true);
- else
- $result = get_grn_items(0, $supp_trans->supplier_id, false, true);
-
+ else
+ {
+ if (isset($_POST['receive_begin']) && isset($_POST['receive_end']))
+ $result = get_grn_items(0, $supp_trans->supplier_id, false, true, 0, $_POST['receive_begin'], $_POST['receive_end']);
+ else if (isset($_POST['invoice_no']))
+ $result = get_grn_items(0, $supp_trans->supplier_id, false, true, $_POST['invoice_no']);
+ else
+ $result = get_grn_items(0, $supp_trans->supplier_id, false, true);
+ }
if (db_num_rows($result) == 0)
{
return false;
@@ -320,39 +368,48 @@ function display_grn_items_for_selection(&$supp_trans, $k)
alt_table_row_color($k);
$n = $myrow["id"];
- label_cell(get_trans_view_str(25, $myrow["grn_batch_id"]));
- label_cell($myrow["id"].
- hidden('qty_recd'.$n, $myrow["qty_recd"], false).
- hidden('item_code'.$n, $myrow["item_code"], false).
- hidden('item_description'.$n, $myrow["description"], false).
- hidden('prev_quantity_inv'.$n, $myrow['quantity_inv'], false).
- hidden('order_price'.$n, $myrow['unit_price'], false).
- hidden('std_cost_unit'.$n, $myrow['std_cost_unit'], false).
- hidden('po_detail_item'.$n, $myrow['po_detail_item'], false));
- label_cell(get_trans_view_str(systypes::po(), $myrow["purch_order_no"]));
+ label_cell(get_trans_view_str(25, $myrow["grn_batch_id"]).
+ hidden('qty_recd'.$n, $myrow["qty_recd"], false).
+ hidden('item_code'.$n, $myrow["item_code"], false).
+ hidden('item_description'.$n, $myrow["description"], false).
+ hidden('prev_quantity_inv'.$n, $myrow['quantity_inv'], false).
+ hidden('order_price'.$n, $myrow['unit_price'], false).
+ hidden('std_cost_unit'.$n, $myrow['std_cost_unit'], false).
+ hidden('po_detail_item'.$n, $myrow['po_detail_item'], false).
+ hidden('location'.$n, $myrow["loc_code"], false));
+ label_cell(get_trans_view_str(ST_PURCHORDER, $myrow["purch_order_no"]));
label_cell($myrow["item_code"]);
label_cell($myrow["description"]);
label_cell(sql2date($myrow["delivery_date"]));
$dec = get_qty_dec($myrow["item_code"]);
qty_cell($myrow["qty_recd"], false, $dec);
qty_cell($myrow["quantity_inv"], false, $dec);
- if ($supp_trans->is_invoice)
+ if ($supp_trans->trans_type == ST_SUPPINVOICE)
qty_cells(null, 'this_quantity_inv'.$n, number_format2($myrow["qty_recd"] - $myrow["quantity_inv"], $dec),
null, null, $dec);
else
qty_cells(null, 'This_QuantityCredited'.$n, number_format2(max($myrow["quantity_inv"], 0), $dec),
null, null, $dec);
- amount_cells(null, 'ChgPrice'.$n, price_format($myrow["unit_price"]));
- if ($supp_trans->is_invoice)
- amount_cell(round($myrow["unit_price"] * ($myrow["qty_recd"] - $myrow["quantity_inv"]), user_price_dec()));
- else
- amount_cell(round($myrow["unit_price"] * max($myrow['quantity_inv'], 0), user_price_dec()));
- if ($supp_trans->is_invoice)
+ $dec2 = 0;
+ if ($supp_trans->trans_type == ST_SUPPINVOICE)
+ {
+ amount_cells(null, 'ChgPrice'.$n, price_decimal_format($myrow["unit_price"], $dec2), null, null, $dec2);
+ amount_cell(round2($myrow["unit_price"] * ($myrow["qty_recd"] - $myrow["quantity_inv"]), user_price_dec()));
+ }
+ else
+ {
+ amount_cells(null, 'ChgPrice'.$n, price_decimal_format($myrow["act_price"], $dec2), null, null, $dec2);
+ amount_cell(round2($myrow["act_price"] * max($myrow['quantity_inv'], 0), user_price_dec()));
+ }
+ if ($supp_trans->trans_type == ST_SUPPINVOICE)
submit_cells('grn_item_id'.$n, _("Add"), '', _("Add to Invoice"), true);
else
submit_cells('grn_item_id'.$n, _("Add"), '', _("Add to Credit Note"), true);
- if ($supp_trans->is_invoice && $_SESSION["wa_current_user"]->access == 2) // Added 2008-10-18 by Joe Hunt. Only admins can remove GRNs
+ if (($supp_trans->trans_type == ST_SUPPINVOICE) && $_SESSION["wa_current_user"]->can_access('SA_GRNDELETE')) { // Added 2008-10-18 by Joe Hunt. Special access rights needed.
submit_cells('void_item_id'.$n, _("Remove"), '', _("WARNING! Be careful with removal. The operation is executed immediately and cannot be undone !!!"), true);
+ submit_js_confirm('void_item_id'.$n,
+ _('You are about to remove all yet non-invoiced items from selected delivery line. This operation also irreversibly changes related order line. Do you want to continue ?'));
+ }
end_row();
}
}
@@ -368,22 +425,22 @@ function display_grn_items_for_selection(&$supp_trans, $k)
function display_grn_items(&$supp_trans, $mode=0)
{
- global $table_style, $path_to_root;
+ global $path_to_root;
$ret = true;
// if displaying in form, and no items, exit
if (($mode == 2 || $mode == 3) && count($supp_trans->grn_items) == 0)
return 0;
- br(1);
- start_table("width=95%");
- echo "
"; // outertable
+
+ start_outer_table("style='border:1px solid #cccccc;' width=95%");
+
$heading2 = "";
if ($mode == 1)
{
- if ($supp_trans->is_invoice)
+ if ($supp_trans->trans_type == ST_SUPPINVOICE)
{
$heading = _("Items Received Yet to be Invoiced");
- if ($_SESSION["wa_current_user"]->access == 2) // Added 2008-10-18 by Joe Hunt. Only admins can remove GRNs
+ if ($_SESSION["wa_current_user"]->can_access('SA_GRNDELETE')) // Added 2008-10-18 by Joe Hunt. Only admins can remove GRNs
$heading2 = _("WARNING! Be careful with removal. The operation is executed immediately and cannot be undone !!!");
}
else
@@ -391,37 +448,46 @@ function display_grn_items(&$supp_trans, $mode=0)
}
else
{
- if ($supp_trans->is_invoice)
+ if ($supp_trans->trans_type == ST_SUPPINVOICE)
$heading = _("Received Items Charged on this Invoice");
else
$heading = _("Received Items Credited on this Note");
}
- echo "
";
+ start_table(TABLESTYLE, "width=95%");
if ($mode == 1)
{
- $th = array(_("Delivery"), _("Sequence #"), _("P.O."), _("Item"), _("Description"),
+ $th = array(_("Delivery"), _("P.O."), _("Item"), _("Description"),
_("Received On"), _("Quantity Received"), _("Quantity Invoiced"),
- _("Qty Yet To Invoice"), _("Order Price"), _("Total"), "");
- if ($supp_trans->is_invoice && $_SESSION["wa_current_user"]->access == 2) // Added 2008-10-18 by Joe Hunt. Only admins can remove GRNs
+ _("Qty Yet To Invoice"), $supp_trans->tax_included ? _("Price after Tax") : _("Price before Tax"),
+ _("Total"), "");
+ if (($supp_trans->trans_type == ST_SUPPINVOICE) && $_SESSION["wa_current_user"]->can_access('SA_GRNDELETE')) // Added 2008-10-18 by Joe Hunt. Only admins can remove GRNs
$th[] = "";
- if (!$supp_trans->is_invoice)
+ if ($supp_trans->trans_type == ST_SUPPCREDIT)
{
$th[8] = _("Qty Yet To Credit");
}
@@ -443,35 +509,34 @@ function display_grn_items(&$supp_trans, $mode=0)
alt_table_row_color($k);
$grn_batch = get_grn_batch_from_item($entered_grn->id);
- label_cell(get_trans_view_str(25,$grn_batch));
+ label_cell(get_trans_view_str(ST_SUPPRECEIVE,$grn_batch));
if ($mode == 1)
{
- label_cell($entered_grn->id);
- label_cell(""); // PO
- }
+ $row = get_grn_batch($grn_batch);
+ label_cell($row['purch_order_no']); // PO
+ }
label_cell($entered_grn->item_code);
label_cell($entered_grn->item_description);
$dec = get_qty_dec($entered_grn->item_code);
if ($mode == 1)
{
- label_cell("");
- qty_cell($entered_grn->qty_recd, false, $dec);
+ label_cell(sql2date($row['delivery_date']));
+ qty_cell($entered_grn->qty_recd, false, $dec);
qty_cell($entered_grn->prev_quantity_inv, false, $dec);
}
qty_cell(abs($entered_grn->this_quantity_inv), true, $dec);
- amount_cell($entered_grn->chg_price);
- amount_cell( round($entered_grn->chg_price * abs($entered_grn->this_quantity_inv), user_price_dec()), true);
+ amount_decimal_cell($entered_grn->chg_price);
+ amount_cell( round2($entered_grn->chg_price * abs($entered_grn->this_quantity_inv), user_price_dec()), true);
if ($mode == 1)
{
- edit_button_cell("Delete" . $entered_grn->id, _("Delete"),
- _('Remove item from document'));
- if ($supp_trans->is_invoice && $_SESSION["wa_current_user"]->access == 2)
+ delete_button_cell("Delete" . $entered_grn->id, _("Edit"), _('Edit document line'));
+ if (($supp_trans->trans_type == ST_SUPPINVOICE) && $_SESSION["wa_current_user"]->can_access('SA_GRNDELETE'))
label_cell("");
}
end_row();
- $total_grn_value += round($entered_grn->chg_price * abs($entered_grn->this_quantity_inv),
+ $total_grn_value += round2($entered_grn->chg_price * abs($entered_grn->this_quantity_inv),
user_price_dec());
$i++;
@@ -491,38 +556,43 @@ function display_grn_items(&$supp_trans, $mode=0)
$colspan = 5;
label_row(_("Total"), price_format($total_grn_value),
"colspan=$colspan align=right", "nowrap align=right");
- echo "
";
if (!$ret)
{
- if ($supp_trans->is_invoice)
- display_note(_("There are no outstanding items received from this supplier that have not been invoiced by them."), 0, 1);
+ start_row();
+ echo "
";
+ if ($supp_trans->trans_type == ST_SUPPINVOICE)
+ display_note(_("There are no outstanding items received from this supplier that have not been invoiced by them."), 0, 0);
else
{
display_note(_("There are no received items for the selected supplier that have been invoiced."));
- display_note(_("Credits can only be applied to invoiced items."), 0, 1);
+ display_note(_("Credits can only be applied to invoiced items."), 0, 0);
}
+ echo "