Added trans_editor_link helper.

diff --git a/gl/inquiry/journal_inquiry.php b/gl/inquiry/journal_inquiry.php
index 61cb255ff2b49c47c05a5c9da2b2622e65a6c6db..88e36a9171626196387f8641499947ea9f94b812 100644 (file)
--- a/gl/inquiry/journal_inquiry.php
+++ b/gl/inquiry/journal_inquiry.php
@@ -79,33 +79,8 @@ function gl_link($row)
        return get_gl_view_str($row["type"], $row["type_no"]);
 }
 
-$editors = array(
-       ST_JOURNAL => "/gl/gl_journal.php?ModifyGL=Yes&trans_no=%d&trans_type=%d",
-       ST_BANKPAYMENT => "/gl/gl_bank.php?ModifyPayment=Yes&trans_no=%d&trans_type=%d",
-       ST_BANKDEPOSIT => "/gl/gl_bank.php?ModifyDeposit=Yes&trans_no=%d&trans_type=%d",
-//     4=> Funds Transfer,
-   ST_SALESINVOICE => "/sales/customer_invoice.php?ModifyInvoice=%d",
-//   11=>
-// free hand (debtors_trans.order_==0)
-//     "/sales/credit_note_entry.php?ModifyCredit=%d"
-// credit invoice
-//     "/sales/customer_credit_invoice.php?ModifyCredit=%d"
-//      12=> Customer Payment,
-   ST_CUSTDELIVERY => "/sales/customer_delivery.php?ModifyDelivery=%d",
-//   16=> Location Transfer,
-//   17=> Inventory Adjustment,
-//   20=> Supplier Invoice,
-//   21=> Supplier Credit Note,
-//   22=> Supplier Payment,
-//   25=> Purchase Order Delivery,
-//   28=> Work Order Issue,
-//   29=> Work Order Production",
-//   35=> Cost Update,
-);
-
 function edit_link($row)
 {
-       global $editors;
 
        $ok = true;
        if ($row['type'] == ST_SALESINVOICE)
@@ -113,11 +88,8 @@ function edit_link($row)
                $myrow = get_customer_trans($row["type_no"], $row["type"]);
                if ($myrow['alloc'] != 0 || get_voided_entry(ST_SALESINVOICE, $row["type_no"]) !== false)
                        $ok = false;
-       }               
-       return isset($editors[$row["type"]]) && !is_closed_trans($row["type"], $row["type_no"]) && $ok ? 
-               pager_link(_("Edit"), 
-                       sprintf($editors[$row["type"]], $row["type_no"], $row["type"]),
-                       ICON_EDIT) : '';
+       }
+       return $ok ? trans_editor_link($row["type"], $row["type_no"]) : '';
 }
 
 $sql = get_sql_for_journal_inquiry(get_post('filterType', -1), get_post('FromDate'),

diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc
index d72b8b18638a1caae2cf1338fccd32f1f198e00e..b3cb79b17d024c7fbe5c487910f605cc3cb3c5a6 100644 (file)
--- a/includes/ui/ui_input.inc
+++ b/includes/ui/ui_input.inc
@@ -943,26 +943,6 @@ function supplier_credit_row($supplier, $credit, $parms='')
                ."</a>", $parms);
 }
 
-/*
-       Edit transaction link to be used in transaction inquires
-*/
-function edit_trans_link($trans_type, $trans_no, $url='')
-{
-       global $path_to_root, $trans_editors;
-
-       if (!$url) $url = @$trans_editors[$trans_type];
-
-       if (!$trans_no || !$url)
-               return '';
-
-       if (is_closed_trans($trans_type, $trans_no)) {
-               return set_icon(ICON_CLOSED, _('Closed'));
-       } else {
-               $link_text = user_graphic_links() ? set_icon(ICON_EDIT, _('Edit')) : _('Edit');
-               return "<a href='".$path_to_root . sprintf($url, $trans_no, $trans_type)."'>$link_text</a>";
-       }
-}
-
 function bank_balance_row($bank_acc, $parms='')
 {
        global $path_to_root;

diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index 768447bca9083fce1d48698a0ff4808be494762e..0b4f31138de66cae22ae324e81c4f559e2286144 100644 (file)
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -1431,3 +1431,37 @@ function payment_link($name, $options)
 
        return strtr($link, $patterns);
 }
