X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Freports_classes.inc;h=125cf5f87dd95255771b6898419a348d52b48d42;hb=89d9b659abe59b9ee1357b3f08857f8f0e43e425;hp=1ad826e4a1187b71a0fb80be6eb5eb5478cd58e7;hpb=3bd9d76da0a8c8f014f83fc5203b9954b66737ab;p=fa-stable.git diff --git a/reporting/includes/reports_classes.inc b/reporting/includes/reports_classes.inc index 1ad826e4..125cf5f8 100644 --- a/reporting/includes/reports_classes.inc +++ b/reporting/includes/reports_classes.inc @@ -276,9 +276,13 @@ class BoxReports case 'GL_ACCOUNTS': return gl_all_accounts_list($name); + case 'BANK_ACCOUNTS_NO_FILTER': case 'BANK_ACCOUNTS': - return bank_accounts_list($name); - + if ($type == 'BANK_ACCOUNTS_NO_FILTER') + return bank_accounts_list($name, null, false, _("All")); + else + return bank_accounts_list($name); + case 'DIMENSION': return dimensions_list($name, null, false, ' ', false, true, 0); @@ -317,8 +321,9 @@ class BoxReports $sql = "SELECT concat(debtor_trans.trans_no, '-', debtor_trans.type) AS TNO, concat('$IV ', debtor_trans.$ref,' ', debtor.name) as IName FROM ".TB_PREF."debtors_master debtor," - .TB_PREF."debtor_trans debtor_trans - WHERE type=".ST_SALESINVOICE." AND debtor.debtor_no=debtor_trans.debtor_no + .TB_PREF."debtor_trans debtor_trans LEFT JOIN ".TB_PREF."voided AS vd ON debtor_trans.type=vd.type AND + debtor_trans.trans_no=vd.id + WHERE debtor_trans.type=".ST_SALESINVOICE." AND debtor.debtor_no=debtor_trans.debtor_no AND ISNULL(vd.id) ORDER BY debtor_trans.trans_no DESC"; return combo_input($name, '', $sql, 'TNO', 'IName',array('order'=>false)); @@ -328,18 +333,20 @@ class BoxReports $sql = "SELECT concat(debtor_trans.trans_no, '-', debtor_trans.type) AS TNO, concat('$CN ', debtor_trans.$ref,' ', debtor.name) as IName FROM ".TB_PREF."debtors_master debtor," - .TB_PREF."debtor_trans debtor_trans - WHERE type=".ST_CUSTCREDIT." AND debtor.debtor_no=debtor_trans.debtor_no + .TB_PREF."debtor_trans debtor_trans LEFT JOIN ".TB_PREF."voided AS vd ON debtor_trans.type=vd.type AND + debtor_trans.trans_no=vd.id + WHERE debtor_trans.type=".ST_CUSTCREDIT." AND debtor.debtor_no=debtor_trans.debtor_no AND ISNULL(vd.id) ORDER BY debtor_trans.trans_no DESC"; return combo_input($name, '', $sql, 'TNO', 'IName',array('order'=>false)); case 'DELIVERY': $DN = $type_shortcuts[ST_CUSTDELIVERY]; - $sql = "SELECT concat(debtor_trans.trans_no, '-', debtor_trans.type) AS TNO, + $sql = "SELECT concat(debtor_trans.trans_no, '-', debtor_trans.type) AS TNO, concat(debtor_trans.trans_no, ' $DN ', debtor.name) as IName FROM ".TB_PREF."debtors_master debtor," - .TB_PREF."debtor_trans debtor_trans - WHERE type=".ST_CUSTDELIVERY." AND debtor.debtor_no=debtor_trans.debtor_no + .TB_PREF."debtor_trans debtor_trans LEFT JOIN ".TB_PREF."voided AS vd ON debtor_trans.type=vd.type AND + debtor_trans.trans_no=vd.id + WHERE debtor_trans.type=".ST_CUSTDELIVERY." AND debtor.debtor_no=debtor_trans.debtor_no AND ISNULL(vd.id) ORDER BY debtor_trans.trans_no DESC"; return combo_input($name, '', $sql, 'TNO', 'IName',array('order'=>false)); @@ -358,7 +365,7 @@ class BoxReports FROM ".TB_PREF."debtors_master debtor," .TB_PREF."sales_orders sorder WHERE debtor.debtor_no=sorder.debtor_no AND sorder.trans_type=".ST_SALESQUOTE - ." ORDER BY sorder.order_no DESC"; + ." ORDER BY sorder.order_no DESC"; return combo_input($name, '', $sql, 'order_no', 'IName',array('order'=>false)); case 'PO': @@ -376,12 +383,14 @@ class BoxReports $CN = $type_shortcuts[ST_SUPPCREDIT]; $ref = ($SysPrefs->print_invoice_no() == 1 ? "trans_no" : "reference"); $sql = "SELECT concat(trans.trans_no, '-',trans.type) AS TNO, - concat(trans.$ref, IF(type=".ST_BANKPAYMENT.", ' $BP ', IF(type=".ST_SUPPAYMENT.", ' $SP ', ' $CN ')), supplier.supp_name) as IName - FROM ".TB_PREF."suppliers supplier, " - .TB_PREF."supp_trans trans - WHERE type IN(".ST_BANKPAYMENT.",".ST_SUPPAYMENT.",".ST_SUPPCREDIT.") - AND supplier.supplier_id=trans.supplier_id - ORDER BY trans.trans_no DESC"; + concat(trans.$ref, IF(trans.type=".ST_BANKPAYMENT.", ' $BP ', IF(trans.type=".ST_SUPPAYMENT.", ' $SP ', + ' $CN ')), + supplier.supp_name) as IName + FROM ".TB_PREF."suppliers supplier, " + .TB_PREF."supp_trans trans LEFT JOIN ".TB_PREF."voided AS vd ON trans.type=vd.type AND trans.trans_no=vd.id + WHERE trans.type IN(".ST_BANKPAYMENT.",".ST_SUPPAYMENT.",".ST_SUPPCREDIT.") AND + supplier.supplier_id=trans.supplier_id AND ISNULL(vd.id) + ORDER BY trans.trans_no DESC"; return combo_input($name, '', $sql, 'TNO', 'IName',array('order'=>false)); case 'RECEIPT': @@ -389,10 +398,11 @@ class BoxReports $CP = $type_shortcuts[ST_CUSTPAYMENT]; $ref = ($SysPrefs->print_invoice_no() == 1 ? "trans_no" : "reference"); $sql = "SELECT concat(trans.trans_no, '-', trans.type) AS TNO, - concat(trans.$ref, IF(type=".ST_BANKDEPOSIT.", ' $BD ', ' $CP '), debtor.name) as IName + concat(trans.$ref, IF(trans.type=".ST_BANKDEPOSIT.", ' $BD ', ' $CP '), debtor.name) as IName FROM ".TB_PREF."debtors_master debtor," - .TB_PREF."debtor_trans trans - WHERE type IN(".ST_BANKDEPOSIT.",".ST_CUSTPAYMENT.",".ST_CUSTCREDIT.") AND debtor.debtor_no=trans.debtor_no + .TB_PREF."debtor_trans trans LEFT JOIN ".TB_PREF."voided AS vd ON trans.type=vd.type AND trans.trans_no=vd.id + WHERE trans.type IN(".ST_BANKDEPOSIT.",".ST_CUSTPAYMENT.",".ST_CUSTCREDIT.") AND + debtor.debtor_no=trans.debtor_no AND ISNULL(vd.id) ORDER BY trans.trans_no DESC"; return combo_input($name, '', $sql, 'TNO', 'IName',array('order'=>false)); @@ -412,7 +422,6 @@ class BoxReports LEFT JOIN ".TB_PREF."voided v ON wo.id=v.id and v.type=".ST_WORKORDER." WHERE ISNULL(v.id) AND item.stock_id=wo.stock_id - WHERE item.stock_id=wo.stock_id ORDER BY wo.id DESC"; return combo_input($name, '', $sql, 'id', 'IName',array('order'=>false));