X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_credit.php;h=1a8d63e9bdca091b7b481876a72b7e6d01d80baa;hb=d2cc0860eccf02eaefcd90731ac3af141a841529;hp=3854b5ae0ad14dde15840463e23d686c0c8bcb5b;hpb=bf00f0e16df5974ecba17b59be8bc660bdf6b8a8;p=fa-stable.git diff --git a/purchasing/supplier_credit.php b/purchasing/supplier_credit.php index 3854b5ae..1a8d63e9 100644 --- a/purchasing/supplier_credit.php +++ b/purchasing/supplier_credit.php @@ -1,11 +1,19 @@ . +***********************************************************************/ +$page_security = 'SA_SUPPLIERCREDIT'; +$path_to_root = ".."; include_once($path_to_root . "/purchasing/includes/supp_trans_class.inc"); -$page_security=5; - include_once($path_to_root . "/includes/session.inc"); include_once($path_to_root . "/includes/data_checks.inc"); @@ -17,30 +25,18 @@ if ($use_popup_windows) $js .= get_js_open_window(900, 500); if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Supplier Credit Note"), false, false, "", $js); +page(_($help_context = "Supplier Credit Note"), 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 = 21; + $trans_type = ST_SUPPCREDIT; echo "
"; @@ -68,6 +64,10 @@ if (isset($_GET['New'])) $_SESSION['supp_trans'] = new supp_trans; $_SESSION['supp_trans']->is_invoice = false; + if (isset($_GET['invoice_no'])) + { + $_SESSION['supp_trans']->supp_reference = $_POST['invoice_no'] = $_GET['invoice_no']; + } } function clear_fields() @@ -97,7 +97,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) { @@ -117,6 +117,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, @@ -131,7 +137,7 @@ if (isset($_POST['AddGLCodeToTrans'])){ function check_data() { - global $total_grn_value, $total_gl_value; + global $total_grn_value, $total_gl_value, $Refs; if (!$_SESSION['supp_trans']->is_valid_trans_to_post()) { @@ -140,21 +146,21 @@ function check_data() return false; } - if (!references::is_valid($_SESSION['supp_trans']->reference)) + if (!$Refs->is_valid($_SESSION['supp_trans']->reference)) { display_error(_("You must enter an credit note reference.")); set_focus('reference'); return false; } - if (!is_new_reference($_SESSION['supp_trans']->reference, 21)) + if (!is_new_reference($_SESSION['supp_trans']->reference, ST_SUPPCREDIT)) { 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 credit note reference.")); set_focus('supp_reference'); @@ -198,7 +204,10 @@ function handle_commit_credit_note() if (!check_data()) return; - $invoice_no = add_supp_invoice($_SESSION['supp_trans']); + if (isset($_POST['invoice_no'])) + $invoice_no = add_supp_invoice($_SESSION['supp_trans'], $_POST['invoice_no']); + else + $invoice_no = add_supp_invoice($_SESSION['supp_trans']); $_SESSION['supp_trans']->clear_items(); unset($_SESSION['supp_trans']); @@ -286,35 +295,41 @@ if ($id4 != -1) $Ajax->activate('gl_items'); $Ajax->activate('inv_tot'); } +if (isset($_POST['RefreshInquiry'])) +{ + $Ajax->activate('grn_items'); + $Ajax->activate('inv_tot'); +} +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'); +} -//-------------------------------------------------------------------------------------------------- - -start_form(false, true); -start_table("$table_style width=98%", 8); -echo ""; // outer table +//-------------------------------------------------------------------------------------------------- -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 + start_outer_table("$table_style2 width=98%", 5); $total_grn_value = display_grn_items($_SESSION['supp_trans'], 1); $total_gl_value = display_gl_items($_SESSION['supp_trans'], 1); - echo ""; // outer table div_start('inv_tot'); invoice_totals($_SESSION['supp_trans']); div_end(); -} -echo ""; -end_table(1); // outer table + end_outer_table(0, false); +} if ($id != -1) { @@ -325,9 +340,9 @@ if ($id != -1) if (get_post('AddGLCodeToTrans')) $Ajax->activate('inv_tot'); - -submit_center('PostCreditNote', _("Enter Credit Note"), true, '', true); -echo "

"; +br(); +submit_center('PostCreditNote', _("Enter Credit Note"), true, '', 'default'); +br(); end_form(); end_page();