+
+function trans_editor_link($type, $trans_no)
+{
+       global $path_to_root;
+
+       $editor_url = array(
+               ST_JOURNAL => "/gl/gl_journal.php?ModifyGL=Yes&trans_no=%d&trans_type=%d",
+               ST_BANKPAYMENT => "/gl/gl_bank.php?ModifyPayment=Yes&trans_no=%d&trans_type=%d",
+               ST_BANKDEPOSIT => "/gl/gl_bank.php?ModifyDeposit=Yes&trans_no=%d&trans_type=%d",
+           ST_BANKTRANSFER => "/gl/bank_transfer.php?ModifyTransfer=Yes&trans_no=%d&trans_type=%d",
+       ST_SALESINVOICE => "/sales/customer_invoice.php?ModifyInvoice=%d",
+               ST_CUSTCREDIT => "/sales/credit_note_entry.php?ModifyCredit=%d", // only for free hand credit notes (debtors_trans.order_==0)
+               ST_CUSTPAYMENT => "/sales/customer_payments.php?trans_no=%d",
+               ST_CUSTDELIVERY => "/sales/customer_delivery.php?ModifyDelivery=%d",
+//   16=> Location Transfer,
+//   17=> Inventory Adjustment,
+               ST_SUPPINVOICE => "/purchasing/supplier_invoice.php?ModifyInvoice=%d",
+               ST_SUPPCREDIT =>  "/purchasing/supplier_credit.php?ModifyCredit=%d",
+//   21=> Supplier Credit Note,
+//   22=> Supplier Payment,
+//   25=> Purchase Order Delivery,
+               ST_PURCHORDER => "/purchasing/po_entry_items.php?ModifyOrderNumber=%d",
+//   28=> Work Order Issue,
+//   29=> Work Order Production",
+               ST_WORKORDER => "/manufacturing/work_order_entry.php?trans_no=%d",
+               ST_SALESORDER => "/sales/sales_order_entry.php?ModifyOrderNumber=%d",
+               ST_SALESQUOTE => "/sales/sales_order_entry.php?ModifyQuotationNumber=%d",
+       //   35=> Cost Update,
+       );
+
+       return !isset($editor_url[$type]) ? '' :
+               (is_closed_trans($type, $trans_no) ? set_icon(ICON_CLOSED, _('Closed')) :
+                       pager_link(_("Edit"), sprintf($editor_url[$type], $trans_no, $type), ICON_EDIT));
+}

diff --git a/manufacturing/search_work_orders.php b/manufacturing/search_work_orders.php
index 106114af07be77210318f3b52823e57f34237487..b0c8688e644a3990e8d6befcd20d6a68ecf3b289 100644 (file)
--- a/manufacturing/search_work_orders.php
+++ b/manufacturing/search_work_orders.php
@@ -106,8 +106,7 @@ function wo_type_name($dummy, $type)
 function edit_link($row)
 {
        return  $row['closed'] ? '<i>'._('Closed').'</i>' :
-               pager_link(_("Edit"),
-                       "/manufacturing/work_order_entry.php?trans_no=" . $row["id"], ICON_EDIT);
+               trans_editor_link(ST_WORKORDER, $row["id"]);
 }
 
 function release_link($row)

diff --git a/purchasing/inquiry/po_search.php b/purchasing/inquiry/po_search.php
index f3203f6361126a16d0d5c1da5f87ddb17a42d99f..5aa19b4e5ab8c8e9907fc093f1c1f743bb4f7894 100644 (file)
--- a/purchasing/inquiry/po_search.php
+++ b/purchasing/inquiry/po_search.php
@@ -86,8 +86,7 @@ function trans_view($trans)
 
 function edit_link($row) 
 {
-  return pager_link( _("Edit"),
-       "/purchasing/po_entry_items.php?ModifyOrderNumber=" . $row["order_no"], ICON_EDIT);
+       return trans_editor_link(ST_PURCHORDER, $trans["order_no"]);
 }
 
 function prt_link($row)

diff --git a/purchasing/inquiry/po_search_completed.php b/purchasing/inquiry/po_search_completed.php
index cb67ab7d4ba5a4d71ba71964a542df0704f778a5..7a89e4eb9986aa29b555f4285409c15d442915fe 100644 (file)
--- a/purchasing/inquiry/po_search_completed.php
+++ b/purchasing/inquiry/po_search_completed.php
@@ -104,11 +104,8 @@ function edit_link($row)
 {
        global $page_nested;
 
-       if ($page_nested)
-               return '';
-       return pager_link( _("Edit"),
-               "/purchasing/po_entry_items.php?" . SID 
-               . "ModifyOrderNumber=" . $row["order_no"], ICON_EDIT);
+       return $page_nested ? ''
+               trans_editor_link(ST_PURCHORDER, $trans["order_no"]);
 }
 
 function prt_link($row)

diff --git a/purchasing/inquiry/supplier_inquiry.php b/purchasing/inquiry/supplier_inquiry.php
index d89d5d3590a8b8c10a9d063d286f0f8d00ce25a9..4abd00007b17a4b22ca9fe50ef11a671ff392d85 100644 (file)
--- a/purchasing/inquiry/supplier_inquiry.php
+++ b/purchasing/inquiry/supplier_inquiry.php
@@ -163,7 +163,7 @@ function check_overdue($row)
 
 function edit_link($row)
 {
-       return edit_trans_link($row['type'], $row['trans_no']);
+       return trans_editor_link($row['type'], $row['trans_no']);
 }
 //------------------------------------------------------------------------------------------------
 

