X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fpo_entry_items.php;h=4a5aa39dea106fac0d1171781303a6f8ecc8066e;hb=0e15ca861655a6403f12a90f187c3fc00f35949d;hp=d14769b10af55340e69188cbae0a100cecec03d9;hpb=6a12518d87e341c16dd2e2898f36e74320369d71;p=fa-stable.git diff --git a/purchasing/po_entry_items.php b/purchasing/po_entry_items.php index d14769b1..4a5aa39d 100644 --- a/purchasing/po_entry_items.php +++ b/purchasing/po_entry_items.php @@ -23,14 +23,17 @@ set_page_security( @$_SESSION['PO']->trans_type, ST_SUPPINVOICE => 'SA_SUPPLIERINVOICE'), array( 'NewOrder' => 'SA_PURCHASEORDER', 'ModifyOrderNumber' => 'SA_PURCHASEORDER', + 'AddedID' => 'SA_PURCHASEORDER', 'NewGRN' => 'SA_GRN', - 'NewInvoice' => 'SA_SUPPLIERINVOICE') + 'AddedGRN' => 'SA_GRN', + 'NewInvoice' => 'SA_SUPPLIERINVOICE', + 'AddedPI' => 'SA_SUPPLIERINVOICE') ); $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(); if (isset($_GET['ModifyOrderNumber']) && is_numeric($_GET['ModifyOrderNumber'])) { @@ -57,6 +60,9 @@ if (isset($_GET['ModifyOrderNumber']) && is_numeric($_GET['ModifyOrderNumber'])) page($_SESSION['page_title'], false, false, "", $js); +if (isset($_GET['ModifyOrderNumber'])) + check_is_editable(ST_PURCHORDER, $_GET['ModifyOrderNumber']); + //--------------------------------------------------------------------------------------------------- check_db_has_suppliers(_("There are no suppliers defined in the system.")); @@ -128,7 +134,7 @@ if (isset($_GET['AddedID'])) display_note(get_gl_view_str($trans_type, $trans_no, _("View the GL Journal Entries for this Invoice")), 1); hyperlink_params("$path_to_root/purchasing/supplier_payment.php", _("Entry supplier &payment for this invoice"), - "PInvoice=".$trans_no); + "trans_type=$trans_type&PInvoice=".$trans_no); hyperlink_params("$path_to_root/admin/attachments.php", _("Add an Attachment"), "filterType=$trans_type&trans_no=$trans_no"); @@ -327,17 +333,16 @@ function can_commit() set_focus('supplier_id'); return false; } - + if (!is_date($_POST['OrderDate'])) { display_error(_("The entered order date is invalid.")); set_focus('OrderDate'); return false; } - - if ($_SESSION['PO']->trans_type != ST_PURCHORDER && !is_date_in_fiscalyear($_POST['OrderDate'])) - { - display_error(_("The entered date is not in fiscal year")); + if (($_SESSION['PO']->trans_type == ST_SUPPRECEIVE || $_SESSION['PO']->trans_type == ST_SUPPINVOICE) + && !is_date_in_fiscalyear($_POST['OrderDate'])) { + display_error(_("The entered date is out of fiscal year or is closed for further data entry.")); set_focus('OrderDate'); return false; } @@ -348,25 +353,17 @@ function can_commit() set_focus('due_date'); return false; } - + if (!$_SESSION['PO']->order_no) { - if (!$Refs->is_valid(get_post('ref'))) - { - display_error(_("There is no reference entered for this purchase order.")); - set_focus('ref'); - return false; - } - - if (!is_new_reference(get_post('ref'), $_SESSION['PO']->trans_type)) + if (!check_reference(get_post('ref'), $_SESSION['PO']->trans_type)) { - display_error(_("The entered reference is already in use.")); set_focus('ref'); return false; } } - - if ($_SESSION['PO']->trans_type == ST_SUPPINVOICE && !$Refs->is_valid(get_post('supp_ref'))) + + if ($_SESSION['PO']->trans_type == ST_SUPPINVOICE && trim(get_post('supp_ref')) == false) { display_error(_("You must enter a supplier's invoice reference.")); set_focus('supp_ref'); @@ -398,12 +395,16 @@ function can_commit() display_error (_("The order cannot be placed because there are no lines entered on this order.")); return false; } - + if (floatcmp(input_num('prep_amount'), $_SESSION['PO']->get_trans_total()) > 0) + { + display_error(_("Required prepayment is greater than total invoice value.")); + set_focus('prep_amount'); + return false; + } + return true; } -//--------------------------------------------------------------------------------------------------- - function handle_commit_order() { $cart = &$_SESSION['PO']; @@ -411,70 +412,19 @@ function handle_commit_order() if (can_commit()) { copy_to_cart(); - if ($cart->trans_type != ST_PURCHORDER) { - // for direct grn/invoice set same dates for lines as for whole document - foreach ($cart->line_items as $line_no =>$line) - $cart->line_items[$line_no]->req_del_date = $cart->orig_order_date; - } + new_doc_date($cart->orig_order_date); if ($cart->order_no == 0) { // new po/grn/invoice - /*its a new order to be inserted */ - $ref = $cart->reference; - if ($cart->trans_type != ST_PURCHORDER) { - $cart->reference = 'auto'; - begin_transaction(); // all db changes as single transaction for direct document - } - $order_no = add_po($cart); - new_doc_date($cart->orig_order_date); - $cart->order_no = $order_no; - - if ($cart->trans_type == ST_PURCHORDER) { - unset($_SESSION['PO']); - meta_forward($_SERVER['PHP_SELF'], "AddedID=$order_no"); - } - //Direct GRN - if ($cart->trans_type == ST_SUPPRECEIVE) - $cart->reference = $ref; - $cart->Comments = $cart->reference; //grn does not hold supp_ref - foreach($cart->line_items as $key => $line) - $cart->line_items[$key]->receive_qty = $line->quantity; - $grn_no = add_grn($cart); - if ($cart->trans_type == ST_SUPPRECEIVE) { - commit_transaction(); // save PO+GRN + $trans_no = add_direct_supp_trans($cart); + if ($trans_no) { unset($_SESSION['PO']); - meta_forward($_SERVER['PHP_SELF'], "AddedGRN=$grn_no"); - } -// Direct Purchase Invoice - $inv = new supp_trans(ST_SUPPINVOICE); - $inv->Comments = $cart->Comments; - $inv->supplier_id = $cart->supplier_id; - $inv->tran_date = $cart->orig_order_date; - $inv->due_date = $cart->due_date; - $inv->reference = $ref; - $inv->supp_reference = $cart->supp_ref; - $inv->tax_included = $cart->tax_included; - $supp = get_supplier($cart->supplier_id); - $inv->tax_group_id = $supp['tax_group_id']; -// $inv->ov_discount 'this isn't used at all' - $inv->ov_amount = $inv->ov_gst = $inv->ov_discount = 0; - - foreach($cart->line_items as $key => $line) { - $inv->add_grn_to_trans($line->grn_item_id, $line->po_detail_rec, $line->stock_id, - $line->item_description, $line->receive_qty, 0, $line->receive_qty, - $line->price, $line->price, true, get_standard_cost($line->stock_id), ''); - $inv->ov_amount += round2(($line->receive_qty * $line->price), user_price_dec()); - } - $taxes = $inv->get_taxes($inv->tax_group_id, 0, false); - foreach( $taxes as $taxitem) { - $inv->ov_gst += round2($taxitem['Value'], user_price_dec()); + if ($cart->trans_type == ST_PURCHORDER) + meta_forward($_SERVER['PHP_SELF'], "AddedID=$trans_no"); + elseif ($cart->trans_type == ST_SUPPRECEIVE) + meta_forward($_SERVER['PHP_SELF'], "AddedGRN=$trans_no"); + else + meta_forward($_SERVER['PHP_SELF'], "AddedPI=$trans_no"); } - $inv_no = add_supp_invoice($inv); - commit_transaction(); // save PO+GRN+PI - // FIXME payment for cash terms. (Needs cash account selection) - unset($_SESSION['PO']); - meta_forward($_SERVER['PHP_SELF'], "AddedPI=$inv_no"); - } - else { // order modification - + } else { // order modification $order_no = update_po($cart); unset($_SESSION['PO']); meta_forward($_SERVER['PHP_SELF'], "AddedID=$order_no&Updated=1"); @@ -482,6 +432,11 @@ function handle_commit_order() } } //--------------------------------------------------------------------------------------------------- +if (isset($_POST['update'])) { + copy_to_cart(); + $Ajax->activate('items_table'); +} + $id = find_submit('Delete'); if ($id != -1) handle_delete_item($id); @@ -516,6 +471,12 @@ echo "
"; display_po_items($_SESSION['PO']); start_table(TABLESTYLE2); + + +if ($_SESSION['PO']->trans_type == ST_SUPPINVOICE) { + cash_accounts_list_row(_("Payment:"), 'cash_account', null, false, _('Delayed')); +} + textarea_row(_("Memo:"), 'Comments', null, 70, 4); end_table(1); @@ -549,4 +510,3 @@ div_end(); end_form(); end_page(); -?>