MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
-$page_security = 11;
-$path_to_root="..";
+$page_security = 'SA_GRN';
+$path_to_root = "..";
include_once($path_to_root . "/purchasing/includes/po_class.inc");
include_once($path_to_root . "/includes/session.inc");
include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc");
$js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
$js .= get_js_open_window(900, 500);
-if ($use_date_picker)
+if (user_use_date_picker())
$js .= get_js_date_picker();
-page(_("Receive Purchase Order Items"), false, false, "", $js);
+
+//--------------------------------------------------------------------------------------------------
+
+if (isset($_GET['PONumber']) && $_GET['PONumber'] > 0 && !isset($_POST['Update']))
+{
+ $_SESSION['page_title'] = _($help_context = "Receive Purchase Order Items");
+ create_cart(ST_PURCHORDER, $_GET['PONumber']);
+ $_SESSION['PO']->trans_type = ST_SUPPRECEIVE;
+ $_SESSION['PO']->reference = $Refs->get_next(ST_SUPPRECEIVE,
+ array('date' => Today(), 'supplier' => $_SESSION['PO']->supplier_id));
+ foreach ($_SESSION['PO']->line_items as $line)
+ $line->quantity = $line->qty_ordered - $line->qty_received;
+ copy_from_cart();
+}
+elseif (isset($_GET['ModifyGRN']) && $_GET['ModifyGRN'] > 0 && !isset($_POST['Update']))
+{
+ $_SESSION['page_title'] = _($help_context = "Modify GRN #") . $_GET['ModifyGRN'];
+ create_cart(ST_SUPPRECEIVE, $_GET['ModifyGRN']);
+ copy_from_cart();
+}
+
+page($_SESSION['page_title'], false, false, "", $js);
//---------------------------------------------------------------------------------------------------------------
-if (isset($_GET['AddedID']))
+if (isset($_GET['AddedID']) || isset($_GET['UpdatedID']))
{
- $grn = $_GET['AddedID'];
- $trans_type = 25;
+ $new = isset($_GET['AddedID']);
+ $grn = $_GET[$new ? 'AddedID' : 'UpdatedID'];
+ $trans_type = ST_SUPPRECEIVE;
display_notification_centered(_("Purchase Order Delivery has been processed"));
display_note(get_trans_view_str($trans_type, $grn, _("&View this Delivery")));
+
+ $clearing_act = get_company_pref('grn_clearing_act');
+ if ($clearing_act)
+ display_note(get_gl_view_str($trans_type, $grn, _("View the GL Journal Entries for this Delivery")), 1);
- //echo "<BR>";
- //echo get_gl_view_str(25, $grn, _("View the GL &Journal Entries for this Delivery"));
+ hyperlink_params("$path_to_root/purchasing/supplier_invoice.php", _("Entry purchase &invoice for this receival"), "New=1");
-// echo "<br>";
- hyperlink_no_params("$path_to_root/purchasing/inquiry/po_search.php", _("Select a different &purchase order for receiving items against"));
+ if ($new)
+ hyperlink_no_params("$path_to_root/purchasing/inquiry/po_search.php", _("Select another &purchase order for receiving items against"));
+ else
+ hyperlink_no_params("$path_to_root/purchasing/inquiry/supplier_inquiry.php", _("Select another &document for edition"));
display_footer_exit();
}
//--------------------------------------------------------------------------------------------------
-if ((!isset($_GET['PONumber']) || $_GET['PONumber'] == 0) && !isset($_SESSION['PO']))
-//if (isset($_GET['PONumber']) && !$_GET['PONumber'] > 0 && !isset($_SESSION['PO']))
+if ((!isset($_GET['PONumber']) || $_GET['PONumber'] == 0) && (!isset($_GET['ModifyGRN']) || $_GET['ModifyGRN'] == 0) && !isset($_SESSION['PO']))
{
- die (_("This page can only be opened if a purchase order has been selected. Please select a purchase order first."));
+ die (_("This page can only be opened with valid Purchase Order or GRN number."));
}
//--------------------------------------------------------------------------------------------------
function display_po_receive_items()
{
- global $table_style;
-
div_start('grn_items');
- start_table("colspan=7 $table_style width=90%");
- $th = array(_("Item Code"), _("Description"), _("Ordered"), _("Units"), _("Received"),
- _("Outstanding"), _("This Delivery"), _("Price"), _("Total"));
+ start_table(TABLESTYLE, "colspan=7 width='90%'");
+ $mod_grn = $_SESSION['PO']->grn_id;
+
+ if ($mod_grn) // modify GRN
+ $th = array(_("Item Code"), _("Description"), _("Ordered"), _("Units"), _("Received"), _("Invoiced"), _("This Delivery"), _("Price"), _("Total"));
+ else
+ $th = array(_("Item Code"), _("Description"), _("Ordered"), _("Units"), _("Received"), _("Outstanding"), _("This Delivery"), _("Price"), _("Total"));
table_header($th);
- /*show the line items on the order with the quantity being received for modification */
+ /* show the line items on the order with the quantity being received for modification */
$total = 0;
$k = 0; //row colour counter
- if (count($_SESSION['PO']->line_items)> 0 )
+ if (count($_SESSION['PO']->line_items) > 0 )
{
- foreach ($_SESSION['PO']->line_items as $ln_itm)
+ foreach ($_SESSION['PO']->line_items as $line_no => $ln_itm)
{
alt_table_row_color($k);
- $qty_outstanding = $ln_itm->quantity - $ln_itm->qty_received;
+ $qty_outstanding = $ln_itm->qty_ordered - $ln_itm->qty_received;
- if ($ln_itm->receive_qty == 0)
+ if (!isset($_POST['Update']) && !isset($_POST['ProcessGoodsReceived']) && $ln_itm->quantity == 0)
{ //If no quantites yet input default the balance to be received
- $ln_itm->receive_qty = $qty_outstanding;
+ $ln_itm->quantity = $qty_outstanding;
}
- $line_total = ($ln_itm->receive_qty * $ln_itm->price);
+ $line_total = ($ln_itm->quantity * $ln_itm->price);
$total += $line_total;
label_cell($ln_itm->stock_id);
- if ($qty_outstanding > 0)
+ if ($mod_grn || $qty_outstanding > 0)
text_cells(null, $ln_itm->stock_id . "Desc", $ln_itm->item_description, 30, 50);
else
label_cell($ln_itm->item_description);
+
$dec = get_qty_dec($ln_itm->stock_id);
- qty_cell($ln_itm->quantity, false, $dec);
+ qty_cell($ln_itm->qty_ordered, false, $dec);
label_cell($ln_itm->units);
qty_cell($ln_itm->qty_received, false, $dec);
- qty_cell($qty_outstanding, false, $dec);
+ if ($mod_grn)
+ qty_cell($ln_itm->qty_inv, false, $dec);
+ else
+ qty_cell($qty_outstanding, false, $dec);
- if ($qty_outstanding > 0)
- qty_cells(null, $ln_itm->line_no, number_format2($ln_itm->receive_qty, $dec), "align=right", null, $dec);
+ if ($mod_grn || $qty_outstanding > 0)
+ qty_cells(null, $line_no, number_format2($ln_itm->quantity, $dec), "align=right", null, $dec);
else
- label_cell(number_format2($ln_itm->receive_qty, $dec), "align=right");
+ label_cell(number_format2($ln_itm->quantity, $dec), "align=right");
- amount_cell($ln_itm->price);
+ amount_decimal_cell($ln_itm->price);
amount_cell($line_total);
end_row();
}
}
- $display_total = number_format2($total,user_price_dec());
- label_row(_("Total value of items received"), $display_total, "colspan=8 align=right",
- "nowrap align=right");
+ $colspan = count($th)-1;
+
+ $display_sub_total = price_format($total/* + input_num('freight_cost')*/);
+
+ label_row(_("Sub-total"), $display_sub_total, "colspan=$colspan align=right","align=right");
+ $taxes = $_SESSION['PO']->get_taxes(input_num('freight_cost'), true);
+
+ $tax_total = display_edit_tax_items($taxes, $colspan, $_SESSION['PO']->tax_included);
+
+ $display_total = price_format(($total + input_num('freight_cost') + $tax_total));
+
+ start_row();
+ label_cells(_("Amount Total"), $display_total, "colspan=$colspan align='right'","align='right'");
+ end_row();
end_table();
div_end();
}
function check_po_changed()
{
- /*Now need to check that the order details are the same as they were when they were read into the Items array. If they've changed then someone else must have altered them */
- // Sherifoz 22.06.03 Compare against COMPLETED items only !!
+ /*Now need to check that the order details are the same as they were when they were read
+ into the Items array. If they've changed then someone else must have altered them */
+ // Compare against COMPLETED items only !!
// Otherwise if you try to fullfill item quantities separately will give error.
- $sql = "SELECT item_code, quantity_ordered, quantity_received, qty_invoiced
- FROM ".TB_PREF."purch_order_details
- WHERE order_no=" . $_SESSION['PO']->order_no
- ." ORDER BY po_detail_item";
-
- $result = db_query($sql, "could not query purch order details");
- check_db_error("Could not check that the details of the purchase order had not been changed by another user ", $sql);
+ $result = get_po_items($_SESSION['PO']->order_no);
- $line_no = 1;
+ $line_no = 0;
while ($myrow = db_fetch($result))
{
$ln_item = $_SESSION['PO']->line_items[$line_no];
// only compare against items that are outstanding
- $qty_outstanding = $ln_item->quantity - $ln_item->qty_received;
+ $qty_outstanding = $ln_item->qty_ordered - $ln_item->qty_received;
if ($qty_outstanding > 0)
{
if ($ln_item->qty_inv != $myrow["qty_invoiced"] ||
$ln_item->stock_id != $myrow["item_code"] ||
- $ln_item->quantity != $myrow["quantity_ordered"] ||
- $ln_item->qty_received != $myrow["quantity_received"])
+ $ln_item->qty_ordered != $myrow["quantity_ordered"] ||
+ $ln_item->qty_received + @$ln_item->qty_old != $myrow["quantity_received"])
{
return true;
}
function can_process()
{
+ global $SysPrefs;
+
if (count($_SESSION['PO']->line_items) <= 0)
{
display_error(_("There is nothing to process. Please enter valid quantities greater than zero."));
return false;
}
- if (!is_date($_POST['DefaultReceivedDate']))
+ if (!is_date($_POST['tran_date']))
{
display_error(_("The entered date is invalid."));
- set_focus('DefaultReceivedDate');
+ set_focus('tran_date');
return false;
}
-
- if (!references::is_valid($_POST['ref']))
- {
- display_error(_("You must enter a reference."));
- set_focus('ref');
+ if (!is_date_in_fiscalyear($_POST['tran_date'])) {
+ display_error(_("The entered date is out of fiscal year or is closed for further data entry."));
+ set_focus('tran_date');
return false;
}
- if (!is_new_reference($_POST['ref'], 25))
+ if (!check_reference($_POST['ref'], ST_SUPPRECEIVE, $_SESSION['PO']->grn_id))
{
- display_error(_("The entered reference is already in use."));
set_focus('ref');
return false;
}
$something_received = 0;
foreach ($_SESSION['PO']->line_items as $order_line)
{
- if ($order_line->receive_qty > 0)
+ if ($order_line->quantity > 0)
{
$something_received = 1;
break;
$delivery_qty_too_large = 0;
foreach ($_SESSION['PO']->line_items as $order_line)
{
- if ($order_line->receive_qty+$order_line->qty_received >
- $order_line->quantity * (1+ (sys_prefs::over_receive_allowance() / 100)))
+ if ($order_line->quantity+$order_line->qty_received >
+ $order_line->qty_ordered * (1+ ($SysPrefs->over_receive_allowance() / 100)))
{
$delivery_qty_too_large = 1;
break;
}
elseif ($delivery_qty_too_large == 1)
{
- display_error(_("Entered quantities cannot be greater than the quantity entered on the purchase order including the allowed over-receive percentage") . " (" . sys_prefs::over_receive_allowance() ."%)."
+ display_error(_("Entered quantities cannot be greater than the quantity entered on the purchase order including the allowed over-receive percentage") . " (" . $SysPrefs->over_receive_allowance() ."%)."
. "<br>" .
_("Modify the ordered items on the purchase order if you wish to increase the quantities."));
return false;
if (check_po_changed())
{
display_error(_("This order has been changed or invoiced since this delivery was started to be actioned. Processing halted. To enter a delivery against this purchase order, it must be re-selected and re-read again to update the changes made by the other user."));
+
hyperlink_no_params("$path_to_root/purchasing/inquiry/po_search.php",
_("Select a different purchase order for receiving goods against"));
- hyperlink_params("$path_to_root/purchasing/po_receive_items.php",
- _("Re-Read the updated purchase order for receiving goods against"),
- "PONumber=" . $_SESSION['PO']->order_no);
+
+ if (!$_SESSION['PO']->grn_id)
+ hyperlink_params("$path_to_root/purchasing/po_receive_items.php",
+ _("Re-Read the updated purchase order for receiving goods against"),
+ "PONumber=" . $_SESSION['PO']->order_no);
+ else
+ hyperlink_params("$path_to_root/purchasing/po_receive_items.php",
+ _("Re-Read the GRN for reedition"),
+ "ModifyGRN=" . $_SESSION['PO']->grn_id);
+
unset($_SESSION['PO']->line_items);
unset($_SESSION['PO']);
unset($_POST['ProcessGoodsReceived']);
$Ajax->activate('_page_body');
display_footer_exit();
}
+
+ $grn = &$_SESSION['PO'];
+ $grn->tran_date = $_POST['tran_date'];
+ $grn->reference = $_POST['ref'];
+ $grn->Location = $_POST['Location'];
+ $grn->ex_rate = input_num('_ex_rate', null);
- $grn = add_grn($_SESSION['PO'], $_POST['DefaultReceivedDate'],
- $_POST['ref'], $_POST['Location']);
+ $trans_no = write_grn($grn);
+ $new = $grn->grn_id == 0;
+ new_doc_date($_POST['tran_date']);
unset($_SESSION['PO']->line_items);
unset($_SESSION['PO']);
- meta_forward($_SERVER['PHP_SELF'], "AddedID=$grn");
-}
-
-//--------------------------------------------------------------------------------------------------
-
-if (isset($_GET['PONumber']) && $_GET['PONumber'] > 0 && !isset($_POST['Update']))
-{
-
- create_new_po();
-
- /*read in all the selected order into the Items cart */
- read_po($_GET['PONumber'], $_SESSION['PO']);
+ if ($new)
+ meta_forward($_SERVER['PHP_SELF'], "AddedID=$trans_no");
+ else
+ meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$trans_no");
}
//--------------------------------------------------------------------------------------------------
if (isset($_POST['Update']) || isset($_POST['ProcessGoodsReceived']))
{
-
- /* if update quantities button is hit page has been called and ${$line->line_no} would have be
+ /* if update quantities button is hit page has been called and ${$line_no} would have be
set from the post to the quantity to be received in this receival*/
- foreach ($_SESSION['PO']->line_items as $line)
+ foreach ($_SESSION['PO']->line_items as $line_no => $line)
{
- if( ($line->quantity - $line->qty_received)>0) {
- $_POST[$line->line_no] = max($_POST[$line->line_no], 0);
- if (!check_num($line->line_no))
- $_POST[$line->line_no] = number_format2(0, get_qty_dec($line->stock_id));
+ if( ($line->qty_ordered - $line->qty_received) > 0) {
+ $_POST[$line_no] = max($_POST[$line_no], 0);
+ if (!check_num($line_no))
+ $_POST[$line_no] = number_format2(0, get_qty_dec($line->stock_id));
- if (!isset($_POST['DefaultReceivedDate']) || $_POST['DefaultReceivedDate'] == "")
- $_POST['DefaultReceivedDate'] = Today();
+ if (!isset($_POST['tran_date']) || $_POST['tran_date'] == "")
+ $_POST['tran_date'] = new_doc_date();
- $_SESSION['PO']->line_items[$line->line_no]->receive_qty = input_num($line->line_no);
+ $_SESSION['PO']->line_items[$line_no]->quantity = input_num($line_no);
if (isset($_POST[$line->stock_id . "Desc"]) && strlen($_POST[$line->stock_id . "Desc"]) > 0)
{
- $_SESSION['PO']->line_items[$line->line_no]->item_description = $_POST[$line->stock_id . "Desc"];
+ $_SESSION['PO']->line_items[$line_no]->item_description = $_POST[$line->stock_id . "Desc"];
}
}
}
start_form();
-display_grn_summary($_SESSION['PO'], true);
+edit_grn_summary($_SESSION['PO'], true);
display_heading(_("Items to Receive"));
display_po_receive_items();
echo '<br>';
submit_center_first('Update', _("Update"), '', true);
-submit_center_last('ProcessGoodsReceived', _("Process Receive Items"), _("Clear all GL entry fields"), true);
+submit_center_last('ProcessGoodsReceived', _("Process Receive Items"), _("Clear all GL entry fields"), 'default');
end_form();
//--------------------------------------------------------------------------------------------------
-
end_page();
-?>
-
projects / fa-stable.git / blobdiff