projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Quick Entries uses Tax Groups instead of Item Tax Types for calculating taxes (Please...
[fa-stable.git]
/
includes
/
ui
/
ui_view.inc
diff --git
a/includes/ui/ui_view.inc
b/includes/ui/ui_view.inc
index a1fb09ff2c4d3b850041dc5a1676f2fefc288e2d..d9a33af98cedd1cc61b6107f5116aab659e4a763 100644
(file)
--- a/
includes/ui/ui_view.inc
+++ b/
includes/ui/ui_view.inc
@@
-401,7
+401,7
@@
function view_stock_status_cell($stock_id, $description=null)
function display_debit_or_credit_cells($value)
{
function display_debit_or_credit_cells($value)
{
- if ($value > 0)
+ if ($value >
=
0)
{
amount_cell($value);
label_cell("");
{
amount_cell($value);
label_cell("");
@@
-411,12
+411,6
@@
function display_debit_or_credit_cells($value)
label_cell("");
amount_cell(abs($value));
}
label_cell("");
amount_cell(abs($value));
}
- else
- {
- //label_cell("");
- amount_cell(0);
- label_cell("");
- }
}
//--------------------------------------------------------------------------------------
}
//--------------------------------------------------------------------------------------
@@
-602,18
+596,30
@@
function display_quick_entries(&$cart, $id, $base, $type, $descr='')
case "t": // post taxes calculated on base amount
case "t+": // ditto & increase base amount
case "t-": // ditto & reduce base amount
case "t": // post taxes calculated on base amount
case "t+": // ditto & increase base amount
case "t-": // ditto & reduce base amount
- $taxes = get_taxes_for_item_tax($qe_line['dest_id']);
+ //$taxes = get_taxes_for_item_tax($qe_line['dest_id']);
+ $taxes = array();
+ $res = get_tax_group_items($qe_line['dest_id']);
+ while ($row = db_fetch($res))
+ $taxes[] = $row;
$tax_total = 0;
$tax_total = 0;
+ $totrate = 0;
+ // find total tax
+ if (substr($qe_line['action'],0,1) != 'T') {
+ foreach ($taxes as $index => $item_tax) {
+ $totrate += $item_tax['rate'];
+ }
+ }
+ $taxbase = $base/($totrate+100);
foreach ($taxes as $index => $item_tax) {
foreach ($taxes as $index => $item_tax) {
- if(substr($qe_line['action'],0,1) != 'T')
- $tax = round2($base * $item_tax['rate']
- / ($item_tax['rate'] + 100), user_price_dec());
- else
- $tax = round2($base * $item_tax['rate'] / 100, user_price_dec());
-
+ $tax = round2($taxbase * $item_tax['rate'], user_price_dec());
$gl_code = ($type == QE_DEPOSIT || ($type == QE_JOURNAL && $base < 0))
? $item_tax['sales_gl_code'] : $item_tax['purchasing_gl_code'];
$tax_total += $tax;
$gl_code = ($type == QE_DEPOSIT || ($type == QE_JOURNAL && $base < 0))
? $item_tax['sales_gl_code'] : $item_tax['purchasing_gl_code'];
$tax_total += $tax;
+ if ($tax==0) continue;
+ if (!is_tax_gl_unique($gl_code)) {
+ display_error(_("Cannot post to GL account used by more than one tax type."));
+ break 3;
+ }
if ($type != QE_SUPPINV)
$cart->add_gl_item($gl_code,
$qe_line['dimension_id'], $qe_line['dimension2_id'],
if ($type != QE_SUPPINV)
$cart->add_gl_item($gl_code,
$qe_line['dimension_id'], $qe_line['dimension2_id'],