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

Fix creation/edit rum number

Browse Source
This commit is contained in:
Laurent Destailleur 2017-10-11 23:43:42 +02:00
parent 918738ce46
commit 8674867db2
2 changed files with 77 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
htdocs/societe/class/companybankaccount.class.php
View File

@ -70,7 +70,7 @@ class CompanyBankAccount extends Account
function create(User $user = null, $notrigger=0)
{
$now = dol_now();
$error = 0;
$error = 0;
// Correct default_rib to be sure to have always one default
$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_rib where fk_soc = ".$this->socid." AND default_rib = 1";
$result = $this->db->query($sql);
@ -89,29 +89,27 @@ class CompanyBankAccount extends Account
if ($this->db->affected_rows($resql))
{
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."societe_rib");
if (! $notrigger)
{
// Call trigger
$result=$this->call_trigger('COMPANY_RIB_CREATE',$user);
if ($result < 0) $error++;
// End call triggers
if(! $error )
{
return 1;
}
else
{
return 0;
}
}
else
{
return 1;
}
if (! $notrigger)
{
// Call trigger
$result=$this->call_trigger('COMPANY_RIB_CREATE',$user);
if ($result < 0) $error++;
// End call triggers
if (! $error)
{
return 1;
}
else
{
return 0;
}
}
else
{
return 1;
}
}
}
else
@ -132,14 +130,10 @@ class CompanyBankAccount extends Account
{
global $conf;
$error = 0;
if (! $this->id)
{
$this->create();
}
if (dol_strlen($this->domiciliation) > 255) $this->domiciliation = dol_trunc($this->domiciliation, 254, 'right', 'UTF-8', 1);
if (! $this->id) return -1;
if (dol_strlen($this->domiciliation) > 255) $this->domiciliation = dol_trunc($this->domiciliation, 254, 'right', 'UTF-8', 1);
if (dol_strlen($this->owner_address) > 255) $this->owner_address = dol_trunc($this->owner_address, 254, 'right', 'UTF-8', 1);
$sql = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET";
@ -169,8 +163,8 @@ class CompanyBankAccount extends Account
$result = $this->db->query($sql);
if ($result)
{
if (! $notrigger)
{
// Call trigger
@ -190,7 +184,7 @@ class CompanyBankAccount extends Account
{
return 1;
}
}
else
{
@ -265,13 +259,13 @@ class CompanyBankAccount extends Account
function delete(User $user = null, $notrigger=0)
{
global $conf;
$error = 0;
dol_syslog(get_class($this) . "::delete ".$this->id, LOG_DEBUG);
$this->db->begin();
if (! $error && ! $notrigger)
{
// Call trigger
@ -284,14 +278,14 @@ class CompanyBankAccount extends Account
{
$sql = "DELETE FROM " . MAIN_DB_PREFIX . "societe_rib";
$sql .= " WHERE rowid = " . $this->id;
if (! $this->db->query($sql))
{
$error++;
$this->errors[]=$this->db->lasterror();
}
}
if (! $error)
{
$this->db->commit();
@ -380,7 +374,7 @@ class CompanyBankAccount extends Account
return -1;
}
}
/**
* Initialise an instance with random values.
* Used to build previews or test instances.
@ -406,13 +400,13 @@ class CompanyBankAccount extends Account
$this->proprio = 'Owner';
$this->owner_address = 'Owner address';
$this->country_id = 1;
$this->rum = 'UMR-CU1212-0007-5-1475405262';
$this->date_rum =dol_now() - 10000;
$this->frstrecur = 'FRST';
$this->socid = 0;
}
}

57
htdocs/societe/rib.php
View File

@ -207,6 +207,8 @@ if (empty($reshook))
$account->rum = GETPOST('rum','alpha');
$account->datec = dol_now();
$db->begin();
// This test can be done only once properties were set
if ($account->needIBAN() == 1)
{
@ -226,26 +228,44 @@ if (empty($reshook))
if (! $error)
{
if (empty($account->rum))
$result = $account->create($user);
if ($result < 0)
{
$account->rum = $prelevement->buildRumNumber($object->code_client, $account->datec, $account->id);
$account->date_rum = dol_now();
$error++;
setEventMessages($account->error, $account->errors, 'errors');
$action='create'; // Force chargement page création
}
if (empty($account->rum))
{
$account->rum = $prelevement->buildRumNumber($object->code_client, $account->datec, $account->id);
$account->date_rum = dol_now();
}
}
if (! $error)
{
$result = $account->update($user); // This will set the UMR number.
// TODO Use create and include update into create method
if (! $result)
{
if ($result < 0)
{
$error++;
setEventMessages($account->error, $account->errors, 'errors');
$_GET["action"]='create'; // Force chargement page création
}
else
{
$url=DOL_URL_ROOT.'/societe/rib.php?socid='.$object->id;
header('Location: '.$url);
exit;
$action='create';
}
}
if (! $error)
{
$db->commit();
$url=DOL_URL_ROOT.'/societe/rib.php?socid='.$object->id;
header('Location: '.$url);
exit;
}
else
{
$db->rollback();
}
}
}
@ -321,11 +341,14 @@ $formfile = new FormFile($db);
llxHeader();
$head=societe_prepare_head($object);
if (! $id)
$account->fetch(0,$object->id);
{
$account->fetch(0,$object->id);
}
else
{
$account->fetch($id);
}
if (empty($account->socid)) $account->socid=$object->id;
if ($socid && $action == 'edit' && $user->rights->societe->creer)
@ -775,7 +798,7 @@ if ($socid && $action == 'edit' && $user->rights->societe->creer)
// RUM
print '<tr><td class="titlefield">'.$langs->trans("RUM").'</td>';
print '<td><input size="30" type="text" name="rum" value="'.dol_escape_htmltag($account->rum).'"></td></tr>';
print '<td><input class="minwidth300" type="text" name="rum" value="'.dol_escape_htmltag($account->rum).'"></td></tr>';
print '<tr><td>'.$langs->trans("WithdrawMode").'</td><td>';
$tblArraychoice = array("FRST" => $langs->trans("FRST"), "RECUR" => $langs->trans("RECUR"));
@ -872,7 +895,7 @@ if ($socid && $action == 'create' && $user->rights->societe->creer)
// RUM
print '<tr><td class="titlefieldcreate">'.$langs->trans("RUM").'</td>';
print '<td colspan="4"><input size="30" type="text" name="rum" value="'.dol_escape_htmltag($account->rum).'"><br>'.$langs->trans("RUMWillBeGenerated").'</td></tr>';
print '<td colspan="4"><input type="text" class="minwidth300" name="rum" value="'.GETPOST('rum','alpha').'"><br>'.$langs->trans("RUMWillBeGenerated").'</td></tr>';
print '<tr><td>'.$langs->trans("WithdrawMode").'</td><td>';
$tblArraychoice = array("FRST" => $langs->trans("FRST"), "RECUR" => $langs->trans("RECUR"));