X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fview%2Fview_invoice.php;h=6f7de98ae57e116528d70b40498204d500c475d6;hb=264c09696d65efe4532c197f317162daf8c24f32;hp=61fc0b56fb88f0974ba980dd1bf2d0f7d67413ac;hpb=31a8106c5c716ccf24a16c6704497fd819daf762;p=fa-stable.git

diff --git a/sales/view/view_invoice.php b/sales/view/view_invoice.php
index 61fc0b56..6f7de98a 100644
--- a/sales/view/view_invoice.php
+++ b/sales/view/view_invoice.php
@@ -35,12 +35,14 @@ elseif (isset($_POST["trans_no"]))
 // 3 different queries to get the information - what a JOKE !!!!
 
 $myrow = get_customer_trans($trans_id, ST_SALESINVOICE);
+$paym = get_payment_terms($myrow['payment_terms']);
 
 $branch = get_branch($myrow["branch_code"]);
 
 $sales_order = get_sales_order_header($myrow["order_"], ST_SALESORDER);
 
-display_heading(sprintf(_("SALES INVOICE #%d"),$trans_id));
+display_heading(sprintf($myrow['prep_amount'] > 0 ? (
+	$paym['days_before_due']>=0 ? _("FINAL INVOICE #%d") : _("PREPAYMENT INVOICE #%d")) : _("SALES INVOICE #%d"),$trans_id));
 
 echo "<br>";
 start_table(TABLESTYLE2, "width=95%");
@@ -73,7 +75,6 @@ echo "</td><td>"; // outer table
 start_table(TABLESTYLE, "width=100%");
 $th = array(_("Payment Terms"));
 table_header($th); 
-$paym = get_payment_terms($myrow['payment_terms']);
 label_row(null, $paym["terms"], "nowrap");
 end_table();
 
@@ -92,10 +93,11 @@ label_cells(_("Shipping Company"), $myrow["shipper_name"], "class='tableheader2'
 label_cells(_("Sales Type"), $myrow["sales_type"], "class='tableheader2'");
 end_row();
 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_sales_parent_numbers(ST_SALESINVOICE, $trans_id)), "class='tableheader2'");
+if ($myrow['prep_amount']==0)
+	label_cells(_("Deliveries"), get_customer_trans_view_str(ST_CUSTDELIVERY, 
+		get_sales_parent_numbers(ST_SALESINVOICE, $trans_id)), "class='tableheader2'");
+label_cells(_("Invoice Date"), sql2date($myrow["tran_date"]), "class='tableheader2'", "nowrap");
 end_row();
 comments_display_row(ST_SALESINVOICE, $trans_id);
 end_table();
@@ -165,7 +167,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);