Fixed Tax Report on Screen.
[fa-stable.git] / gl / includes / db / gl_db_trans.inc
index 26ad6b2ac5047d741bd24dbe752d3ac81b01e9cc..9234a0ad827a7fe0cea4baea345d88f25438f93b 100644 (file)
@@ -44,7 +44,7 @@ function add_gl_trans($type, $trans_id, $date_, $account, $dimension, $dimension
        }
        if (!is_subledger_account($account) || $account==get_company_pref('grn_clearing_act'))
                $person_id = $person_type_id = null;
-
+       
        $sql = "INSERT INTO ".TB_PREF."gl_trans ( type, type_no, tran_date,
                account, dimension_id, dimension2_id, memo_, amount";
 
@@ -79,6 +79,7 @@ function add_gl_trans($type, $trans_id, $date_, $account, $dimension, $dimension
 function add_gl_trans_std_cost($type, $trans_id, $date_, $account, $dimension, $dimension2,
        $memo_, $amount, $person_type_id=null, $person_id=null, $err_msg="")
 {
+
        if ($amount != 0)
                return add_gl_trans($type, $trans_id, $date_, $account, $dimension, $dimension2, $memo_,
                        $amount, null, $person_type_id, $person_id, $err_msg);
@@ -140,9 +141,8 @@ function get_gl_transactions($from_date, $to_date, $trans_no=0,
                WHERE coa.account_code=gl.account
                AND ISNULL(v.date_)
                AND gl.tran_date >= '$from'
-               AND gl.tran_date <= '$to'";
-       if (isset($SysPrefs->show_voided_gl_trans) && $SysPrefs->show_voided_gl_trans == 0)
-               $sql .= " AND gl.amount <> 0"; 
+               AND gl.tran_date <= '$to'
+               AND gl.amount <> 0"; 
 
        if ($person_id)
                $sql .= " AND gl.person_id=".db_escape($person_id); 
@@ -204,9 +204,10 @@ function get_gl_trans($type, $trans_id)
 
 //--------------------------------------------------------------------------------
 
-function get_gl_wo_cost_trans($trans_id, $cost_type=-1)
+function get_gl_wo_cost_trans($trans_id, $cost_type=-1, $all_gl=false)
 {
-       $sql = "SELECT costing.*, gl.*, chart.account_name, com.memo_ FROM "
+       $sql = "SELECT costing.*, gl.*, chart.account_name, com.memo_
+               FROM "
                .TB_PREF."wo_costing costing, "
                .TB_PREF."gl_trans gl LEFT JOIN ".TB_PREF."comments com ON gl.type=com.type     AND gl.type_no=com.id,"
                .TB_PREF."chart_master chart
@@ -217,7 +218,44 @@ function get_gl_wo_cost_trans($trans_id, $cost_type=-1)
                        AND gl.type_no=costing.trans_no";
        if ($cost_type != -1)
                $sql .= " AND costing.cost_type=".db_escape($cost_type);
-       $sql .= " AND amount < 0";
+       $sql .= $all_gl ? " AND amount != 0" : " AND amount < 0";
+
+       return db_query($sql, "The gl transactions could not be retrieved");
+}
+
+function get_gl_wo_issue_trans($trans_id, $person_id=-1, $all_gl=false)
+{
+       $sql = "SELECT issue.*, gl.*, chart.account_name, com.memo_
+               FROM "
+                       .TB_PREF."wo_issues issue,"
+                       .TB_PREF."gl_trans gl LEFT JOIN ".TB_PREF."comments com ON gl.type=com.type     AND gl.type_no=com.id,"
+                       .TB_PREF."chart_master chart
+               WHERE issue.workorder_id=".db_escape($trans_id)
+                ." AND chart.account_code=gl.account
+                       AND gl.type=".ST_MANUISSUE." AND gl.type_no=issue.issue_no";
+//                     ." AND gl.person_type_id=".PT_WORKORDER;
+       if ($person_id != -1)
+               $sql .= " AND gl.person_id=".db_escape($person_id);
+       $sql .= $all_gl ? " AND amount != 0" : " AND amount < 0";
+       $sql .= " ORDER BY type, type_no";
+       return db_query($sql, "The gl transactions could not be retrieved");
+}
+
+function get_gl_wo_productions($trans_id, $all_gl=false)
+{
+       $sql = "SELECT rcv.*, gl.*, chart.account_name, com.memo_
+               FROM "
+               .TB_PREF."wo_manufacture rcv, "
+               .TB_PREF."gl_trans gl LEFT JOIN ".TB_PREF."comments com ON gl.type=com.type     AND gl.type_no=com.id,"
+               .TB_PREF."chart_master chart
+               WHERE 
+                       rcv.workorder_id=".db_escape($trans_id)
+               ."      AND chart.account_code=gl.account
+                       AND gl.type=".ST_MANURECEIVE."
+                       AND gl.type_no=rcv.id
+                       AND amount != 0 "
+               .($all_gl ? " AND amount != 0" : " AND amount < 0")
+               ." ORDER BY type, type_no";
 
        return db_query($sql, "The gl transactions could not be retrieved");
 }
@@ -234,9 +272,9 @@ function get_gl_balance_from_to($from_date, $to_date, $account, $dimension=0, $d
        if ($to_date != "")
                $sql .= "  AND tran_date < '$to'";
        if ($dimension != 0)
-               $sql .= " AND dimension_id = ".($dimension<0?0:db_escape($dimension));
+               $sql .= " AND dimension_id = ".($dimension<0 ? 0 : db_escape($dimension));
        if ($dimension2 != 0)
-               $sql .= " AND dimension2_id = ".($dimension2<0?0:db_escape($dimension2));
+               $sql .= " AND dimension2_id = ".($dimension2<0 ? 0 : db_escape($dimension2));
 
        $result = db_query($sql, "The starting balance for account $account could not be calculated");
 
@@ -258,9 +296,9 @@ function get_gl_trans_from_to($from_date, $to_date, $account, $dimension=0, $dim
        if ($to_date != "")
                $sql .= " AND tran_date <= '$to'";
        if ($dimension != 0)
-               $sql .= " AND dimension_id = ".($dimension<0?0:db_escape($dimension));
+               $sql .= " AND dimension_id = ".($dimension<0 ? 0 : db_escape($dimension));
        if ($dimension2 != 0)
-               $sql .= " AND dimension2_id = ".($dimension2<0?0:db_escape($dimension2));
+               $sql .= " AND dimension2_id = ".($dimension2<0 ? 0 : db_escape($dimension2));
 
        $result = db_query($sql, "Transactions for account $account could not be calculated");
 
@@ -271,30 +309,24 @@ function get_gl_trans_from_to($from_date, $to_date, $account, $dimension=0, $dim
 //----------------------------------------------------------------------------------------------------
 function get_balance($account, $dimension, $dimension2, $from, $to, $from_incl=true, $to_incl=true) 
 {
-       $sql = "SELECT SUM(IF(amount >= 0, amount, 0)) as debit, 
-               SUM(IF(amount < 0, -amount, 0)) as credit, SUM(amount) as balance 
-               FROM ".TB_PREF."gl_trans,".TB_PREF."chart_master,"
-                       .TB_PREF."chart_types, ".TB_PREF."chart_class 
-               WHERE ".TB_PREF."gl_trans.account=".TB_PREF."chart_master.account_code AND "
-               .TB_PREF."chart_master.account_type=".TB_PREF."chart_types.id 
-               AND ".TB_PREF."chart_types.class_id=".TB_PREF."chart_class.cid AND";
-               
-       if ($account != null)
-               $sql .= " account=".db_escape($account)." AND";
-       if ($dimension != 0)
-               $sql .= " dimension_id = ".($dimension<0?0:db_escape($dimension))." AND";
-       if ($dimension2 != 0)
-               $sql .= " dimension2_id = ".($dimension2<0?0:db_escape($dimension2))." AND";
        $from_date = date2sql($from);
-       if ($from_incl)
-               $sql .= " tran_date >= '$from_date'  AND";
-       else
-               $sql .= " tran_date > IF(ctype>0 AND ctype<".CL_INCOME.", '0000-00-00', '$from_date') AND";
        $to_date = date2sql($to);
-       if ($to_incl)
-               $sql .= " tran_date <= '$to_date' ";
-       else
-               $sql .= " tran_date < '$to_date' ";
+
+       $sql = "SELECT  SUM(IF(amount >= 0, amount, 0)) as debit, 
+                                       SUM(IF(amount < 0, -amount, 0)) as credit,
+                                       SUM(amount) as balance 
+               FROM ".TB_PREF."gl_trans trans,"
+                       .TB_PREF."chart_master coa,"
+                       .TB_PREF."chart_types act_type, "
+                       .TB_PREF."chart_class act_class
+               WHERE trans.account=coa.account_code
+                       AND coa.account_type=act_type.id 
+               AND act_type.class_id=act_class.cid"
+               ." AND ".($from_incl ? "tran_date >= '$from_date'" : "tran_date > IF(ctype>0 AND ctype<".CL_INCOME.", '0000-00-00', '$from_date')")
+               ." AND ".($to_incl ? "tran_date <= '$to_date'" : "tran_date < '$to_date'")
+               .($account == null ? '' : " AND account=".db_escape($account))
+               .($dimension == 0 ? ''  : " AND dimension_id = ".($dimension<0 ? 0 : db_escape($dimension)))
+               .($dimension2 == 0 ? '' : " AND dimension2_id = ".($dimension2<0 ? 0 : db_escape($dimension2)));
 
        $result = db_query($sql,"No general ledger accounts were returned");
 
@@ -309,7 +341,8 @@ function get_budget_trans_from_to($from_date, $to_date, $account, $dimension=0,
        $from = date2sql($from_date);
        $to = date2sql($to_date);
 
-       $sql = "SELECT SUM(amount) FROM ".TB_PREF."budget_trans
+       $sql = "SELECT SUM(amount)
+               FROM ".TB_PREF."budget_trans
                WHERE account=".db_escape($account);
        if ($from_date != "")
                $sql .= " AND tran_date >= '$from' ";
@@ -392,14 +425,11 @@ function add_gl_tax_details($gl_code, $trans_type, $trans_no, $amount, $ex_rate,
        if(!$tax_type) return;  // $gl_code is not tax account
        
        $tax = get_tax_type($tax_type);
-       //if ($gl_code == $tax['sales_gl_code'])
        if ($trans_type == ST_SALESINVOICE || $trans_type == ST_CUSTDELIVERY || $trans_type == ST_CUSTCREDIT)
                $amount = -$amount;
        // we have to restore net amount as we cannot know the base amount
        if ($net_amount===null) {
                if ($tax['rate'] == 0) {
-//                     display_warning(_("You should not post gl transactions  
-//                             to tax account with     zero tax rate."));
                        $net_amount = 0;
                } else { 
                        // calculate net amount
@@ -440,15 +470,17 @@ function add_trans_tax_details($trans_type, $trans_no, $tax_id, $rate, $included
 
 function get_trans_tax_details($trans_type, $trans_no)
 {
-       $sql = "SELECT ".TB_PREF."trans_tax_details.*, "
-               .TB_PREF."tax_types.name AS tax_type_name, "
-               .TB_PREF."trans_tax_details.rate AS effective_rate, "
-               .TB_PREF."tax_types.rate AS rate
-               FROM ".TB_PREF."trans_tax_details,".TB_PREF."tax_types
-               WHERE trans_type = ".db_escape($trans_type)."
+       $sql = "SELECT tax_details.*,
+                               tax_type.name AS tax_type_name,
+                               tax_details.rate AS effective_rate,
+                               tax_type.rate AS rate
+               FROM ".TB_PREF."trans_tax_details tax_details,
+                       ".TB_PREF."tax_types tax_type
+               WHERE 
+                       trans_type = ".db_escape($trans_type)."
                AND trans_no = ".db_escape($trans_no)."
                AND (net_amount != 0 OR amount != 0)
-               AND ".TB_PREF."tax_types.id = ".TB_PREF."trans_tax_details.tax_type_id";
+               AND tax_type.id = tax_details.tax_type_id";
 
        return db_query($sql, "The transaction tax details could not be retrieved");
 }
@@ -481,15 +513,15 @@ function get_tax_summary($from, $to, $also_zero_purchases=false)
        $todate = date2sql($to);
 
        $sql = "SELECT 
-                               SUM(IF(trans_type=".ST_SUPPCREDIT.",-1,1)*
+                               SUM(IF(trans_type=".ST_CUSTCREDIT.",-1,1)*
                                IF((reg_type=".TR_OUTPUT.")"
-                                       ." || ((trans_type IN(".ST_SUPPINVOICE.",".ST_SUPPCREDIT.") OR (trans_type=".ST_JOURNAL." AND reg_type=".TR_INPUT."))
+                                       ." || ((trans_type IN(".ST_SALESINVOICE.",".ST_CUSTCREDIT.") OR (trans_type=".ST_JOURNAL." AND reg_type=".TR_INPUT."))
                                        ), net_amount*ex_rate,0)
                                ) net_output,
 
-                               SUM(IF(trans_type=".ST_SUPPCREDIT.",-1,1)*
+                               SUM(IF(trans_type=".ST_CUSTCREDIT.",-1,1)*
                                IF((reg_type=".TR_OUTPUT.")"
-                                       ." || ((trans_type IN(".ST_SUPPINVOICE.",".ST_SUPPCREDIT.") OR (trans_type=".ST_JOURNAL." AND reg_type=".TR_INPUT."))
+                                       ." || ((trans_type IN(".ST_SALESINVOICE.",".ST_CUSTCREDIT.") OR (trans_type=".ST_JOURNAL." AND reg_type=".TR_INPUT."))
                                        ), amount*ex_rate,0)) payable,
 
                                SUM(IF(trans_type IN(".ST_SUPPCREDIT."),-1,1)*