projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added ajax request indicator and some minor fixes.
[fa-stable.git]
/
sales
/
view
/
view_dispatch.php
diff --git
a/sales/view/view_dispatch.php
b/sales/view/view_dispatch.php
index 8a4460c0ee154029c03b07cd6027225d478fa32f..3d7d2e75253d70b0febbd844408e92b6a797f229 100644
(file)
--- a/
sales/view/view_dispatch.php
+++ b/
sales/view/view_dispatch.php
@@
-17,7
+17,7
@@
page(_("View Sales Dispatch"), true, false, "", $js);
if (isset($_GET["trans_no"]))
{
$trans_id = $_GET["trans_no"];
if (isset($_GET["trans_no"]))
{
$trans_id = $_GET["trans_no"];
-}
+}
elseif (isset($_POST["trans_no"]))
{
$trans_id = $_POST["trans_no"];
elseif (isset($_POST["trans_no"]))
{
$trans_id = $_POST["trans_no"];
@@
-75,7
+75,7
@@
start_table("$table_style 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'");
-label_cells(_("Our Order No"),
+label_cells(_("Our Order No"),
get_customer_trans_view_str(systypes::sales_order(),$sales_order["order_no"]), "class='tableheader2'");
end_row();
start_row();
get_customer_trans_view_str(systypes::sales_order(),$sales_order["order_no"]), "class='tableheader2'");
end_row();
start_row();
@@
-102,7
+102,7
@@
if (db_num_rows($result) > 0)
{
$th = array(_("Item Code"), _("Item Description"), _("Quantity"),
_("Unit"), _("Price"), _("Discount %"), _("Total"));
{
$th = array(_("Item Code"), _("Item Description"), _("Quantity"),
_("Unit"), _("Price"), _("Discount %"), _("Total"));
- table_header($th);
+ table_header($th);
$k = 0; //row colour counter
$sub_total = 0;
$k = 0; //row colour counter
$sub_total = 0;
@@
-111,21
+111,22
@@
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);
- $value = ((1 - $myrow2["discount_percent"]) * $myrow2["unit_price"] * $myrow2["quantity"]);
+ $value = round(((1 - $myrow2["discount_percent"]) * $myrow2["unit_price"] * $myrow2["quantity"]),
+ user_price_dec());
$sub_total += $value;
if ($myrow2["discount_percent"] == 0)
{
$display_discount = "";
$sub_total += $value;
if ($myrow2["discount_percent"] == 0)
{
$display_discount = "";
- }
- else
+ }
+ else
{
$display_discount = percent_format($myrow2["discount_percent"]*100) . "%";
}
{
$display_discount = percent_format($myrow2["discount_percent"]*100) . "%";
}
- label_cell($myrow2["stock_id"]);
- label_cell($myrow2["StockDescription"]);
- qty_cell($myrow2["quantity"]);
+
label_cell($myrow2["stock_id"]);
+
label_cell($myrow2["StockDescription"]);
+ qty_cell($myrow2["quantity"]
, false, get_qty_dec($myrow2["stock_id"])
);
label_cell($myrow2["units"], "align=right");
amount_cell($myrow2["unit_price"]);
label_cell($display_discount, "nowrap align=right");
label_cell($myrow2["units"], "align=right");
amount_cell($myrow2["unit_price"]);
label_cell($display_discount, "nowrap align=right");
@@
-133,7
+134,7
@@
if (db_num_rows($result) > 0)
end_row();
} //end while there are line items to print out
end_row();
} //end while there are line items to print out
-}
+}
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);
@@
-141,7
+142,7
@@
$display_sub_tot = price_format($sub_total);
$display_freight = price_format($myrow["ov_freight"]);
/*Print out the delivery note text entered */
$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",
+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");
"nowrap align=right width=15%");
label_row(_("Shipping"), $display_freight, "colspan=6 align=right", "nowrap align=right");