projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
If setting the delivered items in PO Receive Items to 0 the value is not updated
[fa-stable.git]
/
taxes
/
tax_types.php
diff --git
a/taxes/tax_types.php
b/taxes/tax_types.php
index 6639e05a8eddaaeebe8588b6df010506d83b2523..20369be770dfdd5bc06a8bae6d672822393a5c98 100644
(file)
--- a/
taxes/tax_types.php
+++ b/
taxes/tax_types.php
@@
-23,6
+23,8
@@
simple_page_mode(true);
function can_process()
{
function can_process()
{
+ global $selected_id;
+
if (strlen($_POST['name']) == 0)
{
display_error(_("The tax type name cannot be empty."));
if (strlen($_POST['name']) == 0)
{
display_error(_("The tax type name cannot be empty."));
@@
-36,6
+38,11
@@
function can_process()
return false;
}
return false;
}
+ if (!is_tax_gl_unique(get_post('sales_gl_code', 'purchasing_gl_code', $selected_id))) {
+ display_error( _("Selected GL Accounts cannot be used by another tax type."));
+ set_focus('sales_gl_code');
+ return false;
+ }
return true;
}
return true;
}
@@
-45,7
+52,7
@@
if ($Mode=='ADD_ITEM' && can_process())
{
add_tax_type($_POST['name'], $_POST['sales_gl_code'],
{
add_tax_type($_POST['name'], $_POST['sales_gl_code'],
- $_POST['purchasing_gl_code'], input_num('rate'));
+ $_POST['purchasing_gl_code'], input_num('rate'
, 0
));
display_notification(_('New tax type has been added'));
$Mode = 'RESET';
}
display_notification(_('New tax type has been added'));
$Mode = 'RESET';
}
@@
-102,6
+109,8
@@
if ($Mode == 'RESET')
$result = get_all_tax_types();
start_form();
$result = get_all_tax_types();
start_form();
+
+display_note(_("To avoid problems with manual journal entry all tax types should have unique Sales/Purchasing GL accounts."));
start_table($table_style);
$th = array(_("Description"), _("Default Rate (%)"),
start_table($table_style);
$th = array(_("Description"), _("Default Rate (%)"),