X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fview%2Fview_invoice.php;h=d6a6cb7aba96ed7b5874430f4309d74b1299fb37;hb=7840540918bfd37c886877a5d52e3ba0b3373289;hp=4fc4ce123160c55bc38f8d6455e0cecd1a06b36f;hpb=d9b4de9d7e9d3ba77f6ece752fd6cc988effd8f1;p=fa-stable.git
diff --git a/sales/view/view_invoice.php b/sales/view/view_invoice.php
index 4fc4ce12..d6a6cb7a 100644
--- a/sales/view/view_invoice.php
+++ b/sales/view/view_invoice.php
@@ -71,11 +71,10 @@ end_table();
echo "
"; // outer table
start_table(TABLESTYLE, "width=100%");
-$th = array(_("Delivered To"));
-table_header($th);
-
-label_row(null, $sales_order["deliver_to"] . " " . 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 " | "; // outer table
@@ -96,7 +95,7 @@ start_row();
label_cells(_("Invoice Date"), sql2date($myrow["tran_date"]), "class='tableheader2'", "nowrap");
label_cells(_("Due Date"), sql2date($myrow["due_date"]), "class='tableheader2'", "nowrap");
label_cells(_("Deliveries"), get_customer_trans_view_str(ST_CUSTDELIVERY,
- get_parent_trans(ST_SALESINVOICE,$trans_id)), "class='tableheader2'");
+ get_sales_parent_numbers(ST_SALESINVOICE, $trans_id)), "class='tableheader2'");
end_row();
comments_display_row(ST_SALESINVOICE, $trans_id);
end_table();
@@ -145,16 +144,16 @@ if (db_num_rows($result) > 0)
end_row();
} //end while there are line items to print out
+ $display_sub_tot = price_format($sub_total);
+ label_row(_("Sub-total"), $display_sub_tot, "colspan=6 align=right",
+ "nowrap align=right width=15%");
}
else
display_note(_("There are no line items on this invoice."), 1, 2);
-$display_sub_tot = price_format($sub_total);
$display_freight = price_format($myrow["ov_freight"]);
/*Print out the invoice text entered */
-label_row(_("Sub-total"), $display_sub_tot, "colspan=6 align=right",
- "nowrap align=right width=15%");
label_row(_("Shipping"), $display_freight, "colspan=6 align=right", "nowrap align=right");
$tax_items = get_trans_tax_details(ST_SALESINVOICE, $trans_id);
@@ -166,7 +165,12 @@ label_row(_("TOTAL INVOICE"), $display_total, "colspan=6 align=right",
"nowrap align=right");
end_table(1);
-is_voided_display(ST_SALESINVOICE, $trans_id, _("This invoice has been voided."));
+$voided = is_voided_display(ST_SALESINVOICE, $trans_id, _("This invoice has been voided."));
+
+if (!$voided)
+{
+ display_allocations_to(PT_CUSTOMER, $myrow['debtor_no'], ST_SALESINVOICE, $trans_id, $myrow['Total']);
+}
end_page(true, false, false, ST_SALESINVOICE, $trans_id);
|