X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_credit.php;h=9b62ec4defebd2dfd60562d6116e946b8c578515;hb=a0a0a0e1318042034fe5652caa69b034200c8a90;hp=5729fcf53cd1bae720106b0304803b10b9eb9a7c;hpb=2f913081e40eeec834129c27caf26ff129e1e284;p=fa-stable.git
diff --git a/purchasing/supplier_credit.php b/purchasing/supplier_credit.php
index 5729fcf5..9b62ec4d 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,7 +25,7 @@ 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);
//----------------------------------------------------------------------------------------
@@ -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 = 21;
+ $trans_type = ST_SUPPCREDIT;
echo "
";
@@ -38,7 +46,8 @@ if (isset($_GET['AddedID']))
display_note(get_gl_view_str($trans_type, $invoice_no, _("View the GL Journal Entries for this Credit Note")), 1);
hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another Credit Note"), "New=1");
-
+ hyperlink_params("$path_to_root/admin/attachments.php", _("Add an Attachment"), "filterType=$trans_type&trans_no=$invoice_no");
+
display_footer_exit();
}
@@ -55,13 +64,79 @@ 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()
+{
+ 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;
+
+ $result = get_gl_account_info($_POST['gl_code']);
+ 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()
{
- global $total_grn_value, $total_gl_value;
+ global $total_grn_value, $total_gl_value, $Refs;
if (!$_SESSION['supp_trans']->is_valid_trans_to_post())
{
@@ -70,21 +145,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');
@@ -128,7 +203,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']);
@@ -143,35 +221,123 @@ if (isset($_POST['PostCreditNote']))
handle_commit_credit_note();
}
+function check_item_data($n)
+{
+ if (!check_num('This_QuantityCredited'.$n, 0))
+ {
+ display_error(_("The quantity to credit must be numeric and greater than zero."));
+ set_focus('This_QuantityCredited'.$n);
+ return false;
+ }
+
+ if (!check_num('ChgPrice'.$n, 0))
+ {
+ display_error(_("The price is either not numeric or negative."));
+ set_focus('ChgPrice'.$n);
+ return false;
+ }
+
+ return true;
+}
+
+function commit_item_data($n)
+{
+ if (check_item_data($n))
+ {
+ $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_QuantityCredited'.$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');
+}
+
+$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');
+}
+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=80%", 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
-
- $total_grn_value = display_grn_items($_SESSION['supp_trans']);
+ $total_grn_value = display_grn_items($_SESSION['supp_trans'], 1);
- $total_gl_value = display_gl_items($_SESSION['supp_trans']);
-
- echo " |
"; // outer table
+ $total_gl_value = display_gl_items($_SESSION['supp_trans'], 1);
+ div_start('inv_tot');
invoice_totals($_SESSION['supp_trans']);
+ div_end();
+}
+
+if ($id != -1)
+{
+ $Ajax->activate('grn_items');
+ $Ajax->activate('inv_tot');
}
-echo " |
";
-end_table(1); // outer table
+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();