projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed typo in sql query
[fa-stable.git]
/
purchasing
/
includes
/
ui
/
invoice_ui.inc
diff --git
a/purchasing/includes/ui/invoice_ui.inc
b/purchasing/includes/ui/invoice_ui.inc
index 6121c905d8db5af7de16f0bcb22ee5d1cfaf6c6d..7af53f0cf36fcb51d41267481f41e91c9f9e7df1 100644
(file)
--- a/
purchasing/includes/ui/invoice_ui.inc
+++ b/
purchasing/includes/ui/invoice_ui.inc
@@
-10,7
+10,6
@@
function copy_from_trans(&$supp_trans)
$_POST['supp_reference'] = $supp_trans->supp_reference;
$_POST['reference'] = $supp_trans->reference;
$_POST['supplier_id'] = $supp_trans->supplier_id;
$_POST['supp_reference'] = $supp_trans->supp_reference;
$_POST['reference'] = $supp_trans->reference;
$_POST['supplier_id'] = $supp_trans->supplier_id;
- $_POST['tax_group_id'] = $supp_trans->tax_group_id;
}
//--------------------------------------------------------------------------------------------------
}
//--------------------------------------------------------------------------------------------------
@@
-22,15
+21,14
@@
function copy_to_trans(&$supp_trans)
$supp_trans->due_date = $_POST['due_date'];
$supp_trans->supp_reference = $_POST['supp_reference'];
$supp_trans->reference = $_POST['reference'];
$supp_trans->due_date = $_POST['due_date'];
$supp_trans->supp_reference = $_POST['supp_reference'];
$supp_trans->reference = $_POST['reference'];
- $supp_trans->tax_group_id = $_POST['tax_group_id'];
-
$supp_trans->ov_amount = 0; /* for starters */
if (count($supp_trans->grn_items) > 0)
{
foreach ( $supp_trans->grn_items as $grn)
{
$supp_trans->ov_amount = 0; /* for starters */
if (count($supp_trans->grn_items) > 0)
{
foreach ( $supp_trans->grn_items as $grn)
{
- $supp_trans->ov_amount += ($grn->this_quantity_inv * $grn->chg_price);
+ $supp_trans->ov_amount += round(($grn->this_quantity_inv * $grn->chg_price),
+ user_price_dec());
}
}
if (count($supp_trans->gl_codes) > 0)
}
}
if (count($supp_trans->gl_codes) > 0)
@@
-106,11
+104,7
@@
function invoice_header(&$supp_trans)
exchange_rate_display($supplier_currency, $company_currency, $_POST['tran_date']);
}
exchange_rate_display($supplier_currency, $company_currency, $_POST['tran_date']);
}
-
- if (!isset($_POST['tax_group_id']))
- $_POST['tax_group_id'] = $supp_trans->tax_group_id;
- tax_groups_list_row(_("Tax Group:"), 'tax_group_id', $_POST['tax_group_id'], true);
-
+ label_row(_("Tax Group:"), $supp_trans->tax_description);
echo "</table>";
echo "</td>";
echo "</table>";
echo "</td>";
@@
-127,12
+121,12
@@
function invoice_totals(&$supp_trans)
copy_to_trans($supp_trans);
start_table("$table_style width=95%");
copy_to_trans($supp_trans);
start_table("$table_style width=95%");
- label_row(_("Sub-total:"),
number_format2( $supp_trans->ov_amount,user_price_dec()
), "align=right", "align=right");
+ label_row(_("Sub-total:"),
price_format( $supp_trans->ov_amount
), "align=right", "align=right");
- $taxes = $supp_trans->get_taxes($
_POST['tax_group_id']
);
+ $taxes = $supp_trans->get_taxes($
supp_trans->tax_group_id
);
$tax_total = display_edit_tax_items($taxes, 1, 0); // tax_included==0 (we are the company)
$tax_total = display_edit_tax_items($taxes, 1, 0); // tax_included==0 (we are the company)
- $display_total =
number_format2(( $supp_trans->ov_amount + $tax_total), user_price_dec()
);
+ $display_total =
price_format($supp_trans->ov_amount + $tax_total
);
if ($supp_trans->is_invoice)
label_row(_("Invoice Total:"), $display_total, "align=right", "align=right");
if ($supp_trans->is_invoice)
label_row(_("Invoice Total:"), $display_total, "align=right", "align=right");
@@
-243,7
+237,7
@@
function display_gl_items(&$supp_trans, $mode=0)
}
$colspan = ($dim == 2 ? 4 : ($dim == 1 ? 3 : 2));
}
$colspan = ($dim == 2 ? 4 : ($dim == 1 ? 3 : 2));
- label_row(_("Total"),
number_format2($total_gl_value,user_price_dec()
),
+ label_row(_("Total"),
price_format($total_gl_value
),
"colspan=".$colspan." align=right", "nowrap align=right");
echo "</table>";
"colspan=".$colspan." align=right", "nowrap align=right");
echo "</table>";
@@
-319,14
+313,15
@@
function display_grn_items(&$supp_trans, $mode=0)
label_cell($entered_grn->item_description);
qty_cell(abs($entered_grn->this_quantity_inv));
amount_cell($entered_grn->chg_price);
label_cell($entered_grn->item_description);
qty_cell(abs($entered_grn->this_quantity_inv));
amount_cell($entered_grn->chg_price);
- amount_cell(
$entered_grn->chg_price * abs($entered_grn->this_quantity_inv
));
+ amount_cell(
round($entered_grn->chg_price * abs($entered_grn->this_quantity_inv)), user_price_dec(
));
if ($mode == 1)
delete_link_cell(SID . "Delete=" . $entered_grn->id);
end_row();
if ($mode == 1)
delete_link_cell(SID . "Delete=" . $entered_grn->id);
end_row();
- $total_grn_value += ($entered_grn->chg_price * abs($entered_grn->this_quantity_inv));
+ $total_grn_value += round($entered_grn->chg_price * abs($entered_grn->this_quantity_inv),
+ user_price_dec());
$i++;
if ($i > 15)
$i++;
if ($i > 15)
@@
-337,7
+332,7
@@
function display_grn_items(&$supp_trans, $mode=0)
}
}
}
}
- label_row(_("Total"),
number_format2($total_grn_value,user_price_dec()
),
+ label_row(_("Total"),
price_format($total_grn_value
),
"colspan=5 align=right", "nowrap align=right");
echo "</table>";
"colspan=5 align=right", "nowrap align=right");
echo "</table>";