projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Binary commit of image files
[fa-stable.git]
/
sales
/
view
/
view_invoice.php
diff --git
a/sales/view/view_invoice.php
b/sales/view/view_invoice.php
index 15471f8628acddbd16cedf154d670f47b078bf62..c15753b6c2678c80396e32f6cde34d788ba28a0f 100644
(file)
--- a/
sales/view/view_invoice.php
+++ b/
sales/view/view_invoice.php
@@
-4,12
+4,16
@@
$page_security = 1;
$path_to_root="../..";
include_once($path_to_root . "/includes/session.inc");
$path_to_root="../..";
include_once($path_to_root . "/includes/session.inc");
-page(_("View Sales Invoice"), true);
-
include_once($path_to_root . "/sales/includes/sales_ui.inc");
include_once($path_to_root . "/sales/includes/sales_db.inc");
include_once($path_to_root . "/sales/includes/sales_ui.inc");
include_once($path_to_root . "/sales/includes/sales_db.inc");
+$js = "";
+if ($use_popup_windows)
+ $js .= get_js_open_window(900, 600);
+page(_("View Sales Invoice"), true, false, "", $js);
+
+
if (isset($_GET["trans_no"]))
{
$trans_id = $_GET["trans_no"];
if (isset($_GET["trans_no"]))
{
$trans_id = $_GET["trans_no"];
@@
-25,9
+29,9
@@
$myrow = get_customer_trans($trans_id, 10);
$branch = get_branch($myrow["branch_code"]);
$branch = get_branch($myrow["branch_code"]);
-$sales_order = get_sales_order($myrow["order_"]);
+$sales_order = get_sales_order
_header
($myrow["order_"]);
-display_heading(
_("SALES INVOICE") . " #$trans_id"
);
+display_heading(
sprintf(_("SALES INVOICE #%d"),$trans_id)
);
echo "<br>";
start_table("$table_style2 width=95%");
echo "<br>";
start_table("$table_style2 width=95%");
@@
-104,11
+108,12
@@
if (db_num_rows($result) > 0)
$sub_total = 0;
while ($myrow2 = db_fetch($result))
{
$sub_total = 0;
while ($myrow2 = db_fetch($result))
{
-
+ if($myrow2["quantity"]==0) continue;
alt_table_row_color($k);
alt_table_row_color($k);
- $net = ((1 - $myrow2["discount_percent"]) * $myrow2["FullUnitPrice"] * -$myrow2["quantity"]);
- $sub_total += $net;
+ $value = round(((1 - $myrow2["discount_percent"]) * $myrow2["unit_price"] * $myrow2["quantity"]),
+ user_price_dec());
+ $sub_total += $value;
if ($myrow2["discount_percent"] == 0)
{
if ($myrow2["discount_percent"] == 0)
{
@@
-116,16
+121,16
@@
if (db_num_rows($result) > 0)
}
else
{
}
else
{
- $display_discount =
number_format2($myrow2["discount_percent"]*100,user_percent_dec()
) . "%";
+ $display_discount =
percent_format($myrow2["discount_percent"]*100
) . "%";
}
label_cell($myrow2["stock_id"]);
label_cell($myrow2["StockDescription"]);
}
label_cell($myrow2["stock_id"]);
label_cell($myrow2["StockDescription"]);
- qty_cell(
-
$myrow2["quantity"]);
+ qty_cell($myrow2["quantity"]);
label_cell($myrow2["units"], "align=right");
label_cell($myrow2["units"], "align=right");
- amount_cell($myrow2["
FullUnitP
rice"]);
+ amount_cell($myrow2["
unit_p
rice"]);
label_cell($display_discount, "nowrap align=right");
label_cell($display_discount, "nowrap align=right");
- amount_cell($
net
);
+ amount_cell($
value
);
end_row();
} //end while there are line items to print out
end_row();
} //end while there are line items to print out
@@
-133,8
+138,8
@@
if (db_num_rows($result) > 0)
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_sub_tot =
number_format2($sub_total,user_price_dec()
);
-$display_freight =
number_format2($myrow["ov_freight"],user_price_dec()
);
+$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",
/*Print out the invoice text entered */
label_row(_("Sub-total"), $display_sub_tot, "colspan=6 align=right",
@@
-144,7
+149,7
@@
label_row(_("Shipping"), $display_freight, "colspan=6 align=right", "nowrap alig
$tax_items = get_customer_trans_tax_details(10, $trans_id);
display_customer_trans_tax_details($tax_items, 6);
$tax_items = get_customer_trans_tax_details(10, $trans_id);
display_customer_trans_tax_details($tax_items, 6);
-$display_total =
number_format2($myrow["ov_freight"]+$myrow["ov_gst"]+$myrow["ov_amount"],user_price_dec()
);
+$display_total =
price_format($myrow["ov_freight"]+$myrow["ov_gst"]+$myrow["ov_amount"]+$myrow["ov_freight_tax"]
);
label_row(_("TOTAL INVOICE"), $display_total, "colspan=6 align=right",
"nowrap align=right");
label_row(_("TOTAL INVOICE"), $display_total, "colspan=6 align=right",
"nowrap align=right");