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

NEW Can fix the bank account of a payment if payment not conciliated

Browse Source
This commit is contained in:
Laurent Destailleur 2018-02-12 02:05:14 +01:00
parent 1a6cff8fee
commit 1300f7172f
1 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
htdocs/compta/bank/ligne.php
View File

@ -62,6 +62,7 @@ if (! $user->rights->banque->lire && ! $user->rights->banque->consolidate) acces
/* /*
* Actions * Actions
*/ */
if ($cancel) if ($cancel)
{ {
if ($backtopage) if ($backtopage)
@ -108,10 +109,23 @@ if ($user->rights->banque->modifier && $action == "update")
{ {
$error=0; $error=0;
$ac = new Account($db); $acline = new AccountLine($db);
$ac->fetch($id); $acline->fetch($rowid);
if ($ac->courant == Account::TYPE_CASH && $_POST['value'] != 'LIQ') $acsource = new Account($db);
$acsource->fetch($id);
$actarget = new Account($db);
if (GETPOST('accountid','int') > 0 && ! $acline->rappro && ! $acline->getVentilExportCompta()) // We ask to change bank account
{
$actarget->fetch(GETPOST('accountid','int'));
}
else
{
$actarget->fetch($id);
}
if ($actarget->courant == Account::TYPE_CASH && GETPOST('value','alpha') != 'LIQ')
{ {
setEventMessages($langs->trans("ErrorCashAccountAcceptsOnlyCashMoney"), null, 'errors'); setEventMessages($langs->trans("ErrorCashAccountAcceptsOnlyCashMoney"), null, 'errors');
$error++; $error++;
@ -119,16 +133,6 @@ if ($user->rights->banque->modifier && $action == "update")
if (! $error) if (! $error)
{ {
// Avant de modifier la date ou le montant, on controle si ce n'est pas encore rapproche
$conciliated=0;
$sql = "SELECT b.rappro FROM ".MAIN_DB_PREFIX."bank as b WHERE rowid=".$rowid;
$result = $db->query($sql);
if ($result)
{
$objp = $db->fetch_object($result);
$conciliated=$objp->rappro;
}
$db->begin(); $db->begin();
$amount = price2num($_POST['amount']); $amount = price2num($_POST['amount']);
@ -142,15 +146,15 @@ if ($user->rights->banque->modifier && $action == "update")
if (isset($_POST['banque'])) $sql.=" banque='".$db->escape($_POST["banque"])."',"; if (isset($_POST['banque'])) $sql.=" banque='".$db->escape($_POST["banque"])."',";
if (isset($_POST['emetteur'])) $sql.=" emetteur='".$db->escape($_POST["emetteur"])."',"; if (isset($_POST['emetteur'])) $sql.=" emetteur='".$db->escape($_POST["emetteur"])."',";
// Blocked when conciliated // Blocked when conciliated
if (! $conciliated) if (! $acline->rappro)
{ {
if (isset($_POST['label'])) $sql.=" label='".$db->escape($_POST["label"])."',"; if (isset($_POST['label'])) $sql.=" label='".$db->escape($_POST["label"])."',";
if (isset($_POST['amount'])) $sql.=" amount='".$amount."',"; if (isset($_POST['amount'])) $sql.=" amount='".$amount."',";
if (isset($_POST['dateomonth'])) $sql.=" dateo = '".$db->idate($dateop)."',"; if (isset($_POST['dateomonth'])) $sql.=" dateo = '".$db->idate($dateop)."',";
if (isset($_POST['datevmonth'])) $sql.=" datev = '".$db->idate($dateval)."',"; if (isset($_POST['datevmonth'])) $sql.=" datev = '".$db->idate($dateval)."',";
} }
$sql.= " fk_account = ".$id; $sql.= " fk_account = ".$actarget->id;
$sql.= " WHERE rowid = ".$rowid; $sql.= " WHERE rowid = ".$acline->id;
$result = $db->query($sql); $result = $db->query($sql);
if (! $result) if (! $result)
@ -311,21 +315,19 @@ if ($result)
print '<div class="underbanner clearboth"></div>'; print '<div class="underbanner clearboth"></div>';
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
// Ref
/*
print '<tr><td class="titlefield">'.$langs->trans("Ref")."</td>";
print '<td>';
print $form->showrefnav($bankline, 'rowid', $linkback, 1, 'rowid', 'rowid');
print '</td>';
print '</tr>';
*/
$i++; $i++;
// Bank account // Bank account
print '<tr><td class="titlefield">'.$langs->trans("Account").'</td>'; print '<tr><td class="titlefield">'.$langs->trans("Account").'</td>';
print '<td>'; print '<td>';
if (! $objp->rappro && ! $bankline->getVentilExportCompta())
{
print $form->select_comptes($acct->id, 'accountid', 0, '', 0);
}
else
{
print $acct->getNomUrl(1,'transactions','reflabel'); print $acct->getNomUrl(1,'transactions','reflabel');
}
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';