svn+ssh://ns352270.ovh.net/svn/phpcompta/tags/rel600 ........ r4743 | danydb | 2012-02-04 16:18:09 +0100 (Sat, 04 Feb 2012) | 1 line update DBVersion ........ r4744 | danydb | 2012-02-04 16:22:52 +0100 (Sat, 04 Feb 2012) | 1 line remove space ........ r4745 | danydb | 2012-02-04 16:44:10 +0100 (Sat, 04 Feb 2012) | 3 lines Bug : clause from in report didn't work properly ........ r4746 | danydb | 2012-02-04 18:39:58 +0100 (Sat, 04 Feb 2012) | 1 line sql improve : do not use comptaproc. function in select concerning lettering ........ r4747 | danydb | 2012-02-04 18:45:55 +0100 (Sat, 04 Feb 2012) | 1 line put correct DBVERSION ........ r4748 | danydb | 2012-02-04 18:47:00 +0100 (Sat, 04 Feb 2012) | 1 line remove useless patch ........ r4759 | danydb | 2012-02-04 23:19:55 +0100 (Sat, 04 Feb 2012) | 2 lines Bug : remove double input in letter_deb, letter_cred ........ r4760 | danydb | 2012-02-04 23:35:13 +0100 (Sat, 04 Feb 2012) | 2 lines Upgrade script ........ r4761 | danydb | 2012-02-07 16:50:24 +0100 (Tue, 07 Feb 2012) | 1 line FIN : cosmetic show name of the card + align col. ........ r4762 | danydb | 2012-02-07 18:50:55 +0100 (Tue, 07 Feb 2012) | 1 line FIN : add item , new column card name, change func for adding row ........ r4763 | danydb | 2012-02-08 17:49:44 +0100 (Wed, 08 Feb 2012) | 1 line Improve : generate document : default argument is an array ........ r4764 | danydb | 2012-02-08 19:15:50 +0100 (Wed, 08 Feb 2012) | 2 lines Correct probleme with date in calc ........ r4765 | danydb | 2012-02-08 19:47:08 +0100 (Wed, 08 Feb 2012) | 3 lines Correct probleme with date in other document than CALC New tag : DATE_CALC ........ r4766 | danydb | 2012-02-08 20:00:18 +0100 (Wed, 08 Feb 2012) | 2 lines Double click on accounting gives the history of the accounting ........ r4767 | danydb | 2012-02-09 10:20:29 +0100 (Thu, 09 Feb 2012) | 1 line Improve : generate document :add DATE_LIMIT_CALC to allow date formatting in calc ........ r4768 | danydb | 2012-02-09 13:47:45 +0100 (Thu, 09 Feb 2012) | 2 lines cosmetic : place of "Document generated ........ r4769 | danydb | 2012-02-09 14:02:13 +0100 (Thu, 09 Feb 2012) | 2 lines cosmetic : ACH generated document use style instead of class ........ r4770 | danydb | 2012-02-09 14:09:58 +0100 (Thu, 09 Feb 2012) | 1 line code indent ........ r4771 | danydb | 2012-02-17 01:13:36 +0100 (Fri, 17 Feb 2012) | 1 line bug cannot update ANC (cause j_id and value from POST conflict) ........ r4772 | danydb | 2012-02-17 01:16:34 +0100 (Fri, 17 Feb 2012) | 1 line do not clause popup if we save ........ r4773 | danydb | 2012-02-17 01:26:16 +0100 (Fri, 17 Feb 2012) | 1 line ANC : great ledger oa_date problem (order by clause) ........ r4774 | danydb | 2012-02-20 09:24:08 +0100 (Mon, 20 Feb 2012) | 2 lines 0000525: Le contrôle des montants analytiques d'une écriture à plusieurs ligne (ex: salaires) en modification met tout en rouge ........ r4775 | danydb | 2012-02-25 14:47:13 +0100 (Sat, 25 Feb 2012) | 1 line 0000528: VEN_TVAC n'est pas correctement calculé ........ r4776 | danydb | 2012-02-25 14:59:43 +0100 (Sat, 25 Feb 2012) | 1 line VEN_ART_PRICE = 0 alors return "" ........ r4777 | danydb | 2012-02-25 15:14:55 +0100 (Sat, 25 Feb 2012) | 2 lines Order by document.dt_value ........ r4778 | danydb | 2012-02-25 15:15:13 +0100 (Sat, 25 Feb 2012) | 2 lines Order by document.dt_value ........ r4779 | danydb | 2012-02-25 15:18:12 +0100 (Sat, 25 Feb 2012) | 1 line constant.php for prod ........ r4780 | danydb | 2012-02-25 15:42:00 +0100 (Sat, 25 Feb 2012) | 1 line Bug with calendar ........ r4781 | danydb | 2012-02-25 15:48:43 +0100 (Sat, 25 Feb 2012) | 1 line 0000531: Tableau de bord : pense-bête ........ r4782 | danydb | 2012-03-14 17:16:38 +0100 (Wed, 14 Mar 2012) | 1 line 548 banquaire -> bancaire ........ r4783 | danydb | 2012-03-20 21:05:01 +0100 (Tue, 20 Mar 2012) | 1 line Warning if account used instead of a card in ACC_LEDGER ........ r4784 | danydb | 2012-03-21 11:41:25 +0100 (Wed, 21 Mar 2012) | 1 line 0000552: Pourcentage dans une fiche 4 décimales ........ r4786 | danydb | 2012-03-22 20:17:37 +0100 (Thu, 22 Mar 2012) | 1 line 0000557: Faire apparaître dans titre HTML le module courant ........ r4787 | danydb | 2012-03-22 20:35:42 +0100 (Thu, 22 Mar 2012) | 1 line 558 Agrandir zone document ........ r4788 | danydb | 2012-03-22 20:40:22 +0100 (Thu, 22 Mar 2012) | 1 line 558 Agrandir zone document : cosmetic background ........ r4789 | danydb | 2012-03-22 20:51:52 +0100 (Thu, 22 Mar 2012) | 1 line 558 Agrandir zone document : cosmetic background ........ r4790 | danydb | 2012-03-22 20:54:18 +0100 (Thu, 22 Mar 2012) | 1 line Cosmetic ajout lien sous qcode client ........ r4791 | danydb | 2012-03-22 21:12:17 +0100 (Thu, 22 Mar 2012) | 1 line Cosmetic : alignement et taille détail opérations ........
205 lines
6.7 KiB
PHP
205 lines
6.7 KiB
PHP
<?php
|
|
|
|
/*
|
|
* This file is part of PhpCompta.
|
|
*
|
|
* PhpCompta is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* PhpCompta is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with PhpCompta; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*/
|
|
/* $Revision$ */
|
|
|
|
// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
|
|
|
|
/* !\file
|
|
*
|
|
*
|
|
* \brief reconcile operation
|
|
*
|
|
*/
|
|
global $g_failed,$g_succeed;
|
|
require_once 'class_acc_ledger_fin.php';
|
|
bcscale(2);
|
|
echo '<div class="content">';
|
|
$Ledger = new Acc_Ledger_Fin($cn, 0);
|
|
if (!isset($_REQUEST['p_jrn']))
|
|
{
|
|
$a = $Ledger->get_first('fin');
|
|
$Ledger->id = $a['jrn_def_id'];
|
|
}
|
|
else
|
|
$Ledger->id = $_REQUEST['p_jrn'];
|
|
$jrn_priv = $g_user->get_ledger_access($Ledger->id);
|
|
if (isset($_GET["p_jrn"]) && $jrn_priv == "X")
|
|
{
|
|
NoAccess();
|
|
exit();
|
|
}
|
|
//-------------------------
|
|
// save
|
|
//-------------------------
|
|
if (isset($_POST['save']))
|
|
{
|
|
if (trim($_POST['ext']) != '' && isset($_POST['op']))
|
|
{
|
|
$array = $_POST['op'];
|
|
$tot = 0;
|
|
$cn->start();
|
|
for ($i = 0; $i < count($array); $i++)
|
|
{
|
|
$cn->exec_sql('update jrn set jr_pj_number=$1 where jr_id=$2', array($_POST['ext'], $array[$i]));
|
|
$tot = bcadd($tot, $cn->get_value('select qf_amount from quant_fin where jr_id=$1', array($array[$i])));
|
|
}
|
|
$diff = bcsub($_POST['end_extrait'], $_POST['start_extrait']);
|
|
if ($diff != 0 && $diff != $tot)
|
|
{
|
|
$remain=bcsub($tot,$diff);
|
|
$cn->rollback();
|
|
alert("D'après l'extrait il y aurait du avoir un montant de $diff à rapprocher alors qu'il y a $tot rapprochés, mise à jour annulée, la différence est de $remain");
|
|
echo '<div class="error">';
|
|
echo '<p>'.$g_failed._("D'après l'extrait il y aurait du avoir un montant de $diff à rapprocher alors qu'il y a $tot rapprochés, la différence est de $remain <br>mise à jour annulée").'</p>';
|
|
echo '</div>';
|
|
}
|
|
else
|
|
{
|
|
echo '<div class="content">'.$g_succeed.' Mise à jour extrait '.$_POST['ext'].'</div>';
|
|
}
|
|
|
|
$cn->commit();
|
|
}
|
|
}
|
|
//-------------------------
|
|
// show the operation of this ledger
|
|
// without receipt number
|
|
//-------------------------
|
|
echo '<div class="content">';
|
|
echo '<form method="get">';
|
|
echo HtmlInput::get_to_hidden(array('gDossier', 'ledger_type', 'ac', 'sa'));
|
|
$wLedger = $Ledger->select_ledger('FIN', 3);
|
|
if ($wLedger == null)
|
|
exit('Pas de journal disponible');
|
|
echo '<div id="jrn_name_div">';
|
|
echo '<h2 id="jrn_name" style="display:inline">' . $Ledger->get_name() . '</h2>';
|
|
echo '</div>';
|
|
$wLedger->javascript = "onchange='this.form.submit()';";
|
|
echo $wLedger->input();
|
|
echo HtmlInput::submit('ref', 'Rafraîchir');
|
|
echo '</form>';
|
|
|
|
echo '<form method="post" id="rec1">';
|
|
|
|
echo dossier::hidden();
|
|
echo HtmlInput::get_to_hidden(array('sa', 'p_action', 'p_jrn'));
|
|
|
|
$operation = $cn->get_array("select jr_id,jr_internal,jr_comment,to_char(jr_date,'DD.MM.YYYY') as fmt_date,jr_montant
|
|
from jrn where jr_def_id=$1 and (jr_pj_number is null or jr_pj_number='') order by jr_date", array($Ledger->id));
|
|
echo '<span id="bkname">' . hb(h($Ledger->get_bank_name())) . '</span>';
|
|
echo '<p>';
|
|
$iextrait = new IText('ext');
|
|
if ( isset ($_POST['ext'])) $iextrait->value=$_POST['ext']; else $iextrait->value = $Ledger->guess_pj();
|
|
$nstart_extrait = new INum('start_extrait');
|
|
if( isset($_POST['start_extrait'])) $nstart_extrait->value=$_POST['start_extrait'];
|
|
$nend_extrait = new INum('end_extrait');
|
|
if( isset($_POST['end_extrait'])) $nend_extrait->value=$_POST['end_extrait'];
|
|
|
|
echo "Extrait / relevé :" . $iextrait->input();
|
|
echo 'solde Début' . $nstart_extrait->input();
|
|
echo 'solde Fin' . $nend_extrait->input();
|
|
echo IButton::tooggle_checkbox('rec1');
|
|
echo '</p>';
|
|
echo HtmlInput::submit('save', 'Mettre à jour le n° de relevé bancaire');
|
|
echo '<table class="result" style="width:80%;margin-left:10%">';
|
|
$r = th('Date');
|
|
$r.=th('Libellé');
|
|
$r.=th('N° interne');
|
|
$r.=th('Montant', ' style="text-align:right"');
|
|
$r.=th('Selection', ' style="text-align:center" ');
|
|
echo tr($r);
|
|
$iradio = new ICheckBox('op[]');
|
|
$tot_not_reconcilied = 0;
|
|
$diff = 0;
|
|
for ($i = 0; $i < count($operation); $i++)
|
|
{
|
|
$row = $operation[$i];
|
|
$r = '';
|
|
$js = HtmlInput::detail_op($row['jr_id'], $row['jr_internal']);
|
|
$r.=td($row['fmt_date']);
|
|
$r.=td($row['jr_comment']);
|
|
$r.=td($js);
|
|
$amount=$cn->get_value('select qf_amount from quant_fin where jr_id=$1', array($row['jr_id']));
|
|
$r.=td(nbm ($amount), ' class="num" ');
|
|
|
|
$diff=bcadd($diff,$amount);
|
|
$tot_not_reconcilied+=$row['jr_montant'];
|
|
$iradio->value = $row['jr_id'];
|
|
$iradio->selected=false;
|
|
if (isset($_POST['op']))
|
|
{
|
|
for ($x=0;$x<count($_POST['op']);$x++)
|
|
{
|
|
if ($row['jr_id']==$_POST['op'][$x])
|
|
{
|
|
$iradio->selected=true;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
$r.=td(HtmlInput::hidden('jrid[]', $row['jr_id']) . $iradio->input(), ' style="text-align:center" ');
|
|
if ($i % 2 == 0)
|
|
echo tr($r, ' class="odd" ');
|
|
else
|
|
echo tr($r);
|
|
}
|
|
echo '</table>';
|
|
$bk_card = new Fiche($cn);
|
|
$bk_card->id = $Ledger->get_bank();
|
|
$filter_year = " j_tech_per in (select p_id from parm_periode where p_exercice='" . $g_user->get_exercice() . "')";
|
|
|
|
/* get saldo for not reconcilied operations */
|
|
$saldo_not_reconcilied = $bk_card->get_solde_detail($filter_year . " and j_grpt in (select jr_grpt_id from jrn where trim(jr_pj_number) ='' or jr_pj_number is null)");
|
|
|
|
/* get saldo for reconcilied operation */
|
|
$saldo_reconcilied = $bk_card->get_solde_detail($filter_year . " and j_grpt in (select jr_grpt_id from jrn where trim(jr_pj_number) != '' and jr_pj_number is not null)");
|
|
|
|
/* solde compte */
|
|
$saldo = $bk_card->get_solde_detail($filter_year);
|
|
|
|
echo '<table>';
|
|
echo '<tr>';
|
|
echo td("Solde compte ");
|
|
echo td(nbm(bcsub($saldo['debit'] , $saldo['credit'])), ' style="text-align:right"');
|
|
echo '</tr>';
|
|
|
|
echo '<tr>';
|
|
echo td("Solde non rapproché ");
|
|
echo td(nbm (bcsub($saldo_not_reconcilied['debit'], $saldo_not_reconcilied['credit'])), ' style="text-align:right"');
|
|
echo '</tr>';
|
|
|
|
echo '<tr>';
|
|
echo td("Solde rapproché ");
|
|
echo td(nbm(bcsub($saldo_reconcilied['debit'] , $saldo_reconcilied['credit'])), ' style="text-align:right"');
|
|
echo '</tr>';
|
|
|
|
|
|
echo '<tr>';
|
|
echo td("Total montant ");
|
|
echo td(nbm ($tot_not_reconcilied), ' style="text-align:right"');
|
|
echo '</tr>';
|
|
|
|
echo '</table>';
|
|
|
|
echo HtmlInput::submit('save', 'Mettre à jour le n° de relevé bancaire');
|
|
echo '</form>';
|
|
echo '</div>';
|
|
exit();
|
|
?>
|