X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_credit_invoice.php;h=48f3f0d597ef6fd122f3a4a5e0e55451867f89f3;hb=46c5f7a65a7659a44ae8254c63152074363d3987;hp=5d6a3dbd820f47015ab3c0b2dbd2bb50105a9ecc;hpb=ebc600101ceab69c06eac4b1bd4d1782af45de05;p=fa-stable.git diff --git a/sales/customer_credit_invoice.php b/sales/customer_credit_invoice.php index 5d6a3dbd..48f3f0d5 100644 --- a/sales/customer_credit_invoice.php +++ b/sales/customer_credit_invoice.php @@ -54,7 +54,8 @@ if (isset($_GET['AddedID'])) { display_note(get_customer_trans_view_str($trans_type, $credit_no, _("&View This Credit Note")), 0, 0); - display_note(print_document_link($credit_no, _("&Print This Credit Note"), true, $trans_type),1); + display_note(print_document_link($credit_no."-".$trans_type, _("&Print This Credit Note"), true, $trans_type),1); + display_note(print_document_link($credit_no."-".$trans_type, _("&Email This Credit Note"), true, $trans_type, false, "printlink", "", 1),1); display_note(get_gl_view_str($trans_type, $credit_no, _("View the GL &Journal Entries for this Credit Note")),1); @@ -68,7 +69,8 @@ if (isset($_GET['AddedID'])) { display_note(get_customer_trans_view_str($trans_type, $credit_no, _("&View This Credit Note")), 0, 0); - display_note(print_document_link($credit_no, _("&Print This Credit Note"), true, $trans_type),1); + display_note(print_document_link($credit_no."-".$trans_type, _("&Print This Credit Note"), true, $trans_type),1); + display_note(print_document_link($credit_no."-".$trans_type, _("&Email This Credit Note"), true, $trans_type, false, "printlink", "", 1),1); display_note(get_gl_view_str($trans_type, $credit_no, _("View the GL &Journal Entries for this Credit Note")),1); @@ -206,7 +208,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; @@ -216,7 +218,7 @@ if (isset($_POST['ProcessCredit']) && can_process()) { $credit_no = $_SESSION['Items']->write($_POST['WriteOffGLCode']); processing_end(); - if ($newcredit) { + if ($new_credit) { meta_forward($_SERVER['PHP_SELF'], "AddedID=$credit_no"); } else { meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$credit_no"); @@ -233,15 +235,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 +274,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 +287,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); @@ -347,14 +347,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);