svn+ssh://danydb@svn/svn/phpcompta/branches/rel500
........
r2906 | danydb | 2010-01-27 15:16:08 +0100 (Wed, 27 Jan 2010) | 2 lines
Cosmetic for html popup
........
r2907 | danydb | 2010-01-27 15:28:03 +0100 (Wed, 27 Jan 2010) | 5 lines
Fix typo translation
Fix Bug : cannot save extension in IE, probably because the same scripts are included several times
........
r2908 | danydb | 2010-01-28 13:56:37 +0100 (Thu, 28 Jan 2010) | 5 lines
Fix Bug In getNodeText when retrieving data for Internet Explorer,
it fails if the xmlNode.firstChild.nodeValue does not contains data.
It is directly set to undefined
........
r2909 | danydb | 2010-01-29 12:20:24 +0100 (Fri, 29 Jan 2010) | 2 lines
Generate invoice : update the comment of the entry only if there were no comment
........
r2910 | danydb | 2010-01-29 19:39:11 +0100 (Fri, 29 Jan 2010) | 6 lines
Improve User
============
Status only plugin means that the user can use only the plugin and can't access to
anything else.
........
r2911 | danydb | 2010-01-29 19:42:38 +0100 (Fri, 29 Jan 2010) | 1 line
Bug import Dexia
........
r2912 | danydb | 2010-01-31 16:24:22 +0100 (Sun, 31 Jan 2010) | 3 lines
For insert_jrnx, the desc is now in the function, we don't need anymore to update after inserting
........
r2913 | danydb | 2010-01-31 16:33:55 +0100 (Sun, 31 Jan 2010) | 4 lines
Fix bug : cannot see operation in quick_writing
cause : the p_action must be set to ALL, it wasn't for quick_writing
........
r2914 | danydb | 2010-02-02 14:52:37 +0100 (Tue, 02 Feb 2010) | 4 lines
Code cleaning
Bug : in ledger of sale, we have twice the possibility to add~ or generate document, and only for invoice (type 4)
Solution : fix the function Acc_Ledger_Purchase::extra_info (type of document = 10), remove extra code
........
r2915 | danydb | 2010-02-05 01:01:11 +0100 (Fri, 05 Feb 2010) | 4 lines
Improve : search_card you can also find a card thanks is tva_num
Documentation doxygen improved
........
r2916 | danydb | 2010-02-05 11:18:36 +0100 (Fri, 05 Feb 2010) | 2 lines
when inserting into ledger_sold the test to check the attach was wrong
........
r2917 | danydb | 2010-02-05 14:45:33 +0100 (Fri, 05 Feb 2010) | 2 lines
Extension : add the possibility to use ajax
........
r2918 | danydb | 2010-02-06 14:25:22 +0100 (Sat, 06 Feb 2010) | 1 line
rewrite the function encodeJSON, hide and show for doxygen
........
r2919 | danydb | 2010-02-06 14:26:07 +0100 (Sat, 06 Feb 2010) | 1 line
remove error where _SESSION is expired
........
r2920 | danydb | 2010-02-06 14:26:49 +0100 (Sat, 06 Feb 2010) | 1 line
In ITva_Select add the display
........
r2921 | danydb | 2010-02-06 14:27:47 +0100 (Sat, 06 Feb 2010) | 1 line
Cosmetic
........
r2922 | danydb | 2010-02-06 14:27:49 +0100 (Sat, 06 Feb 2010) | 1 line
IPopup add a new property drag to make the ipopup dragguable or not
........
r2923 | danydb | 2010-02-06 14:35:28 +0100 (Sat, 06 Feb 2010) | 5 lines
Middle of payment
=================
Feature : add or remove middle of payment
........
r2924 | danydb | 2010-02-06 18:17:15 +0100 (Sat, 06 Feb 2010) | 7 lines
Card
----
A same card can now have 2 different sides (debit or credit)
usefull to have only one card for a customer and a supplier
........
r2925 | danydb | 2010-02-06 18:23:03 +0100 (Sat, 06 Feb 2010) | 1 line
Add the sql script for the double accounting
........
r2926 | danydb | 2010-02-06 19:29:29 +0100 (Sat, 06 Feb 2010) | 2 lines
Update documentation
........
r2927 | danydb | 2010-02-06 20:37:12 +0100 (Sat, 06 Feb 2010) | 4 lines
Fiche_def
========
Permit to have 2 accouting as class_base
........
r2928 | danydb | 2010-02-06 20:56:00 +0100 (Sat, 06 Feb 2010) | 1 line
Bug : FK from stock prevent the removal of a card
........
r2929 | danydb | 2010-02-06 21:14:10 +0100 (Sat, 06 Feb 2010) | 1 line
removeless useless test
........
r2930 | danydb | 2010-02-07 00:55:03 +0100 (Sun, 07 Feb 2010) | 1 line
Improve appearance extension
........
r2931 | danydb | 2010-02-07 00:56:28 +0100 (Sun, 07 Feb 2010) | 2 lines
remove debug
........
r2932 | danydb | 2010-02-07 01:16:51 +0100 (Sun, 07 Feb 2010) | 1 line
Improve appearance extension
........
r2933 | danydb | 2010-02-07 01:19:08 +0100 (Sun, 07 Feb 2010) | 1 line
Improve appearance extension
........
r2934 | danydb | 2010-02-07 01:30:31 +0100 (Sun, 07 Feb 2010) | 1 line
Improve appearance extension
........
r2935 | danydb | 2010-02-07 02:36:25 +0100 (Sun, 07 Feb 2010) | 1 line
Version PHP5.3 : split is obsolete and replace by explode
........
r2936 | danydb | 2010-02-07 04:56:17 +0100 (Sun, 07 Feb 2010) | 1 line
remove owner
........
r2937 | danydb | 2010-02-08 22:34:07 +0100 (Mon, 08 Feb 2010) | 1 line
typo
........
r2938 | danydb | 2010-02-08 22:34:28 +0100 (Mon, 08 Feb 2010) | 1 line
Start translation for Dutch
........
194 lines
5.1 KiB
PHP
194 lines
5.1 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 class acc_reconciliation, this class is new and the code
|
|
* must use it
|
|
*
|
|
*/
|
|
require_once("class_iconcerned.php");
|
|
require_once ('class_database.php');
|
|
require_once ('class_dossier.php');
|
|
|
|
/*! \brief new class for managing the reconciliation it must be used
|
|
* instead of the function InsertRapt, ...
|
|
*
|
|
*/
|
|
class Acc_Reconciliation {
|
|
var $db; /*!< database connection */
|
|
var $jr_id; /*!< jr_id */
|
|
public static $javascript=JS_LEDGER;
|
|
function __construct($cn) {
|
|
$this->db=$cn;
|
|
$this->jr_id=0;
|
|
}
|
|
|
|
function set_jr_id($jr_id) {
|
|
$this->jr_id=$jr_id;
|
|
}
|
|
/*! \brief return a widget of type js_concerned
|
|
*/
|
|
function widget() {
|
|
$wConcerned=new IConcerned();
|
|
$wConcerned->extra=0; // with 0 javascript search from e_amount... field (see javascript)
|
|
|
|
return $wConcerned;
|
|
|
|
}
|
|
/*!
|
|
*\brief Insert into jrn_rapt the concerned operations
|
|
*
|
|
* \param $jr_id2 (jrn.jr_id) => jrn_rapt.jra_concerned or a string
|
|
* like "jr_id2,jr_id3,jr_id4..."
|
|
*
|
|
* \return none
|
|
*
|
|
*/
|
|
function insert($jr_id2) {
|
|
if ( trim($jr_id2) == "" )
|
|
return;
|
|
if ( strpos($jr_id2,',') !== 0 )
|
|
{
|
|
$aRapt=explode(',',$jr_id2);
|
|
foreach ($aRapt as $rRapt) {
|
|
if ( isNumber($rRapt) == 1 )
|
|
{
|
|
$this->insert_rapt($rRapt);
|
|
}
|
|
}
|
|
} else
|
|
if ( isNumber($jr_id2) == 1 )
|
|
{
|
|
$this->insert_rapt($jr_id2);
|
|
}
|
|
}
|
|
|
|
/*!
|
|
*\brief Insert into jrn_rapt the concerned operations
|
|
* should not be called directly, use insert instead
|
|
*
|
|
* \param $jr_id2 (jrn.jr_id) => jrn_rapt.jra_concerned
|
|
*
|
|
* \return none
|
|
*
|
|
*/
|
|
function insert_rapt($jr_id2) {
|
|
if ( isNumber($this->jr_id) == 0 || isNumber($jr_id2) == 0 )
|
|
{
|
|
return false;
|
|
}
|
|
if ( $this->jr_id==$jr_id2)
|
|
return true;
|
|
|
|
// verify if exists
|
|
if ( $this->db->count_sql(
|
|
"select jra_id from jrn_rapt where jra_concerned=".$this->jr_id.
|
|
" and jr_id=$jr_id2
|
|
union
|
|
select jra_id from jrn_rapt where jra_id=".$this->jr_id.
|
|
" and jra_concerned=$jr_id2 ")
|
|
==0)
|
|
{
|
|
// Ok we can insert
|
|
$Res=$this->db->exec_sql("insert into jrn_rapt(jr_id,jra_concerned) values ".
|
|
"(".$this->jr_id.",$jr_id2)");
|
|
}
|
|
return true;
|
|
}
|
|
/*!
|
|
*\brief Insert into jrn_rapt the concerned operations
|
|
*
|
|
* \param $this->jr_id (jrn.jr_id) => jrn_rapt.jr_id
|
|
* \param $jr_id2 (jrn.jr_id) => jrn_rapt.jra_concerned
|
|
*
|
|
* \return none
|
|
*/
|
|
function remove($jr_id2) {
|
|
if ( isNumber($this->jr_id) == 0 or
|
|
isNumber($jr_id2) == 0 )
|
|
{
|
|
return;
|
|
}
|
|
// verify if exists
|
|
if ( $this->db->count_sql("select jra_id from jrn_rapt where ".
|
|
" jra_concerned=".$this->jr_id." and jr_id=$jr_id2
|
|
union
|
|
select jra_id from jrn_rapt where jra_concerned=$jr_id2 ".
|
|
" and jr_id=".$this->jr_id) !=0)
|
|
{
|
|
// Ok we can delete
|
|
$Res=$this->db->exec_sql("delete from jrn_rapt where ".
|
|
"(jra_concerned=$jr_id2 and jr_id=".$this->jr_id.") or
|
|
(jra_concerned=".$this->jr_id." and jr_id=$jr_id2) ");
|
|
}
|
|
}
|
|
|
|
/*!
|
|
*\brief Return an array of the concerned operation
|
|
*
|
|
*
|
|
*\param database connection
|
|
* \return array if something is found or null
|
|
*/
|
|
function get ( ) {
|
|
$sql=" select jr_id as cn from jrn_rapt where jra_concerned=".$this->jr_id.
|
|
" union ".
|
|
" select jra_concerned as cn from jrn_rapt where jr_id=".$this->jr_id;
|
|
$Res=$this->db->exec_sql($sql);
|
|
|
|
// If nothing is found return null
|
|
$n=Database::num_row($Res);
|
|
|
|
if ($n ==0 ) return null;
|
|
|
|
// put everything in an array
|
|
for ($i=0;$i<$n;$i++) {
|
|
$l=Database::fetch_array($Res,$i);
|
|
$r[$i]=$l['cn'];
|
|
}
|
|
return $r;
|
|
}
|
|
/*!\brief return the javascript function (static method)
|
|
*
|
|
static function javascript() {
|
|
return JS_LEDGER;
|
|
}
|
|
*/
|
|
static function test_me() {
|
|
$cn=new Database(dossier::id());
|
|
$rap=new Acc_Reconciliation($cn);
|
|
$rap->set_jr_id(38);
|
|
$a=$rap->get();
|
|
print_r($a);
|
|
$rap->remove(4);
|
|
$rap->insert("4,5,6");
|
|
$a=$rap->get();
|
|
print_r($a);
|
|
echo Acc_Reconciliation::$javascript;
|
|
$w=$rap->widget();
|
|
$w->name="jr_concerned";
|
|
|
|
$w->extra2="";
|
|
echo $w->input();
|
|
}
|
|
|
|
}
|