Added payment terms in SO/SI view

diff --git a/sales/view/view_invoice.php b/sales/view/view_invoice.php
index 2add8a65d365c2fd2f1b5b60a329c88c9686df87..35e1eba9fc4a16c4171652e018805343a68b730e 100644 (file)
--- a/sales/view/view_invoice.php
+++ b/sales/view/view_invoice.php
@@ -71,11 +71,10 @@ end_table();
 echo "</td><td>"; // outer table
 
 start_table(TABLESTYLE, "width=100%");
-$th = array(_("Delivered To"));
-table_header($th);
-
-label_row(null, $sales_order["deliver_to"] . "<br>" . nl2br($sales_order["delivery_address"]),
-       "nowrap");
+$th = array(_("Payment Terms"));
+table_header($th); 
+$paym = get_payment_terms($myrow['payment_terms']);
+label_row(null, $paym["terms"], "nowrap");
 end_table();
 
 echo "</td><td>"; // outer table

diff --git a/sales/view/view_sales_order.php b/sales/view/view_sales_order.php
index 9d287ed961baed9b38fb07350b591fbf40f5d9a2..ff88393cf4c5b86e9f2fae197397ee7f0efaba14 100644 (file)
--- a/sales/view/view_sales_order.php
+++ b/sales/view/view_sales_order.php
@@ -74,6 +74,7 @@ label_cells(_("Order Currency"), $_SESSION['View']->customer_currency, "class='t
 label_cells(_("Deliver From Location"), $_SESSION['View']->location_name, "class='tableheader2'");
 end_row();
 
+label_row(_("Payment Terms"), $_SESSION['View']->payment_terms['terms'], "class='tableheader2'", "colspan=3");
 label_row(_("Delivery Address"), nl2br($_SESSION['View']->delivery_address),
        "class='tableheader2'", "colspan=3");
 label_row(_("Reference"), $_SESSION['View']->reference, "class='tableheader2'", "colspan=3");