X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=purchasing%2Fsupplier_invoice.php;h=afa2df18da28a0a573c37f9205c2c238e10f9381;hb=510d6e1925c4d1621ae3efd85e117cc9bb4320f0;hp=64a0850f3c531c2125c267afde6f81e16f60e8bc;hpb=c16b7a0f7aa17722568a0695e2fd03a362998372;p=fa-stable.git
diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php
index 64a0850f..afa2df18 100644
--- a/purchasing/supplier_invoice.php
+++ b/purchasing/supplier_invoice.php
@@ -1,7 +1,16 @@
.
+***********************************************************************/
+$page_security = 'SA_SUPPLIERINVOICE';
+$path_to_root = "..";
include_once($path_to_root . "/purchasing/includes/purchasing_db.inc");
@@ -18,7 +27,6 @@ if ($use_date_picker)
$js .= get_js_date_picker();
page(_("Enter Supplier Invoice"), false, false, "", $js);
-
//----------------------------------------------------------------------------------------
check_db_has_suppliers(_("There are no suppliers defined in the system."));
@@ -28,7 +36,7 @@ check_db_has_suppliers(_("There are no suppliers defined in the system."));
if (isset($_GET['AddedID']))
{
$invoice_no = $_GET['AddedID'];
- $trans_type = 20;
+ $trans_type = ST_SUPPINVOICE;
echo "
";
@@ -37,8 +45,12 @@ if (isset($_GET['AddedID']))
display_note(get_gl_view_str($trans_type, $invoice_no, _("View the GL Journal Entries for this Invoice")), 1);
- hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another Invoice"), "New=1");
+ hyperlink_no_params("$path_to_root/purchasing/supplier_payment.php", _("Entry supplier &payment for this invoice"));
+
+ hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another Invoice"), "New=1");
+ hyperlink_params("$path_to_root/admin/attachments.php", _("Add an Attachment"), "filterType=$trans_type&trans_no=$invoice_no");
+
display_footer_exit();
}
@@ -60,30 +72,95 @@ if (isset($_GET['New']))
}
//--------------------------------------------------------------------------------------------------
+function clear_fields()
+{
+ global $Ajax;
+
+ unset($_POST['gl_code']);
+ unset($_POST['dimension_id']);
+ unset($_POST['dimension2_id']);
+ unset($_POST['amount']);
+ unset($_POST['memo_']);
+ unset($_POST['AddGLCodeToTrans']);
+ $Ajax->activate('gl_items');
+ set_focus('gl_code');
+}
+//------------------------------------------------------------------------------------------------
+// GL postings are often entered in the same form to two accounts
+// so fileds are cleared only on user demand.
+//
+if (isset($_POST['ClearFields']))
+{
+ clear_fields();
+}
+
+if (isset($_POST['AddGLCodeToTrans'])){
+
+ $Ajax->activate('gl_items');
+ $input_error = false;
+
+ $sql = "SELECT account_code, account_name FROM ".TB_PREF."chart_master WHERE account_code=".db_escape($_POST['gl_code']);
+ $result = db_query($sql,"get account information");
+ if (db_num_rows($result) == 0)
+ {
+ display_error(_("The account code entered is not a valid code, this line cannot be added to the transaction."));
+ set_focus('gl_code');
+ $input_error = true;
+ }
+ else
+ {
+ $myrow = db_fetch_row($result);
+ $gl_act_name = $myrow[1];
+ if (!check_num('amount'))
+ {
+ display_error(_("The amount entered is not numeric. This line cannot be added to the transaction."));
+ set_focus('amount');
+ $input_error = true;
+ }
+ }
+
+ if (!is_tax_gl_unique(get_post('gl_code'))) {
+ display_error(_("Cannot post to GL account used by more than one tax type."));
+ set_focus('gl_code');
+ $input_error = true;
+ }
+
+ if ($input_error == false)
+ {
+ $_SESSION['supp_trans']->add_gl_codes_to_trans($_POST['gl_code'], $gl_act_name,
+ $_POST['dimension_id'], $_POST['dimension2_id'],
+ input_num('amount'), $_POST['memo_']);
+ set_focus('gl_code');
+ }
+}
+
+//------------------------------------------------------------------------------------------------
function check_data()
{
- If (!$_SESSION['supp_trans']->is_valid_trans_to_post())
+ global $Refs;
+
+ if (!$_SESSION['supp_trans']->is_valid_trans_to_post())
{
display_error(_("The invoice cannot be processed because the there are no items or values on the invoice. Invoices are expected to have a charge."));
return false;
}
- if (!references::is_valid($_SESSION['supp_trans']->reference))
+ if (!$Refs->is_valid($_SESSION['supp_trans']->reference))
{
display_error(_("You must enter an invoice reference."));
set_focus('reference');
return false;
}
- if (!is_new_reference($_SESSION['supp_trans']->reference, 20))
+ if (!is_new_reference($_SESSION['supp_trans']->reference, ST_SUPPINVOICE))
{
display_error(_("The entered reference is already in use."));
set_focus('reference');
return false;
}
- if (!references::is_valid($_SESSION['supp_trans']->supp_reference))
+ if (!$Refs->is_valid($_SESSION['supp_trans']->supp_reference))
{
display_error(_("You must enter a supplier's invoice reference."));
set_focus('supp_reference');
@@ -109,7 +186,11 @@ function check_data()
return false;
}
- $sql = "SELECT Count(*) FROM ".TB_PREF."supp_trans WHERE supplier_id='" . $_SESSION['supp_trans']->supplier_id . "' AND supp_reference='" . $_POST['supp_reference'] . "'";
+ $sql = "SELECT Count(*) FROM ".TB_PREF."supp_trans WHERE supplier_id="
+ .db_escape($_SESSION['supp_trans']->supplier_id) . " AND supp_reference="
+ .db_escape( $_POST['supp_reference'])
+ . " AND ov_amount!=0"; // ignore voided invoice references
+
$result=db_query($sql,"The sql to check for the previous entry of the same invoice failed");
$myrow = db_fetch_row($result);
@@ -146,36 +227,189 @@ if (isset($_POST['PostInvoice']))
handle_commit_invoice();
}
+function check_item_data($n)
+{
+ global $check_price_charged_vs_order_price,
+ $check_qty_charged_vs_del_qty, $SysPrefs;
+ if (!check_num('this_quantity_inv'.$n, 0) || input_num('this_quantity_inv'.$n)==0)
+ {
+ display_error( _("The quantity to invoice must be numeric and greater than zero."));
+ set_focus('this_quantity_inv'.$n);
+ return false;
+ }
+
+ if (!check_num('ChgPrice'.$n))
+ {
+ display_error( _("The price is not numeric."));
+ set_focus('ChgPrice'.$n);
+ return false;
+ }
+
+ $margin = $SysPrefs->over_charge_allowance();
+ if ($check_price_charged_vs_order_price == True)
+ {
+ if ($_POST['order_price'.$n]!=input_num('ChgPrice'.$n)) {
+ if ($_POST['order_price'.$n]==0 ||
+ input_num('ChgPrice'.$n)/$_POST['order_price'.$n] >
+ (1 + ($margin/ 100)))
+ {
+ display_error(_("The price being invoiced is more than the purchase order price by more than the allowed over-charge percentage. The system is set up to prohibit this. See the system administrator to modify the set up parameters if necessary.") .
+ _("The over-charge percentage allowance is :") . $margin . "%");
+ set_focus('ChgPrice'.$n);
+ return false;
+ }
+ }
+ }
+
+ if ($check_qty_charged_vs_del_qty == True)
+ {
+ if (input_num('this_quantity_inv'.$n) / ($_POST['qty_recd'.$n] - $_POST['prev_quantity_inv'.$n]) >
+ (1+ ($margin / 100)))
+ {
+ display_error( _("The quantity being invoiced is more than the outstanding quantity by more than the allowed over-charge percentage. The system is set up to prohibit this. See the system administrator to modify the set up parameters if necessary.")
+ . _("The over-charge percentage allowance is :") . $margin . "%");
+ set_focus('this_quantity_inv'.$n);
+ return false;
+ }
+ }
+
+ return true;
+}
+
+function commit_item_data($n)
+{
+ if (check_item_data($n))
+ {
+ if (input_num('this_quantity_inv'.$n) >= ($_POST['qty_recd'.$n] - $_POST['prev_quantity_inv'.$n]))
+ {
+ $complete = true;
+ }
+ else
+ {
+ $complete = false;
+ }
+
+ $_SESSION['supp_trans']->add_grn_to_trans($n, $_POST['po_detail_item'.$n],
+ $_POST['item_code'.$n], $_POST['item_description'.$n], $_POST['qty_recd'.$n],
+ $_POST['prev_quantity_inv'.$n], input_num('this_quantity_inv'.$n),
+ $_POST['order_price'.$n], input_num('ChgPrice'.$n), $complete,
+ $_POST['std_cost_unit'.$n], "");
+ }
+}
+
+//-----------------------------------------------------------------------------------------
+
+$id = find_submit('grn_item_id');
+if ($id != -1)
+{
+ commit_item_data($id);
+}
+
+if (isset($_POST['InvGRNAll']))
+{
+ foreach($_POST as $postkey=>$postval )
+ {
+ if (strpos($postkey, "qty_recd") === 0)
+ {
+ $id = substr($postkey, strlen("qty_recd"));
+ $id = (int)$id;
+ commit_item_data($id);
+ }
+ }
+}
+
//--------------------------------------------------------------------------------------------------
+$id3 = find_submit('Delete');
+if ($id3 != -1)
+{
+ $_SESSION['supp_trans']->remove_grn_from_trans($id3);
+ $Ajax->activate('grn_items');
+ $Ajax->activate('inv_tot');
+}
-start_form(false, true);
+$id4 = find_submit('Delete2');
+if ($id4 != -1)
+{
+ $_SESSION['supp_trans']->remove_gl_codes_from_trans($id4);
+ clear_fields();
+ $Ajax->activate('gl_items');
+ $Ajax->activate('inv_tot');
+}
+
+$id2 = -1;
+if ($_SESSION["wa_current_user"]->can_access('SA_GRNDELETE'))
+{
+ $id2 = find_submit('void_item_id');
+ if ($id2 != -1)
+ {
+ begin_transaction();
+
+ $myrow = get_grn_item_detail($id2);
+
+ $grn = get_grn_batch($myrow['grn_batch_id']);
+
+ $sql = "UPDATE ".TB_PREF."purch_order_details
+ SET quantity_received = qty_invoiced, quantity_ordered = qty_invoiced WHERE po_detail_item = ".$myrow["po_detail_item"];
+ db_query($sql, "The quantity invoiced of the purchase order line could not be updated");
+
+ $sql = "UPDATE ".TB_PREF."grn_items
+ SET qty_recd = quantity_inv WHERE id = ".$myrow["id"];
+ db_query($sql, "The quantity invoiced off the items received record could not be updated");
+
+ update_average_material_cost($grn["supplier_id"], $myrow["item_code"],
+ $myrow["unit_price"], -$myrow["QtyOstdg"], Today());
+
+ add_stock_move(ST_SUPPRECEIVE, $myrow["item_code"], $myrow['grn_batch_id'], $grn['loc_code'], sql2date($grn["delivery_date"]), "",
+ -$myrow["QtyOstdg"], $myrow['std_cost_unit'], $grn["supplier_id"], 1, $myrow['unit_price']);
+
+ commit_transaction();
+ display_notification(sprintf(_('All yet non-invoiced items on delivery line # %d has been removed.'), $id2));
+
+ }
+}
-start_table("$table_style2 width=80%", 8);
-echo ""; // outer table
+if (isset($_POST['go']))
+{
+ $Ajax->activate('gl_items');
+ display_quick_entries($_SESSION['supp_trans'], $_POST['qid'], input_num('totamount'), QE_SUPPINV);
+ $_POST['totamount'] = price_format(0); $Ajax->activate('totamount');
+ $Ajax->activate('inv_tot');
+}
-echo "";
+start_form();
invoice_header($_SESSION['supp_trans']);
-echo " |
"; // outer table
+if ($_POST['supplier_id']=='')
+ display_error('No supplier found for entered search text');
+else {
+ start_outer_table("$table_style2 width=98%", 5);
-echo "";
+ display_grn_items($_SESSION['supp_trans'], 1);
-display_grn_items($_SESSION['supp_trans']);
+ display_gl_items($_SESSION['supp_trans'], 1);
-display_gl_items($_SESSION['supp_trans']);
+ div_start('inv_tot');
+ invoice_totals($_SESSION['supp_trans']);
+ div_end();
-//echo " |
"; // outer table
-echo " ";
-invoice_totals($_SESSION['supp_trans']);
+ end_outer_table(0, false);
+}
+
+//-----------------------------------------------------------------------------------------
-echo " |
";
+if ($id != -1 || $id2 != -1)
+{
+ $Ajax->activate('grn_items');
+ $Ajax->activate('inv_tot');
+}
-end_table(); // outer table
+if (get_post('AddGLCodeToTrans'))
+ $Ajax->activate('inv_tot');
-echo "
";
-submit_center('PostInvoice', _("Enter Invoice"), true, '', true);
-echo "
";
+br();
+submit_center('PostInvoice', _("Enter Invoice"), true, '', 'default');
+br();
end_form();