From 67abd2b071302a327df63fb949963f0b45d62196 Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Tue, 13 Apr 2010 23:00:20 +0000 Subject: [PATCH] Added 'View Attachments' if any in all popup view windows --- CHANGELOG.txt | 26 +++++++++++++++++++++++ admin/db/attachments_db.inc | 11 ++++++++++ dimensions/view/view_dimension.php | 2 +- gl/view/bank_transfer_view.php | 2 +- gl/view/gl_deposit_view.php | 2 +- gl/view/gl_payment_view.php | 2 +- gl/view/gl_trans_view.php | 2 +- includes/main.inc | 4 ++-- includes/ui/ui_controls.inc | 14 ++++++++++-- inventory/view/view_adjustment.php | 2 +- inventory/view/view_transfer.php | 2 +- manufacturing/view/wo_issue_view.php | 2 +- manufacturing/view/wo_production_view.php | 2 +- manufacturing/view/work_order_view.php | 2 +- purchasing/view/view_grn.php | 2 +- purchasing/view/view_po.php | 2 +- purchasing/view/view_supp_credit.php | 2 +- purchasing/view/view_supp_invoice.php | 2 +- purchasing/view/view_supp_payment.php | 2 +- sales/view/view_credit.php | 2 +- sales/view/view_dispatch.php | 2 +- sales/view/view_invoice.php | 2 +- sales/view/view_receipt.php | 2 +- sales/view/view_sales_order.php | 2 +- 24 files changed, 71 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 23a00f9a..16183903 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,6 +19,32 @@ Legend: ! -> Note $ -> Affected files +14-Apr-2010 Joe Hunt/ AVB3 ++ Added 'View Attachments' if any in all popup view windows +$ /admin/db/attachments_db.inc + /includes/main.inc + /includes/ui/ui_controls.inc + /dimensions/view/view_dimension.php + /gl/view/bank_transfer_view.php + /gl/view/gl_deposit_view.php + /gl/view/gl_payment_view.php + /gl/view/gl_trans_view.php + /inventory/view/view_adjustment.php + /inventory/view/view_transfer.php + /manufacturing/view/work_order_view.php + /manufacturing/view/wo_issue_view.php + /manufacturing/view/wo_production_view.php + /purchasing/view/view_grn.php + /purchasing/view/view_po.php + /purchasing/view/view_supp_credit.php + /purchasing/view/view_supp_invoice.php + /purchasing/view/view_supp_payment.php + /sales/view/view_credit.php + /sales/view/view_dispatch.php + /sales/view/view_invoice.php + /sales/view/view_receipt.php + /sales/view/view_sales_order.php + 04-Apr-2010 Janusz Dobrowolski + Added supplier/customer document language selection $ /purchasing/includes/db/suppliers_db.inc diff --git a/admin/db/attachments_db.inc b/admin/db/attachments_db.inc index 6934071f..499080a2 100644 --- a/admin/db/attachments_db.inc +++ b/admin/db/attachments_db.inc @@ -67,5 +67,16 @@ function get_attachment($id) return db_fetch($result); } +function has_attachment($type, $id) +{ + $sql = "SELECT DISTINCT * FROM ".TB_PREF."attachments WHERE type_no=".db_escape($type)." AND trans_no=".db_escape($id); + $result = db_query($sql, "Could not retrieve attachments"); + $myrow = db_fetch($result); + if ($myrow === false) + return 0; + else + return $myrow['id']; +} + ?> \ No newline at end of file diff --git a/dimensions/view/view_dimension.php b/dimensions/view/view_dimension.php index 2fe54071..98668027 100644 --- a/dimensions/view/view_dimension.php +++ b/dimensions/view/view_dimension.php @@ -95,6 +95,6 @@ display_dimension_balance($id, $_POST['TransFromDate'], $_POST['TransToDate']); br(1); -end_page(true); +end_page(true, false, false, ST_DIMENSION, $id); ?> diff --git a/gl/view/bank_transfer_view.php b/gl/view/bank_transfer_view.php index b56a331c..a2e0da4b 100644 --- a/gl/view/bank_transfer_view.php +++ b/gl/view/bank_transfer_view.php @@ -91,5 +91,5 @@ end_table(1); is_voided_display(ST_BANKTRANSFER, $trans_no, _("This transfer has been voided.")); -end_page(true); +end_page(true, false, false, ST_BANKTRANSFER, $trans_no); ?> \ No newline at end of file diff --git a/gl/view/gl_deposit_view.php b/gl/view/gl_deposit_view.php index 4a7da98b..26da4d4f 100644 --- a/gl/view/gl_deposit_view.php +++ b/gl/view/gl_deposit_view.php @@ -136,5 +136,5 @@ else display_allocations_from($to_trans['person_type_id'], $to_trans['person_id'], 2, $trans_no, $to_trans['amount']); } -end_page(true); +end_page(true, false, false, ST_BANKDEPOSIT, $trans_no); ?> \ No newline at end of file diff --git a/gl/view/gl_payment_view.php b/gl/view/gl_payment_view.php index 44dd2948..6b05b6d6 100644 --- a/gl/view/gl_payment_view.php +++ b/gl/view/gl_payment_view.php @@ -136,5 +136,5 @@ else display_allocations_from($from_trans['person_type_id'], $from_trans['person_id'], 1, $trans_no, -$from_trans['amount']); } -end_page(true); +end_page(true, false, false, ST_BANKPAYMENT, $trans_no); ?> \ No newline at end of file diff --git a/gl/view/gl_trans_view.php b/gl/view/gl_trans_view.php index 852080fe..14d1bd13 100644 --- a/gl/view/gl_trans_view.php +++ b/gl/view/gl_trans_view.php @@ -102,6 +102,6 @@ if ($heading_shown) is_voided_display($_GET['type_id'], $_GET['trans_no'], _("This transaction has been voided.")); -end_page(true); +end_page(true, false, false, $_GET['type_id'], $_GET['trans_no']); ?> diff --git a/includes/main.inc b/includes/main.inc index ca434c27..ef86d438 100644 --- a/includes/main.inc +++ b/includes/main.inc @@ -47,12 +47,12 @@ function page($title, $no_menu=false, $is_index=false, $onload="", $js="", $scri } } -function end_page($no_menu=false, $is_index=false, $hide_back_link=false) +function end_page($no_menu=false, $is_index=false, $hide_back_link=false, $type_no=0, $trans_no=0) { global $path_to_root; if (!$is_index && !$hide_back_link && function_exists('hyperlink_back')) - hyperlink_back(true, $no_menu); + hyperlink_back(true, $no_menu, $type_no, $trans_no); div_end(); // end of _page_body section include($path_to_root . "/includes/page/footer.inc"); diff --git a/includes/ui/ui_controls.inc b/includes/ui/ui_controls.inc index 7934730c..34c0431a 100644 --- a/includes/ui/ui_controls.inc +++ b/includes/ui/ui_controls.inc @@ -143,14 +143,24 @@ function access_string($label, $clean=false) return $clean ? $label : array($label, $access); } -function hyperlink_back($center=true, $no_menu=true) +function hyperlink_back($center=true, $no_menu=true, $type_no=0, $trans_no=0) { if ($center) echo "
"; - start_table("width=20%"); + start_table("width=30%"); start_row(); if ($no_menu) + { + if ($type_no != 0 && $trans_no != 0) + { + global $path_to_root; + include_once($path_to_root."/admin/db/attachments_db.inc"); + $id = has_attachment($type_no, $trans_no); + if ($id != 0) + echo ""._("View Attachment")."\n"; + } echo ""._("Print")."\n"; + } echo "".($no_menu ? _("Close") : _("Back"))."\n"; end_row(); end_table(); diff --git a/inventory/view/view_adjustment.php b/inventory/view/view_adjustment.php index 953e6018..1d87892b 100644 --- a/inventory/view/view_adjustment.php +++ b/inventory/view/view_adjustment.php @@ -72,5 +72,5 @@ end_table(1); is_voided_display(ST_INVADJUST, $trans_no, _("This adjustment has been voided.")); -end_page(true); +end_page(true, false, false, ST_INVADJUST, $trans_no); ?> \ No newline at end of file diff --git a/inventory/view/view_transfer.php b/inventory/view/view_transfer.php index 195f91bc..bf3e540b 100644 --- a/inventory/view/view_transfer.php +++ b/inventory/view/view_transfer.php @@ -76,5 +76,5 @@ end_table(1); is_voided_display(ST_LOCTRANSFER, $trans_no, _("This transfer has been voided.")); -end_page(true); +end_page(true, false, false, ST_LOCTRANSFER, $trans_no); ?> \ No newline at end of file diff --git a/manufacturing/view/wo_issue_view.php b/manufacturing/view/wo_issue_view.php index d8cda6eb..4c236516 100644 --- a/manufacturing/view/wo_issue_view.php +++ b/manufacturing/view/wo_issue_view.php @@ -123,7 +123,7 @@ display_wo_issue_details($wo_issue_no); echo "
"; -end_page(true); +end_page(true, false, false, ST_MANUISSUE, $wo_issue_no); ?> diff --git a/manufacturing/view/wo_production_view.php b/manufacturing/view/wo_production_view.php index 3017ac31..c79983fb 100644 --- a/manufacturing/view/wo_production_view.php +++ b/manufacturing/view/wo_production_view.php @@ -73,7 +73,7 @@ display_wo_production($wo_production); br(2); -end_page(true); +end_page(true, false, false, ST_MANURECEIVE], $wo_production); ?> diff --git a/manufacturing/view/work_order_view.php b/manufacturing/view/work_order_view.php index 61dfbf3c..611fe88c 100644 --- a/manufacturing/view/work_order_view.php +++ b/manufacturing/view/work_order_view.php @@ -81,6 +81,6 @@ echo "
"; is_voided_display(ST_WORKORDER, $woid, _("This work order has been voided.")); -end_page(true); +end_page(true, false, false, ST_WORKORDER, $woid); ?> diff --git a/purchasing/view/view_grn.php b/purchasing/view/view_grn.php index 71b5d120..8336ff2c 100644 --- a/purchasing/view/view_grn.php +++ b/purchasing/view/view_grn.php @@ -74,6 +74,6 @@ end_table(1); is_voided_display(ST_SUPPRECEIVE, $_GET['trans_no'], _("This delivery has been voided.")); -end_page(true); +end_page(true, false, false, ST_SUPPRECEIVE, $_GET['trans_no']); ?> diff --git a/purchasing/view/view_po.php b/purchasing/view/view_po.php index 32bd576d..04f50477 100644 --- a/purchasing/view/view_po.php +++ b/purchasing/view/view_po.php @@ -147,6 +147,6 @@ end_table(1); // outer table //---------------------------------------------------------------------------------------------------- -end_page(true); +end_page(true, false, false, ST_PURCHORDER, $_GET['trans_no']); ?> diff --git a/purchasing/view/view_supp_credit.php b/purchasing/view/view_supp_credit.php index c0d921ec..93134847 100644 --- a/purchasing/view/view_supp_credit.php +++ b/purchasing/view/view_supp_credit.php @@ -75,6 +75,6 @@ if (!$voided) display_allocations_from(PT_SUPPLIER, $supp_trans->supplier_id, ST_SUPPCREDIT, $trans_no, -($supp_trans->ov_amount + $supp_trans->ov_gst)); } -end_page(true); +end_page(true, false, false, ST_SUPPCREDIT, $trans_no); ?> \ No newline at end of file diff --git a/purchasing/view/view_supp_invoice.php b/purchasing/view/view_supp_invoice.php index ae97355f..87b54f5d 100644 --- a/purchasing/view/view_supp_invoice.php +++ b/purchasing/view/view_supp_invoice.php @@ -76,6 +76,6 @@ end_table(1); is_voided_display(ST_SUPPINVOICE, $trans_no, _("This invoice has been voided.")); -end_page(true); +end_page(true, false, false, ST_SUPPINVOICE, $trans_no); ?> \ No newline at end of file diff --git a/purchasing/view/view_supp_payment.php b/purchasing/view/view_supp_payment.php index 34fa9576..4c6c45ad 100644 --- a/purchasing/view/view_supp_payment.php +++ b/purchasing/view/view_supp_payment.php @@ -81,5 +81,5 @@ if (!$voided) display_allocations_from(PT_SUPPLIER, $receipt['supplier_id'], ST_SUPPAYMENT, $trans_no, -$receipt['Total']); } -end_page(true); +end_page(true, false, false, ST_SUPPAYMENT, $trans_no); ?> \ No newline at end of file diff --git a/sales/view/view_credit.php b/sales/view/view_credit.php index 0ca3c7f9..c3b36b55 100644 --- a/sales/view/view_credit.php +++ b/sales/view/view_credit.php @@ -152,6 +152,6 @@ if (!$voided) /* end of check to see that there was an invoice record to print */ -end_page(true); +end_page(true, false, false, ST_CUSTCREDIT, $trans_id); ?> \ No newline at end of file diff --git a/sales/view/view_dispatch.php b/sales/view/view_dispatch.php index a5a14813..8b9cfe15 100644 --- a/sales/view/view_dispatch.php +++ b/sales/view/view_dispatch.php @@ -166,6 +166,6 @@ end_table(1); is_voided_display(ST_CUSTDELIVERY, $trans_id, _("This dispatch has been voided.")); -end_page(true); +end_page(true, false, false, ST_CUSTDELIVERY, $trans_id); ?> \ No newline at end of file diff --git a/sales/view/view_invoice.php b/sales/view/view_invoice.php index c93a794c..44715413 100644 --- a/sales/view/view_invoice.php +++ b/sales/view/view_invoice.php @@ -168,6 +168,6 @@ end_table(1); is_voided_display(ST_SALESINVOICE, $trans_id, _("This invoice has been voided.")); -end_page(true); +end_page(true, false, false, ST_SALESINVOICE, $trans_id); ?> \ No newline at end of file diff --git a/sales/view/view_receipt.php b/sales/view/view_receipt.php index 8153b3ff..0a10d40e 100644 --- a/sales/view/view_receipt.php +++ b/sales/view/view_receipt.php @@ -60,5 +60,5 @@ if (!$voided) display_allocations_from(PT_CUSTOMER, $receipt['debtor_no'], ST_CUSTPAYMENT, $trans_id, $receipt['Total']); } -end_page(true); +end_page(true, false, false, ST_CUSTPAYMENT, $trans_id); ?> \ No newline at end of file diff --git a/sales/view/view_sales_order.php b/sales/view/view_sales_order.php index a047b91c..2fa6968b 100644 --- a/sales/view/view_sales_order.php +++ b/sales/view/view_sales_order.php @@ -231,6 +231,6 @@ label_row(_("Total Order Value"), $display_total, "align=right colspan=6", end_table(2); -end_page(true); +end_page(true, false, false, $_GET['trans_type'], $_GET['trans_no']); ?> -- 2.30.2