X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_invoice.php;h=3440678189c5c6a8f76c1007840e1851d0f76bb6;hb=f49f1d3b42871be09dc8498043ac429f4a46be11;hp=5fed0495e2157dcb7e9656dedae61bce591ceeac;hpb=03f640384f3739ed3d2b378e883a179286e6639a;p=fa-stable.git
diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php
index 5fed0495..34406781 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");
@@ -16,31 +25,18 @@ if ($use_popup_windows)
$js .= get_js_open_window(900, 500);
if ($use_date_picker)
$js .= get_js_date_picker();
-page(_("Enter Supplier Invoice"), false, false, "", $js);
-
+page(_($help_context = "Enter Supplier Invoice"), false, false, "", $js);
//----------------------------------------------------------------------------------------
check_db_has_suppliers(_("There are no suppliers defined in the system."));
-//---------------------------------------------------------------------------------------------------------------
-if ($ret = context_restore()) {
- // return from supplier editor
- copy_from_trans($_SESSION['supp_trans']);
- if(isset($ret['supplier_id']))
- $_POST['supplier_id'] = $ret['supplier_id'];
-}
-if (isset($_POST['_supplier_id_editor'])) {
- copy_to_trans($_SESSION['supp_trans']);
- context_call($path_to_root.'/purchasing/manage/suppliers.php?supplier_id='.$_POST['supplier_id'], 'supp_trans');
-}
-
//---------------------------------------------------------------------------------------------------------------
if (isset($_GET['AddedID']))
{
$invoice_no = $_GET['AddedID'];
- $trans_type = 20;
+ $trans_type = ST_SUPPINVOICE;
echo "
";
@@ -49,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();
}
@@ -99,7 +99,7 @@ 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='" . $_POST['gl_code'] . "'";
+ $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)
{
@@ -119,6 +119,12 @@ if (isset($_POST['AddGLCodeToTrans'])){
}
}
+ 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,
@@ -132,27 +138,29 @@ if (isset($_POST['AddGLCodeToTrans'])){
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');
@@ -178,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);
@@ -218,7 +230,7 @@ if (isset($_POST['PostInvoice']))
function check_item_data($n)
{
global $check_price_charged_vs_order_price,
- $check_qty_charged_vs_del_qty;
+ $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."));
@@ -233,15 +245,16 @@ function check_item_data($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 + (sys_prefs::over_charge_allowance() / 100)))
+ (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 :") . sys_prefs::over_charge_allowance() . "%");
+ _("The over-charge percentage allowance is :") . $margin . "%");
set_focus('ChgPrice'.$n);
return false;
}
@@ -251,10 +264,10 @@ function check_item_data($n)
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+ (sys_prefs::over_charge_allowance() / 100)))
+ (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 :") . sys_prefs::over_charge_allowance() . "%");
+ . _("The over-charge percentage allowance is :") . $margin . "%");
set_focus('this_quantity_inv'.$n);
return false;
}
@@ -323,11 +336,11 @@ if ($id4 != -1)
$Ajax->activate('inv_tot');
}
-$id2 = find_submit('void_item_id');
-
-if ($_SESSION["wa_current_user"]->access == 2)
+$id2 = -1;
+if ($_SESSION["wa_current_user"]->can_access('SA_GRNDELETE'))
{
- if ($id2 != -1) // Added section 2008-10-18 Joe Hunt for voiding delivery lines
+ $id2 = find_submit('void_item_id');
+ if ($id2 != -1)
{
begin_transaction();
@@ -346,46 +359,45 @@ if ($_SESSION["wa_current_user"]->access == 2)
update_average_material_cost($grn["supplier_id"], $myrow["item_code"],
$myrow["unit_price"], -$myrow["QtyOstdg"], Today());
- add_stock_move(25, $myrow["item_code"], $myrow['grn_batch_id'], $grn['loc_code'], sql2date($grn["delivery_date"]), "",
+ 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_form(false, true);
-
-start_table("$table_style2 width=98%", 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']);
+
if ($_POST['supplier_id']=='')
display_error('No supplier found for entered search text');
else {
- echo " |
"; // outer table
-
- echo "";
+ start_outer_table("$table_style2 width=98%", 5);
display_grn_items($_SESSION['supp_trans'], 1);
- //display_grn_items_for_selection();
+
display_gl_items($_SESSION['supp_trans'], 1);
- //display_gl_controls();
- //echo " |
"; // outer table
- echo " ";
div_start('inv_tot');
invoice_totals($_SESSION['supp_trans']);
div_end();
-}
-echo " |
";
-end_table(); // outer table
+ end_outer_table(0, false);
+}
//-----------------------------------------------------------------------------------------
-
if ($id != -1 || $id2 != -1)
{
$Ajax->activate('grn_items');
@@ -395,9 +407,9 @@ if ($id != -1 || $id2 != -1)
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();