lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #3166 : An accounting account can be alphanumeric (Need for EBP)

Browse Source
This commit is contained in:
aspangaro 2015-07-08 21:47:45 +02:00
parent 7e0229ded0
commit dbb5d3d386
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/accountancy/admin/card.php
View File

@ -39,6 +39,7 @@ $mesg = '';
$action = GETPOST('action'); $action = GETPOST('action');
$id = GETPOST('id', 'int'); $id = GETPOST('id', 'int');
$rowid = GETPOST('rowid', 'int'); $rowid = GETPOST('rowid', 'int');
$cancel = GETPOST('cancel');
// Security check // Security check
if (!$user->admin) if (!$user->admin)
@ -49,7 +50,7 @@ $accounting = new AccountingAccount($db);
// Action // Action
if ($action == 'add') if ($action == 'add')
{ {
if (! GETPOST('cancel', 'alpha')) { if (! $cancel) {
$sql = 'SELECT pcg_version FROM ' . MAIN_DB_PREFIX . 'accounting_system WHERE rowid=' . $conf->global->CHARTOFACCOUNTS; $sql = 'SELECT pcg_version FROM ' . MAIN_DB_PREFIX . 'accounting_system WHERE rowid=' . $conf->global->CHARTOFACCOUNTS;
dol_syslog('accountancy/admin/card.php:: $sql=' . $sql); dol_syslog('accountancy/admin/card.php:: $sql=' . $sql);
@ -59,7 +60,7 @@ if ($action == 'add')
$accounting->fk_pcg_version = $obj->pcg_version; $accounting->fk_pcg_version = $obj->pcg_version;
$accounting->pcg_type = GETPOST('pcg_type'); $accounting->pcg_type = GETPOST('pcg_type');
$accounting->pcg_subtype = GETPOST('pcg_subtype'); $accounting->pcg_subtype = GETPOST('pcg_subtype');
$accounting->account_number = GETPOST('account_number', 'int'); $accounting->account_number = GETPOST('account_number');
$accounting->account_parent = GETPOST('account_parent', 'int'); $accounting->account_parent = GETPOST('account_parent', 'int');
$accounting->label = GETPOST('label', 'alpha'); $accounting->label = GETPOST('label', 'alpha');
$accounting->active = 1; $accounting->active = 1;
@ -94,7 +95,7 @@ else if ($action == 'edit')
$accounting->fk_pcg_version = $obj->pcg_version; $accounting->fk_pcg_version = $obj->pcg_version;
$accounting->pcg_type = GETPOST('pcg_type'); $accounting->pcg_type = GETPOST('pcg_type');
$accounting->pcg_subtype = GETPOST('pcg_subtype'); $accounting->pcg_subtype = GETPOST('pcg_subtype');
$accounting->account_number = GETPOST('account_number', 'int'); $accounting->account_number = GETPOST('account_number');
$accounting->account_parent = GETPOST('account_parent', 'int'); $accounting->account_parent = GETPOST('account_parent', 'int');
$accounting->label = GETPOST('label', 'alpha'); $accounting->label = GETPOST('label', 'alpha');