diff --git a/sales/includes/db/sales_order_db.inc b/sales/includes/db/sales_order_db.inc
index e851f747ecab892c10cd9a643463456c45707963..ff61aaa5eef5b8c091a48ef38a43c2741131fa52 100644 (file)
--- a/sales/includes/db/sales_order_db.inc
+++ b/sales/includes/db/sales_order_db.inc
@@ -489,7 +489,8 @@ function get_sql_for_sales_orders_view($trans_type, $trans_no, $filter,
                        prep_amount,
                        allocs.ord_payments,
                        inv.inv_payments,
-                       sorder.total
+                       sorder.total,
+                       sorder.trans_type
                FROM ".TB_PREF."sales_orders as sorder
                LEFT JOIN (SELECT trans_no_to, sum(amt) ord_payments FROM ".TB_PREF."cust_allocations WHERE trans_type_to=".ST_SALESORDER." GROUP BY trans_no_to)
                         allocs ON sorder.trans_type=".ST_SALESORDER." AND allocs.trans_no_to=sorder.order_no

diff --git a/sales/inquiry/customer_inquiry.php b/sales/inquiry/customer_inquiry.php
index 50e4e73be1b3c5fcbb3b33b4db6c48bf1ceb7d81..123066edebe6f1ab6f09e5443368e8807a286c95 100644 (file)
--- a/sales/inquiry/customer_inquiry.php
+++ b/sales/inquiry/customer_inquiry.php
@@ -155,7 +155,7 @@ function fmt_credit($row)
 function credit_link($row)
 {
        global $page_nested;
-       
+
        if ($page_nested)
                return '';
        return $row['type'] == ST_SALESINVOICE && $row["Outstanding"] > 0 ?
@@ -171,8 +171,8 @@ function edit_link($row)
        if ($page_nested)
                return '';
 
-       return edit_trans_link($row['type'], $row['trans_no'], $row['type']==ST_CUSTCREDIT && $row['order_']==0 ?
-               "/sales/credit_note_entry.php?ModifyCredit=%d" : 0);
+       return $row['type'] == ST_CUSTCREDIT && $row['order_'] ? '' :   // allow  only free hand credit notes edition
+                       trans_editor_link($row['type'], $row['trans_no']);
 }
 
 function prt_link($row)
@@ -181,7 +181,7 @@ function prt_link($row)
                return print_document_link($row['trans_no']."-".$row['type'], _("Print Receipt"), true, ST_CUSTPAYMENT, ICON_PRINT);
        elseif ($row['type'] == ST_BANKPAYMENT) // bank payment printout not defined yet.
                return '';
-       else    
+       else
                return print_document_link($row['trans_no']."-".$row['type'], _("Print"), true, $row['type'], ICON_PRINT);
 }
 

diff --git a/sales/inquiry/sales_deliveries_view.php b/sales/inquiry/sales_deliveries_view.php
index bc1f3a9954eacf40a0af7b1982d34b55613e9fda..b9ed9b6e6b06cc4a015307fb53706ca4b71b83d6 100644 (file)
--- a/sales/inquiry/sales_deliveries_view.php
+++ b/sales/inquiry/sales_deliveries_view.php
@@ -140,8 +140,7 @@ function batch_checkbox($row)
 function edit_link($row)
 {
        return $row["Outstanding"]==0 ? '' :
-               pager_link(_('Edit'), "/sales/customer_delivery.php?ModifyDelivery="
-                       .$row['trans_no'], ICON_EDIT);
+               trans_editor_link(ST_CUSTDELIVERY, $row['trans_no']);
 }
 
 function prt_link($row)

diff --git a/sales/inquiry/sales_orders_view.php b/sales/inquiry/sales_orders_view.php
index a9f8cf7570bb28cd79b80b387af09b5dd8a770dd..f5977aa791bb0bb9444ad87ffcb92c50cd67c760 100644 (file)
--- a/sales/inquiry/sales_orders_view.php
+++ b/sales/inquiry/sales_orders_view.php
@@ -106,12 +106,7 @@ function edit_link($row)
 {
        global $page_nested;
 
-       if ($page_nested)
-               return '';
-       global $trans_type;
-       $modify = ($trans_type == ST_SALESORDER ? "ModifyOrderNumber" : "ModifyQuotationNumber");
-  return pager_link( _("Edit"),
-    "/sales/sales_order_entry.php?$modify=" . $row['order_no'], ICON_EDIT);
+       return $page_nested ? '' : trans_editor_link($row['trans_type'], $row['order_no']);
 }
 
 function dispatch_link($row)