From: Joe Hunt Date: Tue, 4 Aug 2009 09:13:17 +0000 (+0000) Subject: Added email links after creating documents X-Git-Tag: v2.4.2~19^2~1310 X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=be42db53189e110726a0e737a1fe146bf0407c65;p=fa-stable.git Added email links after creating documents --- diff --git a/CHANGELOG.txt b/CHANGELOG.txt index ddb0b232..f7270998 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,6 +19,19 @@ Legend: ! -> Note $ -> Affected files +04-Aug-2009 Joe Hunt ++ Added email links after creating documents +$ /includes/ui/ui_controls.inc + /manufacturing/work_order_entry.php + /purchasing/po_entry_items.php + /reporting/reports_main.php + /reporting/includes/reporting.inc + /sales/create_recurrent_invoices.php + /sales/credit_note_entry.php + /sales/customer_delivery.php + /sales/customer_invoice.php + /sales/sales_order_entry.php + 03-Aug-2009 Janusz Dobrowolski + Clone record option added. $ /includes/ui/ui_input.inc diff --git a/includes/ui/ui_controls.inc b/includes/ui/ui_controls.inc index b05eaa80..22236cc4 100644 --- a/includes/ui/ui_controls.inc +++ b/includes/ui/ui_controls.inc @@ -196,9 +196,9 @@ function submenu_view($title, $type, $number, $id=null) display_note(get_trans_view_str($type, $number, $title, false, 'menu_option', $id), 0, 1); } -function submenu_print($title, $type, $number, $id=null) +function submenu_print($title, $type, $number, $id=null, $email=0) { - display_note(print_document_link($number, $title, true, $type, false, 'menu_option', $id), 0, 1); + display_note(print_document_link($number, $title, true, $type, false, 'menu_option', $id, $email), 0, 1); } //----------------------------------------------------------------------------------- diff --git a/manufacturing/work_order_entry.php b/manufacturing/work_order_entry.php index e0a0d283..c2560b47 100644 --- a/manufacturing/work_order_entry.php +++ b/manufacturing/work_order_entry.php @@ -58,8 +58,10 @@ if (isset($_GET['AddedID'])) if ($_GET['type'] != wo_types::advanced()) { include_once($path_to_root . "/reporting/includes/reporting.inc"); - $ar = array('PARAM_0' => $id, 'PARAM_1' => $id); + $ar = array('PARAM_0' => $id, 'PARAM_1' => $id, 'PARAM_2' => 0); display_note(print_link(_("Print this Work Order"), 409, $ar), 1); + $ar['PARAM_2'] = 1; + display_note(print_link(_("Email this Work Order"), 409, $ar), 1); display_note(get_gl_view_str($stype, $id, _("View the GL Journal Entries for this Work Order")), 1); $ar = array('PARAM_0' => $_GET['date'], 'PARAM_1' => $_GET['date'], 'PARAM_2' => $stype); display_note(print_link(_("Print the GL Journal Entries for this Work Order"), 702, $ar), 1); diff --git a/purchasing/po_entry_items.php b/purchasing/po_entry_items.php index b0d11699..ec3f619b 100644 --- a/purchasing/po_entry_items.php +++ b/purchasing/po_entry_items.php @@ -51,6 +51,7 @@ if (isset($_GET['AddedID'])) display_note(get_trans_view_str($trans_type, $order_no, _("&View this order"))); echo '
'; display_note(print_document_link($order_no, _("&Print This Order"), true, $trans_type)); + display_note(print_document_link($order_no, _("&Email This Order"), true, $trans_type, false, "", "", 1),0, 1); hyperlink_params($path_to_root . "/purchasing/po_receive_items.php", _("&Receive Items on this Purchase Order"), "PONumber=$order_no"); diff --git a/reporting/includes/reporting.inc b/reporting/includes/reporting.inc index a5a47fd2..43d03ef0 100644 --- a/reporting/includes/reporting.inc +++ b/reporting/includes/reporting.inc @@ -15,7 +15,7 @@ // You only need full parameter list for invoices/credit notes function print_document_link($doc_no, $link_text, $link=true, $type_no, - $icon=false, $class='printlink', $id='') + $icon=false, $class='printlink', $id='', $email=0) { global $path_to_root; include_once($path_to_root . "/includes/types.inc"); @@ -32,7 +32,7 @@ function print_document_link($doc_no, $link_text, $link=true, $type_no, 'PARAM_1' => $doc_no, 'PARAM_2' => "", 'PARAM_3' => get_first_bank_account(), - 'PARAM_4' => 0, + 'PARAM_4' => $email, 'PARAM_5' => 0, 'PARAM_6' => ""); break; @@ -42,7 +42,7 @@ function print_document_link($doc_no, $link_text, $link=true, $type_no, $ar = array( 'PARAM_0' => $doc_no, 'PARAM_1' => $doc_no, - 'PARAM_2' => 0, + 'PARAM_2' => $email, 'PARAM_3' => ""); break; case 10 : // Sales Invoice @@ -54,7 +54,7 @@ function print_document_link($doc_no, $link_text, $link=true, $type_no, 'PARAM_1' => $doc_no, 'PARAM_2' => "", 'PARAM_3' => get_first_bank_account(), - 'PARAM_4' => 0, + 'PARAM_4' => $email, 'PARAM_5' => "", 'PARAM_6' => "", 'PARAM_7' => $type_no); @@ -67,7 +67,7 @@ function print_document_link($doc_no, $link_text, $link=true, $type_no, 'PARAM_1' => $doc_no, 'PARAM_2' => "", 'PARAM_3' => get_first_bank_account(), - 'PARAM_4' => 0, + 'PARAM_4' => $email, 'PARAM_5' => ""); break; // default: $ar = array(); diff --git a/reporting/reports_main.php b/reporting/reports_main.php index 15f47d54..b074ec3c 100644 --- a/reporting/reports_main.php +++ b/reporting/reports_main.php @@ -177,7 +177,7 @@ $reports->addReport(_('Manufactoring'),401,_('&Bill of Material Listing'), $reports->addReport(_('Manufactoring'),409,_('Print &Work Orders'), array( new ReportParam(_('From'),'WORKORDER'), new ReportParam(_('To'),'WORKORDER'), - new ReportParam(_('email Customers'),'YES_NO'), + new ReportParam(_('Email Locations'),'YES_NO'), new ReportParam(_('Comments'),'TEXTBOX'))); $reports->addReportClass(_('Dimensions')); if ($dim > 0) diff --git a/sales/create_recurrent_invoices.php b/sales/create_recurrent_invoices.php index 603eef15..80b019a5 100644 --- a/sales/create_recurrent_invoices.php +++ b/sales/create_recurrent_invoices.php @@ -89,6 +89,8 @@ if (isset($_GET['recurrent'])) $ar = array('PARAM_0' => $min, 'PARAM_1' => $max, 'PARAM_2' => "", 'PARAM_3' => get_first_bank_account(), 'PARAM_4' => 0, 'PARAM_5' => 0, 'PARAM_6' => "", 'PARAM_7' => 10); display_note(print_link(_("&Print Recurrent Invoices # $min - # $max"), 107, $ar), 0, 1); + $ar['PARAM_4'] = 1; + display_note(print_link(_("&Email Recurrent Invoices # $min - # $max"), 107, $ar), 0, 1); } } diff --git a/sales/credit_note_entry.php b/sales/credit_note_entry.php index 4b20b747..31f640f4 100644 --- a/sales/credit_note_entry.php +++ b/sales/credit_note_entry.php @@ -68,6 +68,7 @@ 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, 11),0, 1); + display_note(print_document_link($credit_no, _("&Email This Credit Invoice"), true, 11, false, "", "", 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_delivery.php b/sales/customer_delivery.php index 22349507..c0da3f3b 100644 --- a/sales/customer_delivery.php +++ b/sales/customer_delivery.php @@ -52,6 +52,7 @@ if (isset($_GET['AddedID'])) { display_note(get_customer_trans_view_str(13, $dispatch_no, _("&View This Delivery")), 0, 1); display_note(print_document_link($dispatch_no, _("&Print Delivery Note"), true, 13)); + display_note(print_document_link($dispatch_no, _("&Email Delivery Note"), true, 13, false, "", "", 1),0, 1); display_note(get_gl_view_str(13, $dispatch_no, _("View the GL Journal Entries for this Dispatch")),1); diff --git a/sales/customer_invoice.php b/sales/customer_invoice.php index bd0e2d2b..a73abf50 100644 --- a/sales/customer_invoice.php +++ b/sales/customer_invoice.php @@ -57,6 +57,7 @@ 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, 10)); + display_note(print_document_link($invoice_no, _("&Email This Invoice"), true, 10, false, "", "", 1),0, 1); display_note(get_gl_view_str($trans_type, $invoice_no, _("View the GL &Journal Entries for this Invoice")),1); diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php index b1a52c7e..e7cd0636 100644 --- a/sales/sales_order_entry.php +++ b/sales/sales_order_entry.php @@ -75,6 +75,7 @@ if (isset($_GET['AddedID'])) { submenu_view(_("&View This Order"), 30, $order_no); submenu_print(_("&Print This Order"), 30, $order_no, 'prtopt'); + submenu_print(_("&Email This Order"), 30, $order_no, null, 1); set_focus('prtopt'); submenu_option(_("Make &Delivery Against This Order"), @@ -92,6 +93,7 @@ if (isset($_GET['AddedID'])) { submenu_view(_("&View This Order"), 30, $order_no); submenu_print(_("&Print This Order"), 30, $order_no, 'prtopt'); + submenu_print(_("&Email This Order"), 30, $order_no, null, 1); set_focus('prtopt'); submenu_option(_("Confirm Order Quantities and Make &Delivery"), @@ -110,6 +112,7 @@ if (isset($_GET['AddedID'])) { submenu_view(_("&View This Delivery"), 13, $delivery); submenu_print(_("&Print Delivery Note"), 13, $delivery, 'prtopt'); + submenu_print(_("&Email Delivery Note"), 13, $delivery, null, 1); set_focus('prtopt'); display_note(get_gl_view_str(13, $delivery, _("View the GL Journal Entries for this Dispatch")),0, 1); @@ -134,6 +137,7 @@ if (isset($_GET['AddedID'])) { submenu_view(_("&View This Invoice"), 10, $invoice); submenu_print(_("&Print Sales Invoice"), 10, $invoice, 'prtopt'); + submenu_print(_("&Email Sales Invoice"), 10, $invoice, null, 1); set_focus('prtopt'); display_note(get_gl_view_str(10, $invoice, _("View the GL &Journal Entries for this Invoice")),0, 1);