From: Joe Hunt Date: Sun, 1 Aug 2010 07:35:50 +0000 (+0000) Subject: Added Email link when updating documents. X-Git-Tag: v2.4.2~19^2~749 X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=b611def496e4942321d66f183fe0e1d95417c99f;p=fa-stable.git Added Email link when updating documents. --- diff --git a/CHANGELOG.txt b/CHANGELOG.txt index a6572aa0..ea20c543 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,6 +19,12 @@ Legend: ! -> Note $ -> Affected files +01-Aug-2010 Joe Hunt ++ Added Email link when updating documents. +$ /sales/credit_note_entry.php + /sales/customer_credit_invoice.php + /sales/customer_invoice.php + 30-Jul-2010 Janusz Dobrowolski ! Skipping hidden files in sql folder during upgrade. $ /admin/inst_upgrade.php diff --git a/sales/credit_note_entry.php b/sales/credit_note_entry.php index f09aded1..1d5fbc3e 100644 --- a/sales/credit_note_entry.php +++ b/sales/credit_note_entry.php @@ -67,8 +67,8 @@ if (isset($_GET['AddedID'])) { display_note(get_customer_trans_view_str($trans_type, $credit_no, _("&View this credit note")), 0, 1); - display_note(print_document_link($credit_no, _("&Print This Credit Invoice"), true, ST_CUSTCREDIT),0, 1); - display_note(print_document_link($credit_no, _("&Email This Credit Invoice"), true, ST_CUSTCREDIT, false, "printlink", "", 1),0, 1); + display_note(print_document_link($credit_no."-".$trans_type, _("&Print This Credit Invoice"), true, ST_CUSTCREDIT),0, 1); + display_note(print_document_link($credit_no."-".$trans_type, _("&Email This Credit Invoice"), true, ST_CUSTCREDIT, false, "printlink", "", 1),0, 1); display_note(get_gl_view_str($trans_type, $credit_no, _("View the GL &Journal Entries for this Credit Note"))); diff --git a/sales/customer_credit_invoice.php b/sales/customer_credit_invoice.php index e687ec49..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); diff --git a/sales/customer_invoice.php b/sales/customer_invoice.php index 152ca1e5..fbffe054 100644 --- a/sales/customer_invoice.php +++ b/sales/customer_invoice.php @@ -56,8 +56,8 @@ if (isset($_GET['AddedID'])) { display_note(get_customer_trans_view_str($trans_type, $invoice_no, _("&View This Invoice")), 0, 1); - display_note(print_document_link($invoice_no, _("&Print This Invoice"), true, ST_SALESINVOICE)); - display_note(print_document_link($invoice_no, _("&Email This Invoice"), true, ST_SALESINVOICE, false, "printlink", "", 1),1); + display_note(print_document_link($invoice_no."-".$trans_type, _("&Print This Invoice"), true, ST_SALESINVOICE)); + display_note(print_document_link($invoice_no."-".$trans_type, _("&Email This Invoice"), true, ST_SALESINVOICE, false, "printlink", "", 1),1); display_note(get_gl_view_str($trans_type, $invoice_no, _("View the GL &Journal Entries for this Invoice")),1); @@ -68,12 +68,14 @@ if (isset($_GET['AddedID'])) { } elseif (isset($_GET['UpdatedID'])) { $invoice_no = $_GET['UpdatedID']; + $trans_type = ST_SALESINVOICE; display_notification_centered(sprintf(_('Sales Invoice # %d has been updated.'),$invoice_no)); display_note(get_trans_view_str(ST_SALESINVOICE, $invoice_no, _("&View This Invoice"))); echo '
'; - display_note(print_document_link($invoice_no, _("&Print This Invoice"), true, ST_SALESINVOICE)); + display_note(print_document_link($invoice_no."-".$trans_type, _("&Print This Invoice"), true, ST_SALESINVOICE)); + display_note(print_document_link($invoice_no."-".$trans_type, _("&Email This Invoice"), true, ST_SALESINVOICE, false, "printlink", "", 1),1); hyperlink_no_params($path_to_root . "/sales/inquiry/customer_inquiry.php", _("Select Another &Invoice to Modify"));