X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_credit_invoice.php;h=9dde9f10a15d7d4ba78c9fcdb591c47af3befb07;hb=fe053abb14541530e5dc0fe821cbe6edfcde8a6f;hp=5c62eba6e8a87deee9d311e09462e70ba999b416;hpb=ddadb47f2620ce6902ad4694ce6512568862ba05;p=fa-stable.git
diff --git a/sales/customer_credit_invoice.php b/sales/customer_credit_invoice.php
index 5c62eba6..9dde9f10 100644
--- a/sales/customer_credit_invoice.php
+++ b/sales/customer_credit_invoice.php
@@ -36,10 +36,10 @@ if ($use_date_picker) {
if (isset($_GET['ModifyCredit'])) {
$_SESSION['page_title'] = sprintf(_("Modifying Credit Invoice # %d."), $_GET['ModifyCredit']);
- $help_page_title =_("Modifying Credit Invoice");
+ $help_context = "Modifying Credit Invoice";
processing_start();
} elseif (isset($_GET['InvoiceNumber'])) {
- $_SESSION['page_title'] = _("Credit all or part of an Invoice");
+ $_SESSION['page_title'] = _($help_context = "Credit all or part of an Invoice");
processing_start();
}
page($_SESSION['page_title'], false, false, "", $js);
@@ -206,7 +206,7 @@ function copy_from_cart()
if (isset($_POST['ProcessCredit']) && can_process()) {
- $newcredit = ($_SESSION['Items']->trans_no == 0);
+ $new_credit = ($_SESSION['Items']->trans_no == 0);
if (!isset($_POST['WriteOffGLCode']))
$_POST['WriteOffGLCode'] = 0;
@@ -215,8 +215,8 @@ if (isset($_POST['ProcessCredit']) && can_process()) {
if ($new_credit) new_doc_date($_SESSION['Items']->document_date);
$credit_no = $_SESSION['Items']->write($_POST['WriteOffGLCode']);
- processing_end();
- if ($newcredit) {
+ processing_end();exit;
+ if ($new_credit) {
meta_forward($_SERVER['PHP_SELF'], "AddedID=$credit_no");
} else {
meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$credit_no");
@@ -233,15 +233,13 @@ if (isset($_POST['Location'])) {
function display_credit_items()
{
- global $table_style, $table_style2;
-
start_form();
hidden('cart_id');
- start_table("$table_style2 width=80%", 5);
+ start_table(TABLESTYLE2, "width=80%", 5);
echo "
"; // outer table
- start_table("$table_style width=100%");
+ start_table(TABLESTYLE, "width=100%");
start_row();
label_cells(_("Customer"), $_SESSION['Items']->customer_name, "class='tableheader2'");
label_cells(_("Branch"), get_branch_name($_SESSION['Items']->Branch), "class='tableheader2'");
@@ -274,7 +272,7 @@ function display_credit_items()
echo " | ";// outer table
- start_table("$table_style width=100%");
+ start_table(TABLESTYLE, "width=100%");
label_row(_("Invoice Date"), $_SESSION['Items']->src_date, "class='tableheader2'");
@@ -287,7 +285,7 @@ function display_credit_items()
end_table(1); // outer table
div_start('credit_items');
- start_table("$table_style width=80%");
+ start_table(TABLESTYLE, "width=80%");
$th = array(_("Item Code"), _("Item Description"), _("Invoiced Quantity"), _("Units"),
_("Credit Quantity"), _("Price"), _("Discount %"), _("Total"));
table_header($th);
@@ -321,24 +319,24 @@ function display_credit_items()
if (!check_num('ChargeFreightCost')) {
$_POST['ChargeFreightCost'] = price_format($_SESSION['Items']->freight_cost);
}
-
+ $colspan = 7;
start_row();
- label_cell(_("Credit Shipping Cost"), "colspan=7 align=right");
- amount_cells_ex(null, "ChargeFreightCost", 6, 8, $_POST['ChargeFreightCost']);
+ label_cell(_("Credit Shipping Cost"), "colspan=$colspan align=right");
+ small_amount_cells(null, "ChargeFreightCost", price_format(get_post('ChargeFreightCost',0)));
end_row();
$inv_items_total = $_SESSION['Items']->get_items_total_dispatch();
$display_sub_total = price_format($inv_items_total + input_num($_POST['ChargeFreightCost']));
- label_row(_("Sub-total"), $display_sub_total, "colspan=7 align=right", "align=right");
+ label_row(_("Sub-total"), $display_sub_total, "colspan=$colspan align=right", "align=right");
$taxes = $_SESSION['Items']->get_taxes(input_num($_POST['ChargeFreightCost']));
- $tax_total = display_edit_tax_items($taxes, 7, $_SESSION['Items']->tax_included);
+ $tax_total = display_edit_tax_items($taxes, $colspan, $_SESSION['Items']->tax_included);
$display_total = price_format(($inv_items_total + input_num('ChargeFreightCost') + $tax_total));
- label_row(_("Credit Note Total"), $display_total, "colspan=7 align=right", "align=right");
+ label_row(_("Credit Note Total"), $display_total, "colspan=$colspan align=right", "align=right");
end_table();
div_end();
@@ -347,14 +345,14 @@ function display_credit_items()
//-----------------------------------------------------------------------------
function display_credit_options()
{
- global $table_style2, $Ajax;
- echo " ";
+ global $Ajax;
+ br();
-if (isset($_POST['_CreditType_update']))
- $Ajax->activate('options');
+ if (isset($_POST['_CreditType_update']))
+ $Ajax->activate('options');
- div_start('options');
- start_table("$table_style2");
+ div_start('options');
+ start_table(TABLESTYLE2);
credit_type_list_row(_("Credit Note Type"), 'CreditType', null, true);
|