";
-
- end_table(); // outertable
return $total_gl_value;
}
@@ -289,20 +351,23 @@ 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)
- $result = get_grn_items(0, $supp_trans->supplier_id, true);
- else
- $result = get_grn_items(0, $supp_trans->supplier_id, false, true);
-
+ if ($supp_trans->trans_type == ST_SUPPINVOICE) // outstanding grns and eventually for selected invoice
+ $result = get_grn_items(0, $supp_trans->supplier_id, true, false, $supp_trans->trans_no);
+ else
+ { // only invoiced
+ 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']);
+ elseif ($supp_trans->src_docs)
+ $result = get_grn_items(0, $supp_trans->supplier_id, false, true, array_keys($supp_trans->src_docs));
+ else
+ $result = get_grn_items(0, $supp_trans->supplier_id, false, true);
+ }
if (db_num_rows($result) == 0)
{
return false;
}
-
- /*Set up a table to show the outstanding GRN items for selection */
+ /*Set up a table to show the outstanding GRN items for selection */
while ($myrow = db_fetch($result))
{
$grn_already_on_invoice = false;
@@ -314,45 +379,53 @@ function display_grn_items_for_selection(&$supp_trans, $k)
$grn_already_on_invoice = true;
}
}
+
if ($grn_already_on_invoice == false)
{
-
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(ST_SUPPRECEIVE, $myrow["grn_batch_id"]), "nowrap align='right'");
+ hidden('qty_recd'.$n, $myrow["qty_recd"]);
+ hidden('item_code'.$n, $myrow["item_code"]);
+ hidden('item_description'.$n, $myrow["description"]);
+ hidden('prev_quantity_inv'.$n, $myrow['quantity_inv']);
+ hidden('order_price'.$n, $myrow['unit_price']);
+ hidden('std_cost_unit'.$n, $myrow['std_cost_unit']);
+ hidden('po_detail_item'.$n, $myrow['po_detail_item']);
+ label_cell(get_trans_view_str(ST_PURCHORDER, $myrow["purch_order_no"]), "nowrap align='right'");
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
+ 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,
+ sprintf(_('You are about to remove all yet non-invoiced items from delivery line #%d. This operation also irreversibly changes related order line. Do you want to continue ?'), $n));
+ }
end_row();
}
}
@@ -368,22 +441,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,39 +464,49 @@ 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 "
";
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 "
";
- end_table(); // outertable
return $total_grn_value;
}
//--------------------------------------------------------------------------------------------------
-function get_duedate_from_terms(&$supp_trans)
+function get_duedate_from_terms(&$trans)
{
- if (!is_date($supp_trans->tran_date))
+ $date = get_class($trans) == 'purch_order' ? $trans->orig_order_date : $trans->tran_date;
+
+ if (!is_date($date))
{
- $supp_trans->tran_date = Today();
+ $date = Today();
}
- if (substr( $supp_trans->terms, 0, 1) == "1")
+ if ($trans->terms['day_in_following_month'])
{ /*Its a day in the following month when due */
- $supp_trans->due_date = add_days(end_month($supp_trans->tran_date), (int) substr( $supp_trans->terms,1));
+ $trans->due_date =
+ add_days(end_month($date), $trans->terms["day_in_following_month"]);
}
else
{ /*Use the Days Before Due to add to the invoice date */
- $supp_trans->due_date = add_days($supp_trans->tran_date, (int) substr( $supp_trans->terms,1));
+ $trans->due_date = add_days($date, $trans->terms["days_before_due"]);
}
}
//--------------------------------------------------------------------------------------------------
-?>
\ No newline at end of file