Added 'View Attachments' if any in all popup view windows

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 23a00f9a18d92dab11e36b177964279286c4f9e2..1618390395175836e64ae084ff245acfeb500e56 100644 (file)
--- 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 6934071f4756b46c30cbfad958f0ef497da8bcfc..499080a28c16c2c11a25cd62bc9276b9247e3517 100644 (file)
--- 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 2fe540712d37d2f498ba7365da593545119e518d..98668027c1f617629069a2e747e8dd766290e005 100644 (file)
--- 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 b56a331ca06635846eabb8aca15f38b3472fd0b2..a2e0da4b614018df5d90e8bf6eb1abdfaa828e66 100644 (file)
--- 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 4a7da98bd06708addf277ea0b40a5b224da00dd1..26da4d4fd9c496847cfb4c1be350028c80dd3bfe 100644 (file)
--- 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 44dd2948a5d45ff78380775f26b9c1c5e2571ad1..6b05b6d6aa915b840d9a4a050e605177db114271 100644 (file)
--- 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 852080fe65a3597683da150b8093fd270b335f44..14d1bd138bec14b67eb694e2ec7103a507d63b52 100644 (file)
--- 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 ca434c27b2e5ae5e43c1e95f876d17675736958a..ef86d4383903f587fda2eda5ab7e5f6b2eac000c 100644 (file)
--- 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 7934730c0629dfbb97f0d79739fe4cf4f52b9b3f..34c0431af503bf803d9af14f2ded1732e956d9b4 100644 (file)
--- 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 "<center>";
-       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 "<td align=center><a href='$path_to_root/admin/attachments.php?vw=$id' target='blanc_'>"._("View Attachment")."</a></td>\n";
+               }       
                echo "<td align=center><a href='javascript:window.print();'>"._("Print")."</a></td>\n";
+       }       
        echo "<td align=center><a href='javascript:goBack();'>".($no_menu ? _("Close") : _("Back"))."</a></td>\n";
        end_row();
        end_table();

diff --git a/inventory/view/view_adjustment.php b/inventory/view/view_adjustment.php
index 953e6018e1eab816910ca14c8fe1e9c9b26a4b4d..1d87892bc703756cc59c8e055d6936643e0d63b0 100644 (file)
--- 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 195f91bcc2522ca0d4c0a5561076b7052b6b8fb4..bf3e540bdf479b251b425b2f27c23e2b62689f09 100644 (file)
--- 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 d8cda6eb878d059dca1dfda5ccecc0e6fa252e29..4c2365165078711bcf80d3b8d4a81109dacfa758 100644 (file)
--- 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 "<br>";
 
-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 3017ac31fefe97d1f8b0900ae3293c1b57695471..c79983fbb41bbd36a2a8d4c9f288bcf5535ced7b 100644 (file)
--- 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 61dfbf3c05192da5bab37364b983f94e007af100..611fe88caf0b4637a19c5f93adde1e1bd257aec2 100644 (file)
--- a/manufacturing/view/work_order_view.php
+++ b/manufacturing/view/work_order_view.php
@@ -81,6 +81,6 @@ echo "<br></center>";
 
 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 71b5d12072372d70fbf2cab989a5da7afef56780..8336ff2c264b82d5e922123e30391a21669b1ae2 100644 (file)
--- 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 32bd576db339040131e79d6d07531b5478837385..04f50477b5a7e2040fa6de727533378add3ebb16 100644 (file)
--- 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 c0d921ecd7dcd5d70b6139cb6ddd3d766a3db962..9313484799bd487f07c0e6789df99678049ff8c9 100644 (file)
--- 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 ae97355f8caf63ffdb2f50505c6b9aae8ccb46e0..87b54f5d2c9bd7c264c25851f73436ea6537b6c6 100644 (file)
--- 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 34fa9576121f52918a9ba028376f2363ebfe9a7e..4c6c45ad009d3e328a491034d3fec5cadab974b8 100644 (file)
--- 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 0ca3c7f9737663873facaf1ec237223ca9161c1c..c3b36b55ad4964fed2ea40a55bf7b20b5b9281fa 100644 (file)
--- 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 a5a1481316ab330df3585d55c61ec719543a9569..8b9cfe15fab5d4312f82f2b1a52945cd7878ebef 100644 (file)
--- 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 c93a794c638e03128bf30f90446c55af487de435..44715413dae0653021e3ed4b081c79a6d538de60 100644 (file)
--- 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 8153b3ff82c11d55abfcfc37fb1bd69ee5cd464e..0a10d40eae364694d07675b49b9db59267f24a5a 100644 (file)
--- 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 a047b91c5093e16a11552970b0600b2e388d1ee3..2fa6968ba4ea28110df9402d2158a11ad8577a0a 100644 (file)
--- 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']);
 
 ?>