projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Customer balance Report rep101.php has one extra parameter. Fixed @kvvaradha.
[fa-stable.git]
/
gl
/
inquiry
/
tax_inquiry.php
diff --git
a/gl/inquiry/tax_inquiry.php
b/gl/inquiry/tax_inquiry.php
index df9cd14beb996f55fb34f3c2e2dc9b62d1929a4d..3aae793946984361d5e0799f667ecde2e517a840 100644
(file)
--- a/
gl/inquiry/tax_inquiry.php
+++ b/
gl/inquiry/tax_inquiry.php
@@
-9,7
+9,7
@@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
-$page_security =
8
;
+$page_security =
'SA_TAXREP'
;
$path_to_root="../..";
include_once($path_to_root . "/includes/session.inc");
$path_to_root="../..";
include_once($path_to_root . "/includes/session.inc");
@@
-22,12
+22,12
@@
include_once($path_to_root . "/gl/includes/gl_db.inc");
$js = '';
set_focus('account');
$js = '';
set_focus('account');
-if ($use_popup_windows)
+if ($
SysPrefs->
use_popup_windows)
$js .= get_js_open_window(800, 500);
$js .= get_js_open_window(800, 500);
-if (
$use_date_picker
)
+if (
user_use_date_picker()
)
$js .= get_js_date_picker();
$js .= get_js_date_picker();
-page(_("Tax Inquiry"), false, false, '', $js);
+page(_(
$help_context =
"Tax Inquiry"), false, false, '', $js);
//----------------------------------------------------------------------------------------------------
// Ajax updates
//----------------------------------------------------------------------------------------------------
// Ajax updates
@@
-43,8
+43,9
@@
if (get_post('TransFromDate') == "" && get_post('TransToDate') == "")
$row = get_company_prefs();
$edate = add_months($date, -$row['tax_last']);
$edate = end_month($edate);
$row = get_company_prefs();
$edate = add_months($date, -$row['tax_last']);
$edate = end_month($edate);
- $bdate = add_months($edate, -$row['tax_prd'] + 1);
- $_POST["TransFromDate"] = begin_month($bdate);
+ $bdate = begin_month($edate);
+ $bdate = add_months($bdate, -$row['tax_prd'] + 1);
+ $_POST["TransFromDate"] = $bdate;
$_POST["TransToDate"] = $edate;
}
$_POST["TransToDate"] = $edate;
}
@@
-52,17
+53,14
@@
if (get_post('TransFromDate') == "" && get_post('TransToDate') == "")
function tax_inquiry_controls()
{
function tax_inquiry_controls()
{
- global $table_style2;
-
start_form();
start_form();
- //start_table($table_style2);
- start_table("class='tablestyle_noborder'");
+ start_table(TABLESTYLE_NOBORDER);
start_row();
start_row();
- date_cells(_("from:"), 'TransFromDate', '', null, -
30
);
+ date_cells(_("from:"), 'TransFromDate', '', null, -
user_transaction_days()
);
date_cells(_("to:"), 'TransToDate');
date_cells(_("to:"), 'TransToDate');
- submit_cells('Show',_("Show"),'','',
true
);
+ submit_cells('Show',_("Show"),'','',
'default'
);
end_row();
end_row();
@@
-75,18
+73,14
@@
function tax_inquiry_controls()
function show_results()
{
function show_results()
{
- global $path_to_root, $table_style;
-
/*Now get the transactions */
div_start('trans_tbl');
/*Now get the transactions */
div_start('trans_tbl');
- start_table(
$table_style
);
+ start_table(
TABLESTYLE
);
$th = array(_("Type"), _("Description"), _("Amount"), _("Outputs")."/"._("Inputs"));
table_header($th);
$k = 0;
$total = 0;
$th = array(_("Type"), _("Description"), _("Amount"), _("Outputs")."/"._("Inputs"));
table_header($th);
$k = 0;
$total = 0;
- $bdate = date2sql($_POST['TransFromDate']);
- $edate = date2sql($_POST['TransToDate']);
$taxes = get_tax_summary($_POST['TransFromDate'], $_POST['TransToDate']);
$taxes = get_tax_summary($_POST['TransFromDate'], $_POST['TransToDate']);
@@
-94,7
+88,7
@@
function show_results()
{
$payable = $tx['payable'];
{
$payable = $tx['payable'];
- $collectible = $tx['collectible'];
+ $collectible =
-
$tx['collectible'];
$net = $collectible + $payable;
$total += $net;
alt_table_row_color($k);
$net = $collectible + $payable;
$total += $net;
alt_table_row_color($k);
@@
-107,7
+101,7
@@
function show_results()
label_cell($tx['name'] . " " . $tx['rate'] . "%");
label_cell(_("Paid on purchases") . " (" . _("Input Tax")."):");
amount_cell($collectible);
label_cell($tx['name'] . " " . $tx['rate'] . "%");
label_cell(_("Paid on purchases") . " (" . _("Input Tax")."):");
amount_cell($collectible);
- amount_cell($tx['net_input']);
+ amount_cell(
-
$tx['net_input']);
end_row();
alt_table_row_color($k);
label_cell("<b>".$tx['name'] . " " . $tx['rate'] . "%</b>");
end_row();
alt_table_row_color($k);
label_cell("<b>".$tx['name'] . " " . $tx['rate'] . "%</b>");
@@
-137,4
+131,3
@@
show_results();
end_page();
end_page();
-?>