X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_credit.php;h=4db923b90fae7426b623c508f4d5f0b3394f852f;hb=884c36eec7dbaae89e1f5532cc2c2f8033b010fd;hp=e7ddde0752131a789dd7cef8ef0d92d660f10f8e;hpb=0517097815894f0221e3755a2d14612f69f72b86;p=fa-stable.git
diff --git a/purchasing/supplier_credit.php b/purchasing/supplier_credit.php
index e7ddde07..4db923b9 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 "
";
@@ -66,8 +62,11 @@ if (isset($_GET['New']))
unset ($_SESSION['supp_trans']);
}
- $_SESSION['supp_trans'] = new supp_trans;
- $_SESSION['supp_trans']->is_invoice = false;
+ $_SESSION['supp_trans'] = new supp_trans(ST_SUPPCREDIT);
+ if (isset($_GET['invoice_no']))
+ {
+ $_SESSION['supp_trans']->supp_reference = $_POST['invoice_no'] = $_GET['invoice_no'];
+ }
}
function clear_fields()
@@ -80,7 +79,7 @@ function clear_fields()
unset($_POST['amount']);
unset($_POST['memo_']);
unset($_POST['AddGLCodeToTrans']);
- $Ajax->activate('gl_ctrls');
+ $Ajax->activate('gl_items');
set_focus('gl_code');
}
//------------------------------------------------------------------------------------------------
@@ -97,8 +96,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'] . "'";
- $result = db_query($sql,"get account information");
+ $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."));
@@ -117,6 +115,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 +135,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 +144,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 +202,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']);
@@ -232,82 +239,92 @@ function check_item_data($n)
return true;
}
+function commit_item_data($n)
+{
+ if (check_item_data($n))
+ {
+ $_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),
+ $_POST['std_cost_unit'.$n], "");
+ }
+}
+
//-----------------------------------------------------------------------------------------
$id = find_submit('grn_item_id');
if ($id != -1)
{
- if (check_item_data($id))
- {
- $complete = False;
-
- //$_SESSION['supp_trans']->add_grn_to_trans($_POST['GRNNumber'],
- // $_POST['po_detail_item'], $_POST['item_code'],
- // $_POST['item_description'], $_POST['qty_recd'],
- // $_POST['prev_quantity_inv'], $_POST['This_QuantityCredited'],
- // $_POST['order_price'], $_POST['ChgPrice'], $complete,
- // $_POST['std_cost_unit'], $_POST['gl_code']);
- $_SESSION['supp_trans']->add_grn_to_trans($id,
- $_POST['po_detail_item'.$id], $_POST['item_code'.$id],
- $_POST['item_description'.$id], $_POST['qty_recd'.$id],
- $_POST['prev_quantity_inv'.$id], input_num('This_QuantityCredited'.$id),
- $_POST['order_price'.$id], input_num('ChgPrice'.$id), $complete,
- $_POST['std_cost_unit'.$id], "");
- }
+ 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);
+ }
+ }
+}
+
+
//--------------------------------------------------------------------------------------------------
-$id = find_submit('Delete');
-if ($id != -1)
+$id3 = find_submit('Delete');
+if ($id3 != -1)
{
- $_SESSION['supp_trans']->remove_grn_from_trans($id);
+ $_SESSION['supp_trans']->remove_grn_from_trans($id3);
$Ajax->activate('grn_items');
- $Ajax->activate('grn_table');
$Ajax->activate('inv_tot');
}
-$id = find_submit('Delete2');
-if ($id != -1)
+$id4 = find_submit('Delete2');
+if ($id4 != -1)
{
- $_SESSION['supp_trans']->remove_gl_codes_from_trans($id);
+ $_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=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
-
$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
-$id = find_submit('grn_item_id');
if ($id != -1)
{
- $Ajax->activate('grn_table');
$Ajax->activate('grn_items');
$Ajax->activate('inv_tot');
}
@@ -315,9 +332,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();