projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improved javascript allocations
[fa-stable.git]
/
sales
/
view
/
view_dispatch.php
diff --git
a/sales/view/view_dispatch.php
b/sales/view/view_dispatch.php
index 0d56ffc75456e569dd15cb04d317e8ea02d31672..20ecb619d60ab7feea10c34af63a100dd519357d 100644
(file)
--- a/
sales/view/view_dispatch.php
+++ b/
sales/view/view_dispatch.php
@@
-29,9
+29,9
@@
$myrow = get_customer_trans($trans_id, 13);
$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(
_("DISPATCH NOTE") .' '. _('#').$trans_id
);
+display_heading(
sprintf(_("DISPATCH NOTE #%d"),$trans_id)
);
echo "<br>";
start_table("$table_style2 width=95%");
echo "<br>";
start_table("$table_style2 width=95%");
@@
-111,8
+111,9
@@
if (db_num_rows($result) > 0)
if($myrow2['quantity']==0) continue;
alt_table_row_color($k);
if($myrow2['quantity']==0) continue;
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)
{
@@
-120,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
@@
-137,8
+138,8
@@
if (db_num_rows($result) > 0)
else
display_note(_("There are no line items on this dispatch."), 1, 2);
else
display_note(_("There are no line items on this dispatch."), 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 delivery note text entered */
label_row(_("Sub-total"), $display_sub_tot, "colspan=6 align=right",
/*Print out the delivery note text entered */
label_row(_("Sub-total"), $display_sub_tot, "colspan=6 align=right",
@@
-148,7
+149,7
@@
label_row(_("Shipping"), $display_freight, "colspan=6 align=right", "nowrap alig
$tax_items = get_customer_trans_tax_details(13, $trans_id);
display_customer_trans_tax_details($tax_items, 6);
$tax_items = get_customer_trans_tax_details(13, $trans_id);
display_customer_trans_tax_details($tax_items, 6);
-$display_total =
number_format2($myrow["ov_freight"]+$myrow["ov_amount"],user_price_dec()
);
+$display_total =
price_format($myrow["ov_freight"]+$myrow["ov_amount"]+$myrow["ov_freight_tax"]+$myrow["ov_gst"]
);
label_row(_("TOTAL VALUE"), $display_total, "colspan=6 align=right",
"nowrap align=right");
label_row(_("TOTAL VALUE"), $display_total, "colspan=6 align=right",
"nowrap align=right");