projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed problems with excel report generation.
[fa-stable.git]
/
sales
/
view
/
view_invoice.php
diff --git
a/sales/view/view_invoice.php
b/sales/view/view_invoice.php
index 61fc0b56fb88f0974ba980dd1bf2d0f7d67413ac..4bd251fa870c7457fa1a64bc2e2d5b77481d9054 100644
(file)
--- a/
sales/view/view_invoice.php
+++ b/
sales/view/view_invoice.php
@@
-43,11
+43,11
@@
$sales_order = get_sales_order_header($myrow["order_"], ST_SALESORDER);
display_heading(sprintf(_("SALES INVOICE #%d"),$trans_id));
echo "<br>";
display_heading(sprintf(_("SALES INVOICE #%d"),$trans_id));
echo "<br>";
-start_table(TABLESTYLE2, "width=
95%
");
+start_table(TABLESTYLE2, "width=
'95%'
");
echo "<tr valign=top><td>"; // outer table
/*Now the customer charged to details in a sub table*/
echo "<tr valign=top><td>"; // outer table
/*Now the customer charged to details in a sub table*/
-start_table(TABLESTYLE, "width=
100%
");
+start_table(TABLESTYLE, "width=
'100%'
");
$th = array(_("Charge To"));
table_header($th);
$th = array(_("Charge To"));
table_header($th);
@@
-61,7
+61,7
@@
echo "</td><td>"; // outer table
/*end of the main table showing the company name and charge to details */
/*end of the main table showing the company name and charge to details */
-start_table(TABLESTYLE, "width=
100%
");
+start_table(TABLESTYLE, "width=
'100%'
");
$th = array(_("Charge Branch"));
table_header($th);
$th = array(_("Charge Branch"));
table_header($th);
@@
-70,7
+70,7
@@
end_table();
echo "</td><td>"; // outer table
echo "</td><td>"; // outer table
-start_table(TABLESTYLE, "width=
100%
");
+start_table(TABLESTYLE, "width=
'100%'
");
$th = array(_("Payment Terms"));
table_header($th);
$paym = get_payment_terms($myrow['payment_terms']);
$th = array(_("Payment Terms"));
table_header($th);
$paym = get_payment_terms($myrow['payment_terms']);
@@
-79,7
+79,7
@@
end_table();
echo "</td><td>"; // outer table
echo "</td><td>"; // outer table
-start_table(TABLESTYLE, "width=
100%
");
+start_table(TABLESTYLE, "width=
'100%'
");
start_row();
label_cells(_("Reference"), $myrow["reference"], "class='tableheader2'");
label_cells(_("Currency"), $sales_order["curr_code"], "class='tableheader2'");
start_row();
label_cells(_("Reference"), $myrow["reference"], "class='tableheader2'");
label_cells(_("Currency"), $sales_order["curr_code"], "class='tableheader2'");
@@
-106,7
+106,7
@@
end_table(1); // outer table
$result = get_customer_trans_details(ST_SALESINVOICE, $trans_id);
$result = get_customer_trans_details(ST_SALESINVOICE, $trans_id);
-start_table(TABLESTYLE, "width=
95%
");
+start_table(TABLESTYLE, "width=
'95%'
");
if (db_num_rows($result) > 0)
{
if (db_num_rows($result) > 0)
{
@@
-146,16
+146,18
@@
if (db_num_rows($result) > 0)
$display_sub_tot = price_format($sub_total);
label_row(_("Sub-total"), $display_sub_tot, "colspan=6 align=right",
$display_sub_tot = price_format($sub_total);
label_row(_("Sub-total"), $display_sub_tot, "colspan=6 align=right",
- "nowrap align=right width=
15%
");
+ "nowrap align=right width=
'15%'
");
}
else
display_note(_("There are no line items on this invoice."), 1, 2);
}
else
display_note(_("There are no line items on this invoice."), 1, 2);
-$display_freight = price_format($myrow["ov_freight"]);
/*Print out the invoice text entered */
/*Print out the invoice text entered */
-label_row(_("Shipping"), $display_freight, "colspan=6 align=right", "nowrap align=right");
-
+if ($myrow['ov_freight'] != 0.0)
+{
+ $display_freight = price_format($myrow["ov_freight"]);
+ label_row(_("Shipping"), $display_freight, "colspan=6 align=right", "nowrap align=right");
+}
$tax_items = get_trans_tax_details(ST_SALESINVOICE, $trans_id);
display_customer_trans_tax_details($tax_items, 6);
$tax_items = get_trans_tax_details(ST_SALESINVOICE, $trans_id);
display_customer_trans_tax_details($tax_items, 6);
@@
-165,7
+167,12
@@
label_row(_("TOTAL INVOICE"), $display_total, "colspan=6 align=right",
"nowrap align=right");
end_table(1);
"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);
end_page(true, false, false, ST_SALESINVOICE, $trans_id);