altocompta/include/class_acc_ledger.php
Dany De Bontridder 01e9cf80a2 Merged revisions 2352-2573,2575-2625,2628-2648,2650-2859 via svnmerge from
file:///home/developper/svn/phpcompta/branches/rel500_javascript

................
  r2352 | danydb | 2009-02-20 20:43:25 +0100 (Fri, 20 Feb 2009) | 3 lines
  
  Initialized merge tracking via "svnmerge" with revisions "1-2351" from 
  svn+ssh://danydb@svn/svn/phpcompta/trunk
................
  r2353 | danydb | 2009-02-20 21:34:06 +0100 (Fri, 20 Feb 2009) | 1 line
  
  Code cleaning
................
  r2363 | danydb | 2009-02-26 19:03:33 +0100 (Thu, 26 Feb 2009) | 41 lines
  
  Merged revisions 2352-2362 via svnmerge from 
  svn+ssh://danydb@svn/svn/phpcompta/trunk
  
  ........
    r2354 | danydb | 2009-02-24 23:16:33 +0100 (Tue, 24 Feb 2009) | 1 line
    
    bug add a "All ledger" into the ledger choice for reporting balance
  ........
    r2355 | danydb | 2009-02-25 09:06:00 +0100 (Wed, 25 Feb 2009) | 1 line
    
    default value
  ........
    r2356 | danydb | 2009-02-25 09:19:31 +0100 (Wed, 25 Feb 2009) | 1 line
    
    fix mini report
  ........
    r2357 | danydb | 2009-02-25 14:18:26 +0100 (Wed, 25 Feb 2009) | 1 line
    
    Remove warning about work_mem et use_trans_sid
  ........
    r2358 | danydb | 2009-02-25 16:21:39 +0100 (Wed, 25 Feb 2009) | 1 line
    
    Bug ajax
  ........
    r2359 | danydb | 2009-02-25 16:28:28 +0100 (Wed, 25 Feb 2009) | 1 line
    
    Cosmetic
  ........
    r2360 | danydb | 2009-02-25 16:29:29 +0100 (Wed, 25 Feb 2009) | 1 line
    
    Cosmetic
  ........
    r2361 | danydb | 2009-02-25 16:40:01 +0100 (Wed, 25 Feb 2009) | 2 lines
    
    Fix problem with local admin
  ........
    r2362 | danydb | 2009-02-25 18:44:58 +0100 (Wed, 25 Feb 2009) | 1 line
    
    Fix bug opening
  ........
................
  r2364 | danydb | 2009-03-01 20:45:04 +0100 (Sun, 01 Mar 2009) | 4 lines
  
  Class widget has been replaced by HtmlInput and children class (as IText, IButton...)
  Code Cleaning : remove obsolete and unused function
................
  r2365 | danydb | 2009-03-01 21:02:30 +0100 (Sun, 01 Mar 2009) | 1 line
  
  Rewrite class widget : bug
................
  r2368 | danydb | 2009-03-01 23:00:21 +0100 (Sun, 01 Mar 2009) | 13 lines
  
  Merged revisions 2363-2367 via svnmerge from 
  svn+ssh://danydb@svn/svn/phpcompta/trunk
  
  ........
    r2366 | danydb | 2009-03-01 21:29:42 +0100 (Sun, 01 Mar 2009) | 1 line
    
    Security
  ........
    r2367 | danydb | 2009-03-01 21:35:57 +0100 (Sun, 01 Mar 2009) | 1 line
    
    Security : can_request must not be in a test
  ........
................
  r2370 | danydb | 2009-03-04 22:18:23 +0100 (Wed, 04 Mar 2009) | 1 line
  
  Progress HtmlInput
................
  r2371 | danydb | 2009-03-04 22:19:15 +0100 (Wed, 04 Mar 2009) | 9 lines
  
  Merged revisions 2368-2370 via svnmerge from 
  svn+ssh://danydb@svn/svn/phpcompta/trunk
  
  ........
    r2369 | danydb | 2009-03-03 19:02:18 +0100 (Tue, 03 Mar 2009) | 1 line
    
    Fix bug class_user.php : the password is not checked in the function checked
  ........
................
  r2377 | danydb | 2009-03-05 21:21:30 +0100 (Thu, 05 Mar 2009) | 1 line
  
  progress class_widget -> class_html_input
................
  r2378 | danydb | 2009-03-05 21:24:56 +0100 (Thu, 05 Mar 2009) | 25 lines
  
  Merged revisions 2371-2377 via svnmerge from 
  svn+ssh://danydb@svn/svn/phpcompta/trunk
  
  ........
    r2372 | danydb | 2009-03-05 19:09:13 +0100 (Thu, 05 Mar 2009) | 1 line
    
    Bug : all the ledgers are not shown
  ........
    r2373 | danydb | 2009-03-05 19:12:26 +0100 (Thu, 05 Mar 2009) | 1 line
    
    Bug : Layout in quick writing
  ........
    r2374 | danydb | 2009-03-05 19:17:31 +0100 (Thu, 05 Mar 2009) | 1 line
    
    Add missing file
  ........
    r2375 | danydb | 2009-03-05 19:28:11 +0100 (Thu, 05 Mar 2009) | 1 line
    
    Bug  : reconciliation not possible
  ........
    r2376 | danydb | 2009-03-05 19:44:02 +0100 (Thu, 05 Mar 2009) | 1 line
    
    Bug : can't list unpaid operatio,s in sold ledger
  ........
................
  r2379 | danydb | 2009-03-06 23:29:01 +0100 (Fri, 06 Mar 2009) | 1 line
  
  Progress class_html_input
................
  r2380 | danydb | 2009-03-08 20:25:48 +0100 (Sun, 08 Mar 2009) | 1 line
  
  Progress class_html_input
................
  r2383 | danydb | 2009-03-11 20:03:58 +0100 (Wed, 11 Mar 2009) | 13 lines
  
  Merged revisions 2378-2382 via svnmerge from 
  svn+ssh://danydb@svn/svn/phpcompta/trunk
  
  ........
    r2381 | danydb | 2009-03-11 19:33:03 +0100 (Wed, 11 Mar 2009) | 1 line
    
    Erreur rec.
  ........
    r2382 | danydb | 2009-03-11 19:57:57 +0100 (Wed, 11 Mar 2009) | 1 line
    
    Erreur rec. in fin ledger
  ........
................
  r2386 | danydb | 2009-03-14 21:55:08 +0100 (Sat, 14 Mar 2009) | 13 lines
  
  Merged revisions 2383-2385 via svnmerge from 
  svn+ssh://danydb@svn/svn/phpcompta/trunk
  
  ........
    r2384 | danydb | 2009-03-14 21:38:05 +0100 (Sat, 14 Mar 2009) | 2 lines
    
    Fix Bug : search for rec.
  ........
    r2385 | danydb | 2009-03-14 21:44:20 +0100 (Sat, 14 Mar 2009) | 1 line
    
    Bug : cannot see list financial 
  ........
................
  r2387 | danydb | 2009-03-14 23:36:24 +0100 (Sat, 14 Mar 2009) | 1 line
  
  progress class_widget -> class_html_input
................
  r2388 | danydb | 2009-03-14 23:43:30 +0100 (Sat, 14 Mar 2009) | 1 line
  
  Remove file check_priv.php; all the security API is now is class_user
................
  r2391 | danydb | 2009-03-17 18:47:43 +0100 (Tue, 17 Mar 2009) | 3 lines
  
  * Input type submit replace by HtmlInput::Submit
  * Add documentation for javascript
................
  r2392 | danydb | 2009-03-17 19:29:25 +0100 (Tue, 17 Mar 2009) | 1 line
  
  Fix small bugs
................
  r2393 | danydb | 2009-03-17 19:34:49 +0100 (Tue, 17 Mar 2009) | 1 line
  
  Documentation fiche_search.php
................
  r2394 | danydb | 2009-03-19 17:38:27 +0100 (Thu, 19 Mar 2009) | 2 lines
  
  remove a widget object
................
  r2395 | danydb | 2009-03-19 17:40:32 +0100 (Thu, 19 Mar 2009) | 2 lines
  
  Bug : error with get_list_fiche
................
  r2396 | danydb | 2009-03-19 17:43:09 +0100 (Thu, 19 Mar 2009) | 2 lines
  
  Bug : typo
................
  r2397 | danydb | 2009-03-19 18:07:34 +0100 (Thu, 19 Mar 2009) | 2 lines
  
  Bug : wrong next pj
................
  r2398 | danydb | 2009-03-19 18:14:15 +0100 (Thu, 19 Mar 2009) | 2 lines
  
  infobulle add onmouseover for displaying the infobulle
................
  r2399 | danydb | 2009-03-19 18:37:58 +0100 (Thu, 19 Mar 2009) | 3 lines
  
  * Remove periode in Ledger, the periode is deduced from the date, it depends of the parameter MY_CHECK_PERIODE
  * Remove AcException
  * Ledger Sold is correct
................
  r2400 | danydb | 2009-03-19 18:39:47 +0100 (Thu, 19 Mar 2009) | 13 lines
  
  Merged revisions 2386-2399 via svnmerge from 
  svn+ssh://danydb@svn/svn/phpcompta/trunk
  
  ........
    r2389 | danydb | 2009-03-16 21:55:54 +0100 (Mon, 16 Mar 2009) | 2 lines
    
    Fix Escape HTML string
  ........
    r2390 | danydb | 2009-03-16 22:00:44 +0100 (Mon, 16 Mar 2009) | 2 lines
    
    Bug in security : FIN Ledger confusion between check_action and get_ledger_access
  ........
................
  r2401 | danydb | 2009-03-19 22:59:56 +0100 (Thu, 19 Mar 2009) | 1 line
  
  Bug : Ledger sold with check periode
................
  r2402 | danydb | 2009-03-19 23:08:09 +0100 (Thu, 19 Mar 2009) | 1 line
  
  Problem sequence
................
  r2404 | danydb | 2009-03-21 00:47:30 +0100 (Sat, 21 Mar 2009) | 10 lines
  
  Merged revisions 2400-2403 via svnmerge from 
  svn+ssh://danydb@svn/svn/phpcompta/trunk
  
  ........
    r2403 | danydb | 2009-03-20 21:36:05 +0100 (Fri, 20 Mar 2009) | 3 lines
    
    The summary of the amount of the customers with a vat number is now based on
    the quickcode instead of the accountancy number 
  ........
................
  r2405 | danydb | 2009-03-23 21:32:48 +0100 (Mon, 23 Mar 2009) | 3 lines
  
  * IPeriod throw an exception is no rows is found (code != 0)
  * receipt problem with the numbering of the sequences
  * SearchCard = the p_jrn is not taken from a hidden elt but must be given 
................
  r2406 | danydb | 2009-03-23 21:40:15 +0100 (Mon, 23 Mar 2009) | 1 line
  
  Fix missing lib
................
  r2407 | danydb | 2009-03-23 21:41:27 +0100 (Mon, 23 Mar 2009) | 1 line
  
  Fix missing semicol
................
  r2408 | danydb | 2009-03-23 21:42:05 +0100 (Mon, 23 Mar 2009) | 1 line
  
  Fix missing semicol
................
  r2409 | danydb | 2009-03-23 21:44:09 +0100 (Mon, 23 Mar 2009) | 1 line
  
  button static cannot be redefined as dynamic
................
  r2410 | danydb | 2009-03-23 22:00:11 +0100 (Mon, 23 Mar 2009) | 1 line
  
  Prob Numbering receipt
................
  r2413 | danydb | 2009-03-24 20:11:01 +0100 (Tue, 24 Mar 2009) | 7 lines
  
  * Remove todo (add security, improve documentation,...)
  * Fix small bugs
  * class fiche_def : template for adding a cat. of card
  * Fix bug : add card + button
  * remove obsolete file : class_widget.php poste.php fiche_inc.php
  * rename CountSql to count_sql
................
  r2414 | danydb | 2009-03-24 20:12:00 +0100 (Tue, 24 Mar 2009) | 13 lines
  
  Merged revisions 2404-2413 via svnmerge from 
  svn+ssh://danydb@svn/svn/phpcompta/trunk
  
  ........
    r2411 | danydb | 2009-03-24 00:48:51 +0100 (Tue, 24 Mar 2009) | 1 line
    
    Fix bug when installing for windows
  ........
    r2412 | danydb | 2009-03-24 00:53:18 +0100 (Tue, 24 Mar 2009) | 1 line
    
    Update doc windows
  ........
................
  r2415 | danydb | 2009-03-24 23:17:09 +0100 (Tue, 24 Mar 2009) | 2 lines
  
  * ledger purchase fix cosmetic + periode is deduced from date
................
  r2416 | danydb | 2009-03-24 23:48:40 +0100 (Tue, 24 Mar 2009) | 2 lines
  
  remove the add command in the list
................
  r2417 | danydb | 2009-03-24 23:58:35 +0100 (Tue, 24 Mar 2009) | 1 line
  
  Remove the button to add a customer or a supplier from the list of s/c
................
  r2418 | danydb | 2009-03-25 00:02:31 +0100 (Wed, 25 Mar 2009) | 2 lines
  
  Add bug + todo
................
  r2419 | danydb | 2009-03-25 00:09:23 +0100 (Wed, 25 Mar 2009) | 1 line
  
  Cosmetic change css table.result
................
  r2420 | danydb | 2009-03-25 21:05:50 +0100 (Wed, 25 Mar 2009) | 2 lines
  
  Add generate_micro
................
  r2421 | danydb | 2009-03-26 09:03:57 +0100 (Thu, 26 Mar 2009) | 1 line
  
  add domain
................
  r2422 | danydb | 2009-03-30 22:45:09 +0200 (Mon, 30 Mar 2009) | 1 line
  
  Rewrite of encode sold, usage of template
................
  r2423 | danydb | 2009-04-02 13:48:16 +0200 (Thu, 02 Apr 2009) | 3 lines
  
  Add microsecond to check if it is a double reload
................
  r2424 | danydb | 2009-04-02 14:21:47 +0200 (Thu, 02 Apr 2009) | 1 line
  
  Cosmetic in acc_ledger_sold
................
  r2425 | danydb | 2009-04-02 15:53:42 +0200 (Thu, 02 Apr 2009) | 1 line
  
  transform form fin in template/form_ledger_fin.php
................
  r2426 | danydb | 2009-04-02 19:13:27 +0200 (Thu, 02 Apr 2009) | 1 line
  
  Correct bug in preference
................
  r2427 | danydb | 2009-04-03 10:57:39 +0200 (Fri, 03 Apr 2009) | 2 lines
  
  Fix Periode
................
  r2428 | danydb | 2009-04-03 12:27:04 +0200 (Fri, 03 Apr 2009) | 7 lines
  
  Remove obsolete plpgsql
  fix bug mini report
  Improve protection against reload
  Improve periode in ODS
  Add Receipt number in ListJrn
  Fix cosmetic Bug in fiche_new
................
  r2429 | danydb | 2009-04-03 13:52:27 +0200 (Fri, 03 Apr 2009) | 2 lines
  
  Improve after updating the status paid in ListJrn, we come back to the good screen
................
  r2430 | danydb | 2009-04-03 16:39:14 +0200 (Fri, 03 Apr 2009) | 2 lines
  
  Bug : the button for searching a Account is not given by IPoste
................
  r2431 | danydb | 2009-04-03 17:04:40 +0200 (Fri, 03 Apr 2009) | 2 lines
  
  Replace hard coded input type by IButton
................
  r2432 | danydb | 2009-04-03 17:06:30 +0200 (Fri, 03 Apr 2009) | 2 lines
  
  improve doc
................
  r2433 | danydb | 2009-04-03 18:01:58 +0200 (Fri, 03 Apr 2009) | 1 line
  
  remove unused line
................
  r2434 | danydb | 2009-04-04 01:29:30 +0200 (Sat, 04 Apr 2009) | 4 lines
  
  Improve doc
  Code cleaning remove old function
  Fix Bug payment by
................
  r2440 | danydb | 2009-04-17 13:32:56 +0200 (Fri, 17 Apr 2009) | 25 lines
  
  Merged revisions 2414-2439 via svnmerge from 
  svn+ssh://danydb@svn/svn/phpcompta/trunk
  
  ........
    r2435 | danydb | 2009-04-10 12:41:25 +0200 (Fri, 10 Apr 2009) | 1 line
    
    On the welcome page, check if a mini report exist before trying to display it
  ........
    r2436 | danydb | 2009-04-15 23:41:23 +0200 (Wed, 15 Apr 2009) | 1 line
    
    Improve add saldo by qcode 
  ........
    r2437 | danydb | 2009-04-15 23:48:57 +0200 (Wed, 15 Apr 2009) | 1 line
    
    Fix bug in financial ledger, there were no negative saldo
  ........
    r2438 | danydb | 2009-04-16 13:17:14 +0200 (Thu, 16 Apr 2009) | 1 line
    
    Fix Bug : financial ledger, first sold is clean
  ........
    r2439 | danydb | 2009-04-17 10:41:02 +0200 (Fri, 17 Apr 2009) | 1 line
    
    Fix Bug : in strict mode, when you start a new ledger, there is no last date of operation
  ........
................
  r2441 | danydb | 2009-04-17 20:28:33 +0200 (Fri, 17 Apr 2009) | 2 lines
  
  Fix Bug in impress->balance 
  Variable undefined in IPeriod and Acc_Account::get_lib
................
  r2443 | danydb | 2009-04-18 21:41:28 +0200 (Sat, 18 Apr 2009) | 3 lines
  
  Improve : permit to see all the ledgers in the listing
  Improve : the noadd function for SearchCard
................
  r2444 | danydb | 2009-04-18 23:57:07 +0200 (Sat, 18 Apr 2009) | 1 line
  
  Improve : listing ledger, show all the ledgers
................
  r2445 | danydb | 2009-04-19 00:00:24 +0200 (Sun, 19 Apr 2009) | 2 lines
  
  Cosmetic
................
  r2446 | danydb | 2009-04-19 00:07:54 +0200 (Sun, 19 Apr 2009) | 2 lines
  
  Cosmetic : search card must be unique
................
  r2447 | danydb | 2009-04-19 00:44:27 +0200 (Sun, 19 Apr 2009) | 1 line
  
  Cosmetic ListJrn
................
  r2448 | danydb | 2009-04-19 00:52:08 +0200 (Sun, 19 Apr 2009) | 1 line
  
  Cosmetic : style sheet
................
  r2450 | danydb | 2009-04-24 12:43:52 +0200 (Fri, 24 Apr 2009) | 1 line
  
  Adapt svnmerge 
................
  r2451 | danydb | 2009-04-24 13:14:12 +0200 (Fri, 24 Apr 2009) | 4 lines
  
  Fix : IMPORTANT this file doesn't work properly : the problem is the
    javascript enable_type_periode which makes the from_periode,
    to_periode, p_step... undefined
................
  r2453 | danydb | 2009-04-25 17:47:11 +0200 (Sat, 25 Apr 2009) | 1 line
  
  user_menu: no possibility to add card
................
  r2454 | danydb | 2009-04-25 17:47:33 +0200 (Sat, 25 Apr 2009) | 9 lines
  
  Merged revisions 2450-2453 via svnmerge from 
  svn+ssh://danydb@svn/svn/phpcompta/trunk
  
  ........
    r2452 | danydb | 2009-04-24 22:52:49 +0200 (Fri, 24 Apr 2009) | 1 line
    
    Fix bug in reconciliation in fin ledger
  ........
................
  r2455 | danydb | 2009-04-27 13:59:58 +0200 (Mon, 27 Apr 2009) | 1 line
  
  class_iposte: add table = 2 
................
  r2456 | danydb | 2009-04-27 14:00:23 +0200 (Mon, 27 Apr 2009) | 1 line
  
  Gestion : start with changes
................
  r2457 | danydb | 2009-04-27 14:00:49 +0200 (Mon, 27 Apr 2009) | 1 line
  
  class_fiche : fix cosmetic  with label
................
  r2461 | danydb | 2009-04-28 15:38:59 +0200 (Tue, 28 Apr 2009) | 13 lines
  
  Merged revisions 2454-2459 via svnmerge from 
  svn+ssh://danydb@svn/svn/phpcompta/trunk
  
  ........
    r2458 | danydb | 2009-04-27 16:11:21 +0200 (Mon, 27 Apr 2009) | 2 lines
    
    user_menu : change order of the menu
  ........
    r2459 | danydb | 2009-04-28 15:35:06 +0200 (Tue, 28 Apr 2009) | 1 line
    
    modify_op : fix bug in CA
  ........
................
  r2462 | danydb | 2009-04-28 15:40:26 +0200 (Tue, 28 Apr 2009) | 1 line
  
  Do not include rev. 2460 due to conflicts
................
  r2463 | danydb | 2009-05-20 23:03:25 +0200 (Wed, 20 May 2009) | 1 line
  
  Action : remove action from gestion->customer
................
  r2464 | danydb | 2009-05-20 23:03:49 +0200 (Wed, 20 May 2009) | 1 line
  
  Action : remove action from gestion->customer
................
  r2465 | danydb | 2009-05-22 20:43:30 +0200 (Fri, 22 May 2009) | 1 line
  
  Customer : start new version with ajax
................
  r2467 | danydb | 2009-05-30 19:24:07 +0200 (Sat, 30 May 2009) | 9 lines
  
  Merged revisions 2461-2466 via svnmerge from 
  svn+ssh://danydb@svn/svn/phpcompta/trunk
  
  ........
    r2466 | danydb | 2009-05-30 19:23:04 +0200 (Sat, 30 May 2009) | 2 lines
    
    Typo Aciotn -> Action
  ........
................
  r2468 | danydb | 2009-06-06 20:42:26 +0200 (Sat, 06 Jun 2009) | 1 line
  
  Fix property on dia
................
  r2469 | danydb | 2009-06-06 20:52:44 +0200 (Sat, 06 Jun 2009) | 1 line
  
  Add doc
................
  r2470 | danydb | 2009-06-07 15:10:25 +0200 (Sun, 07 Jun 2009) | 1 line
  
  Fix problem with todo_list in access page
................
  r2472 | danydb | 2009-07-04 20:13:03 +0200 (Sat, 04 Jul 2009) | 1 line
  
  Add doc
................
  r2473 | danydb | 2009-07-04 20:13:41 +0200 (Sat, 04 Jul 2009) | 9 lines
  
  Merged revisions 2471 via svnmerge from 
  svn+ssh://danydb@svn/svn/phpcompta/trunk
  
  ........
    r2471 | danydb | 2009-07-01 19:48:38 +0200 (Wed, 01 Jul 2009) | 1 line
    
    Bug : analytic accountancy in "gestion mode"  not possible to update a description
  ........
................
  r2474 | danydb | 2009-07-06 22:48:34 +0200 (Mon, 06 Jul 2009) | 2 lines
  
  Add the warnbulle function
................
  r2475 | danydb | 2009-07-06 22:54:07 +0200 (Mon, 06 Jul 2009) | 1 line
  
  Add warnbulle + start new design of customer
................
  r2476 | danydb | 2009-07-13 23:07:54 +0200 (Mon, 13 Jul 2009) | 1 line
  
  Remove obsolete function and start new design
................
  r2478 | danydb | 2009-07-15 21:57:03 +0200 (Wed, 15 Jul 2009) | 4 lines
  
  Implement the object Database and replace completely the old functions
  The file postgres.php has been removed
................
  r2480 | danydb | 2009-07-16 20:20:48 +0200 (Thu, 16 Jul 2009) | 13 lines
  
  Merged revisions 2477,2479 via svnmerge from 
  svn+ssh://danydb@svn/svn/phpcompta/trunk
  
  ........
    r2477 | danydb | 2009-07-14 21:48:05 +0200 (Tue, 14 Jul 2009) | 1 line
    
    Bug : exception instead of new exception
  ........
    r2479 | danydb | 2009-07-16 19:56:40 +0200 (Thu, 16 Jul 2009) | 1 line
    
    Fix Bug for Postgresql 8.3
  ........
................
  r2481 | danydb | 2009-07-17 00:14:47 +0200 (Fri, 17 Jul 2009) | 1 line
  
  Correct test_me
................
  r2482 | danydb | 2009-07-28 21:47:08 +0200 (Tue, 28 Jul 2009) | 1 line
  
  Documentation
................
  r2483 | danydb | 2009-07-28 21:48:14 +0200 (Tue, 28 Jul 2009) | 1 line
  
  Doc
................
  r2484 | danydb | 2009-07-29 00:25:14 +0200 (Wed, 29 Jul 2009) | 1 line
  
  Fix numerous problem due to the new Object Database
................
  r2485 | danydb | 2009-07-29 21:43:41 +0200 (Wed, 29 Jul 2009) | 2 lines
  
  fix bug value -> label for ibutton
................
  r2486 | danydb | 2009-07-30 00:25:36 +0200 (Thu, 30 Jul 2009) | 1 line
  
  Catch Exception is no period is open && complete the change to class_database
................
  r2487 | danydb | 2009-07-30 01:08:34 +0200 (Thu, 30 Jul 2009) | 5 lines
  
  Improve class_iperiode (add 2 variables + doc)
  fix bug in class_balance
  add unicode in header_print
  fix prob. due to new Database objet
................
  r2496 | danydb | 2009-08-08 12:34:37 +0200 (Sat, 08 Aug 2009) | 37 lines
  
  Merged revisions 2488-2495 via svnmerge from 
  svn+ssh://danydb@svn/svn/phpcompta/trunk
  
  ........
    r2488 | danydb | 2009-08-05 21:39:43 +0200 (Wed, 05 Aug 2009) | 1 line
    
    Skipper : add account label in report 
  ........
    r2489 | danydb | 2009-08-05 22:33:29 +0200 (Wed, 05 Aug 2009) | 1 line
    
    Add Libelle to Bilan
  ........
    r2490 | danydb | 2009-08-05 23:25:23 +0200 (Wed, 05 Aug 2009) | 2 lines
    
    Class_acc_bilan : protect XML
  ........
    r2491 | danydb | 2009-08-05 23:29:58 +0200 (Wed, 05 Aug 2009) | 2 lines
    
    class_acc_account : quote problem
  ........
    r2492 | danydb | 2009-08-05 23:41:19 +0200 (Wed, 05 Aug 2009) | 1 line
    
    Fix quote problem in line_update and fix header problem in class_acc_bilan::generate_odt
  ........
    r2493 | danydb | 2009-08-06 21:30:35 +0200 (Thu, 06 Aug 2009) | 1 line
    
    Add documentation about new tag
  ........
    r2494 | danydb | 2009-08-06 21:45:26 +0200 (Thu, 06 Aug 2009) | 1 line
    
    Update Doc Bilan
  ........
    r2495 | danydb | 2009-08-06 21:50:22 +0200 (Thu, 06 Aug 2009) | 1 line
    
    remove debug flag
  ........
................
  r2497 | danydb | 2009-08-08 17:01:43 +0200 (Sat, 08 Aug 2009) | 1 line
  
  Database : get_value set the this->ret
................
  r2498 | danydb | 2009-08-10 21:47:53 +0200 (Mon, 10 Aug 2009) | 1 line
  
  FIX BUG payment method, fix problem when searching or adding
................
  r2499 | danydb | 2009-08-11 00:16:08 +0200 (Tue, 11 Aug 2009) | 1 line
  
  Improve database abstraction : remove all the pg_ function 
................
  r2500 | danydb | 2009-08-20 00:06:54 +0200 (Thu, 20 Aug 2009) | 1 line
  
  Fix bug in setup.php caused by the new Database obj
................
  r2503 | danydb | 2009-08-27 22:10:08 +0200 (Thu, 27 Aug 2009) | 1 line
  
  Fix Bug : not possible to grant an access to a ledger for an user (menu -> administration->utilisateur)
................
  r2504 | danydb | 2009-08-27 22:16:22 +0200 (Thu, 27 Aug 2009) | 1 line
  
  Block rev 2501
................
  r2505 | danydb | 2009-08-27 22:19:07 +0200 (Thu, 27 Aug 2009) | 9 lines
  
  Merged revisions 2502 via svnmerge from 
  svn+ssh://danydb@svn/svn/phpcompta/trunk
  
  ........
    r2502 | danydb | 2009-08-27 21:33:36 +0200 (Thu, 27 Aug 2009) | 2 lines
    
    When an invoice is generated, the TVA_LABEL is an empty string is there is no merchandise
  ........
................
  r2509 | danydb | 2009-08-29 21:11:49 +0200 (Sat, 29 Aug 2009) | 1 line
  
  Block the rev 2508
................
  r2510 | danydb | 2009-08-29 21:12:33 +0200 (Sat, 29 Aug 2009) | 13 lines
  
  Merged revisions 2506-2507 via svnmerge from 
  svn+ssh://danydb@svn/svn/phpcompta/trunk
  
  ........
    r2506 | danydb | 2009-08-29 18:04:55 +0200 (Sat, 29 Aug 2009) | 1 line
    
    Fix Bug when clicking on pj
  ........
    r2507 | danydb | 2009-08-29 18:05:26 +0200 (Sat, 29 Aug 2009) | 1 line
    
    Fix Bug for HTML
  ........
................
  r2511 | danydb | 2009-08-29 21:16:27 +0200 (Sat, 29 Aug 2009) | 2 lines
  
  Fix bug : undefined p_oid in the functions lo_unlinks and lo_export
................
  r2512 | danydb | 2009-08-29 21:27:22 +0200 (Sat, 29 Aug 2009) | 1 line
  
  Fix Bug : rollback in class_document_modele
................
  r2513 | danydb | 2009-08-29 22:21:36 +0200 (Sat, 29 Aug 2009) | 1 line
  
  Fix Bug : due to a error into echo_debug it was not possible to create new sale or new purchase
................
  r2514 | danydb | 2009-09-02 21:05:04 +0200 (Wed, 02 Sep 2009) | 3 lines
  
  remove useless debug info
  add a __toString method for the database
  fix small bugs due to the object Database
................
  r2516 | danydb | 2009-09-05 18:57:18 +0200 (Sat, 05 Sep 2009) | 2 lines
  
  Add a new Widget : IAction
................
  r2517 | danydb | 2009-09-10 23:45:04 +0200 (Thu, 10 Sep 2009) | 1 line
  
  Replace menu "Contact" by  menu "Fiche"
................
  r2518 | danydb | 2009-09-11 21:19:37 +0200 (Fri, 11 Sep 2009) | 2 lines
  
  Typo change fiche by Fiche
................
  r2519 | danydb | 2009-09-11 22:47:27 +0200 (Fri, 11 Sep 2009) | 1 line
  
  fix bug : not readonly for Display
................
  r2520 | danydb | 2009-09-11 22:48:40 +0200 (Fri, 11 Sep 2009) | 1 line
  
  Add new function for counting the number of category by fiche type + fix bug with the button cherche 
................
  r2521 | danydb | 2009-09-11 22:49:10 +0200 (Fri, 11 Sep 2009) | 1 line
  
  fix bug : the Cherche button does not work
................
  r2522 | danydb | 2009-09-12 16:12:04 +0200 (Sat, 12 Sep 2009) | 1 line
  
  Add a new HTML Widget IAction
................
  r2523 | danydb | 2009-09-12 18:02:27 +0200 (Sat, 12 Sep 2009) | 7 lines
  
  Customer changes : 
  ==================
  Add new layout
  Add new customer card
  Add new customer category
  improve Customer::Summary
................
  r2524 | danydb | 2009-09-12 18:10:43 +0200 (Sat, 12 Sep 2009) | 2 lines
  
  Change class action by class Action
................
  r2525 | danydb | 2009-09-13 22:46:35 +0200 (Sun, 13 Sep 2009) | 1 line
  
  Set 2 times the same variable $l_sessid + correct indent
................
  r2527 | danydb | 2009-09-16 22:45:18 +0200 (Wed, 16 Sep 2009) | 7 lines
  
  Improve "Suivi Courrier"
  ======================
  * the document::d_state containing the status is  replaced by action::ag_state 
  * It is now possible to add several documents to an action
  * There is no longer one 'Expediteur' and one 'Destinataire', it is replaced by one card
................
  r2529 | danydb | 2009-09-17 19:30:12 +0200 (Thu, 17 Sep 2009) | 2 lines
  
  change get_array, returns an empty array if nothing is found
................
  r2530 | danydb | 2009-09-17 23:28:34 +0200 (Thu, 17 Sep 2009) | 15 lines
  
  Improve "Suivi Courrier"
  ========================
  
  * Change f_id : now we can a SQL where clause, it fixed a bug with suivi client
  * Add several documents
  * Remove Document thanks javascript (file scripts + show_document.php)
  * Remove all the documents of a deleted action
  * Not longer a blank document when adding an action
  * Improve Layout of "Suivi Courrier"
  * remove Rich text widget which is replace by a textarea
  * the state of an action is in action and not longer in document
  * Remove Destinataire and Expediteur, replaced by only one
  * Add / update / delete action is one step
................
  r2531 | danydb | 2009-09-17 23:29:53 +0200 (Thu, 17 Sep 2009) | 2 lines
  
  Improve the button_href, which looks now as IAction + doc
................
  r2532 | danydb | 2009-09-17 23:58:37 +0200 (Thu, 17 Sep 2009) | 2 lines
  
  Add a concerned link in Action::Display
................
  r2533 | danydb | 2009-09-18 00:13:59 +0200 (Fri, 18 Sep 2009) | 1 line
  
  Place the return button inside the fieldset
................
  r2534 | danydb | 2009-09-18 15:08:17 +0200 (Fri, 18 Sep 2009) | 2 lines
  
  Database::get_value print a warning if returns more than one value
................
  r2535 | danydb | 2009-09-18 20:27:03 +0200 (Fri, 18 Sep 2009) | 3 lines
  
  datatabase::get_value returns a warning if several values are returns, 
  it gives a bug for the function limit_year
................
  r2536 | danydb | 2009-09-18 21:53:32 +0200 (Fri, 18 Sep 2009) | 2 lines
  
  Bug in fiche_search when using the type [SQL] in the filter for the card
................
  r2537 | danydb | 2009-09-18 21:59:21 +0200 (Fri, 18 Sep 2009) | 2 lines
  
  Inn exec_sql the array is printed if the pg_query fails
................
  r2538 | danydb | 2009-09-18 23:30:16 +0200 (Fri, 18 Sep 2009) | 2 lines
  
  Suivi courrier : generate the document and add a draft for the items to sell / order / deliver
................
  r2539 | danydb | 2009-09-18 23:38:55 +0200 (Fri, 18 Sep 2009) | 1 line
  
  suivi_courrier change f_id_exp by f_id_dest
................
  r2540 | danydb | 2009-09-18 23:49:19 +0200 (Fri, 18 Sep 2009) | 14 lines
  
  table action_gestion
  ---------------------
   * remove col. f_id_exp
   * add col. ag_state
   * add a trigger to cut the col. ag_title to 70 char
  Function account_parent
  -----------------------
  fix bug : exit loop when a account parent is found
  
  table invoice drop because useless
  table parm_code add code SUPPLIER
  drop useless function insert_quant_purchase, insert_quant_sold 
  add index for jrn(jr_mt) (double encoding detection)
................
  r2545 | danydb | 2009-09-19 18:19:27 +0200 (Sat, 19 Sep 2009) | 1 line
  
  Improve layout of form for adding/modifying an action
................
  r2546 | danydb | 2009-09-20 00:11:05 +0200 (Sun, 20 Sep 2009) | 11 lines
  
  Suivi client
  =======
  Add the owner to the table ag_action
  Add the hours (format HH:MM) and a javascript to check the format
  Add the affected to 
  Add a flag if the action have to be seen in the calendar
  filter the list thanks the cloture or note
  change ag_state to 'to be done, done, to follow, cancel'
  Highlight the High priority in the list
................
  r2547 | danydb | 2009-09-20 00:11:43 +0200 (Sun, 20 Sep 2009) | 1 line
  
  Improve appereance of generated documentation
................
  r2548 | danydb | 2009-09-20 00:12:37 +0200 (Sun, 20 Sep 2009) | 1 line
  
  function get_by_qcode If it is not possible to find the quick_code of card then his id is 0
................
  r2549 | danydb | 2009-09-20 00:26:34 +0200 (Sun, 20 Sep 2009) | 1 line
  
  Fix bug in search card and change cosmetic in Action::Display for ag_ref_ag_ref_id
................
  r2550 | danydb | 2009-09-20 00:52:11 +0200 (Sun, 20 Sep 2009) | 1 line
  
  Suivi courrier : show only my action
................
  r2551 | danydb | 2009-09-20 21:05:09 +0200 (Sun, 20 Sep 2009) | 1 line
  
  Suivi courrier : Add the contact in the action form (ag_action)
................
  r2552 | danydb | 2009-09-26 21:12:45 +0200 (Sat, 26 Sep 2009) | 1 line
  
  FIX : remove a small cosmetic bugs
................
  r2553 | danydb | 2009-09-26 21:15:36 +0200 (Sat, 26 Sep 2009) | 1 line
  
  DOC : add documentation 
................
  r2554 | danydb | 2009-09-26 21:16:47 +0200 (Sat, 26 Sep 2009) | 4 lines
  
  IMPROVE : when a card is found the label is updated, there is a test (tagName) to determine
            if we have to use innerHTML or value
................
  r2555 | danydb | 2009-09-26 21:17:41 +0200 (Sat, 26 Sep 2009) | 1 line
  
  Remove XML output in Doxygen
................
  r2560 | danydb | 2009-10-03 01:28:30 +0200 (Sat, 03 Oct 2009) | 1 line
  
  Infobulle : add example 
................
  r2561 | danydb | 2009-10-03 01:31:50 +0200 (Sat, 03 Oct 2009) | 1 line
  
  Class fiche : rewrite code for get_by_qcode
................
  r2562 | danydb | 2009-10-03 01:33:46 +0200 (Sat, 03 Oct 2009) | 1 line
  
  Style sheet add span action
................
  r2563 | danydb | 2009-10-03 01:35:16 +0200 (Sat, 03 Oct 2009) | 1 line
  
  Class document : remove waiting message when generating a document
................
  r2564 | danydb | 2009-10-03 01:35:50 +0200 (Sat, 03 Oct 2009) | 1 line
  
  update document schema
................
  r2565 | danydb | 2009-10-03 01:36:43 +0200 (Sat, 03 Oct 2009) | 5 lines
  
  Suivi 
  =====
  Finished the new layout of follow up
................
  r2566 | danydb | 2009-10-03 01:37:22 +0200 (Sat, 03 Oct 2009) | 1 line
  
  Suivi client add List action
................
  r2567 | danydb | 2009-10-03 01:46:08 +0200 (Sat, 03 Oct 2009) | 9 lines
  
  Merged revisions 2515 via svnmerge from 
  svn+ssh://danydb@svn/svn/phpcompta/trunk
  
  ........
    r2515 | danydb | 2009-09-04 21:44:42 +0200 (Fri, 04 Sep 2009) | 1 line
    
    For the bilan, fix partially a bug in the html headers for OOo document and allowed the use of the numeric format in ods document (from Bertrand)
  ........
................
  r2568 | danydb | 2009-10-03 01:52:20 +0200 (Sat, 03 Oct 2009) | 30 lines
  
  Merged revisions 2526,2528,2541,2543,2558-2559 via svnmerge from 
  svn+ssh://danydb@svn/svn/phpcompta/trunk
  
  ........
    r2526 | danydb | 2009-09-14 23:21:41 +0200 (Mon, 14 Sep 2009) | 1 line
    
    Fix Bug with the todo list, in the "Accueil" if there several line in a todo list, you cannot modify it
  ........
    r2528 | danydb | 2009-09-17 16:44:14 +0200 (Thu, 17 Sep 2009) | 4 lines
    
    Changement to let the user to enter manually the vat amount in the Ledger of sold.
    It must be tested and accepted
  ........
    r2541 | danydb | 2009-09-19 00:53:18 +0200 (Sat, 19 Sep 2009) | 2 lines
    
    bug : impress->poste give duplicate if the same card is used several times in an operation
  ........
    r2543 | danydb | 2009-09-19 01:14:36 +0200 (Sat, 19 Sep 2009) | 1 line
    
    Revert the change from rev 2528 about the manual encoding of vat in sold ledger
  ........
    r2558 | danydb | 2009-09-28 22:08:01 +0200 (Mon, 28 Sep 2009) | 1 line
    
    fix bug postgresql 8.3 : the restart sequence must be > 1
  ........
    r2559 | danydb | 2009-09-28 22:09:11 +0200 (Mon, 28 Sep 2009) | 2 lines
    
    FIX BUG in sql_filter_per for the centralized printing 
  ........
................
  r2570 | danydb | 2009-10-07 23:34:28 +0200 (Wed, 07 Oct 2009) | 8 lines
  
  Blocked revisions 2569 via svnmerge
  
  ........
    r2569 | danydb | 2009-10-07 23:27:49 +0200 (Wed, 07 Oct 2009) | 2 lines
    
    Fix problem when multiple lines
  ........
................
  r2571 | danydb | 2009-10-08 00:09:28 +0200 (Thu, 08 Oct 2009) | 1 line
  
  Fix Bug : decode uri
................
  r2572 | danydb | 2009-10-08 00:41:04 +0200 (Thu, 08 Oct 2009) | 3 lines
  
  Add the PHP function encodeURI decodeURI to match the behaviour of 
  those functions in javascript
................
  r2573 | danydb | 2009-10-08 19:54:23 +0200 (Thu, 08 Oct 2009) | 6 lines
  
  **********************************************************************
  
  create a branch for the rewrite of javascript
  
  **********************************************************************
................
  r2575 | danydb | 2009-10-08 21:02:08 +0200 (Thu, 08 Oct 2009) | 1 line
  
  javascript : Remove useless files and regroup differently
................
  r2576 | danydb | 2009-10-09 00:36:13 +0200 (Fri, 09 Oct 2009) | 1 line
  
  Rename search_post to account_item + code rewriting
................
  r2577 | danydb | 2009-10-09 00:36:27 +0200 (Fri, 09 Oct 2009) | 1 line
  
  Rename search_post to account_item + code rewriting
................
  r2578 | danydb | 2009-10-09 00:36:49 +0200 (Fri, 09 Oct 2009) | 1 line
  
  Rename search_card to card + code rewriting
................
  r2579 | danydb | 2009-10-09 00:38:02 +0200 (Fri, 09 Oct 2009) | 1 line
  
  put ajax op into anc_script
................
  r2580 | danydb | 2009-10-09 00:40:14 +0200 (Fri, 09 Oct 2009) | 1 line
  
  Add the Ajax object + encodeJSON function
................
  r2581 | danydb | 2009-10-09 00:40:39 +0200 (Fri, 09 Oct 2009) | 1 line
  
  rewrite code
................
  r2582 | danydb | 2009-10-09 00:42:37 +0200 (Fri, 09 Oct 2009) | 2 lines
  
  Remove obsolete javascript file 
  and test for javascript into test.php
................
  r2584 | danydb | 2009-10-17 14:49:41 +0200 (Sat, 17 Oct 2009) | 1 line
  
  ReAdd prototype.js
................
  r2585 | danydb | 2009-10-17 16:47:44 +0200 (Sat, 17 Oct 2009) | 2 lines
  
  access : Fix size report for IE
................
  r2586 | danydb | 2009-10-17 17:16:58 +0200 (Sat, 17 Oct 2009) | 4 lines
  
  Sort and regroup the javascript
  Replace PNG image with GIF image for compatibility with IE
  Modify CSS for compatibility with IE
................
  r2587 | danydb | 2009-10-17 17:18:25 +0200 (Sat, 17 Oct 2009) | 9 lines
  
  Merged revisions 2583 via svnmerge from 
  svn+ssh://danydb@svn/svn/phpcompta/branches/rel500
  
  ........
    r2583 | danydb | 2009-10-14 23:41:11 +0200 (Wed, 14 Oct 2009) | 1 line
    
    Add the function encodeURI to avoid problem with JSON
  ........
................
  r2588 | danydb | 2009-10-17 17:26:43 +0200 (Sat, 17 Oct 2009) | 2 lines
  
  Fix Bug with the add button
................
  r2589 | danydb | 2009-10-17 19:01:10 +0200 (Sat, 17 Oct 2009) | 1 line
  
  Remove obsolete image files
................
  r2590 | danydb | 2009-10-19 19:46:21 +0200 (Mon, 19 Oct 2009) | 2 lines
  
  Modify echo_error
................
  r2596 | danydb | 2009-10-20 23:34:31 +0200 (Tue, 20 Oct 2009) | 3 lines
  
  FIX IE 7 Cosmetic BUG
  Avoid connection with IE6
  Add the ipopupsearchcard
................
  r2597 | danydb | 2009-10-21 14:56:29 +0200 (Wed, 21 Oct 2009) | 1 line
  
  Add new version of prototype
................
  r2599 | danydb | 2009-10-24 18:16:43 +0200 (Sat, 24 Oct 2009) | 2 lines
  
  Doc
................
  r2600 | danydb | 2009-10-25 11:22:04 +0100 (Sun, 25 Oct 2009) | 1 line
  
  Add create_script and js_include function 
................
  r2601 | danydb | 2009-10-25 11:23:29 +0100 (Sun, 25 Oct 2009) | 3 lines
  
  Finished the autocomplete feature for the ledger of sales
................
  r2602 | danydb | 2009-10-25 11:34:45 +0100 (Sun, 25 Oct 2009) | 1 line
  
  Update Documentation 
................
  r2603 | danydb | 2009-10-25 12:19:40 +0100 (Sun, 25 Oct 2009) | 2 lines
  
  Cosmetic : add a limit for autocomplete card (12)
................
  r2604 | danydb | 2009-10-25 13:44:06 +0100 (Sun, 25 Oct 2009) | 1 line
  
  Delay to be redirected is reduce to 1 sec 
................
  r2605 | danydb | 2009-10-25 18:11:50 +0100 (Sun, 25 Oct 2009) | 8 lines
  
  This version contains the icard with autocomplete working
  Only implemented in Ledger of sale
  
  Some bugs and questions remain 
  * the payment by must be improved
  * verify if the tva_id is updated
  * Nothing happens if we don't selected in the hint list
................
  r2606 | danydb | 2009-10-25 18:22:50 +0100 (Sun, 25 Oct 2009) | 3 lines
  
  Autocomplete in Ledger of sales
  Improve ICard : add an onchange event
................
  r2607 | danydb | 2009-10-25 18:33:58 +0100 (Sun, 25 Oct 2009) | 8 lines
  
  Autocomplete in Ledger of sales
  
  Improve ICard 
  =============
  *  add an error message if the card is not found when card is not selected into the list
  * remove the animated indicator
................
  r2608 | danydb | 2009-10-25 18:37:44 +0100 (Sun, 25 Oct 2009) | 2 lines
  
  Fix small bug due the removal of the animation
................
  r2609 | danydb | 2009-10-27 14:23:23 +0100 (Tue, 27 Oct 2009) | 1 line
  
  add phpcompta_psql_host is the config_file, this variable is the postgresql host in case it is not in local, fix the return carriage for windows
................
  r2611 | danydb | 2009-10-27 21:42:41 +0100 (Tue, 27 Oct 2009) | 1 line
  
  Add variable phpcompta_psql_host in config.inc.php
................
  r2612 | danydb | 2009-10-27 21:45:10 +0100 (Tue, 27 Oct 2009) | 8 lines
  
  Blocked revisions 2610 via svnmerge
  
  ........
    r2610 | danydb | 2009-10-27 21:07:16 +0100 (Tue, 27 Oct 2009) | 1 line
    
    add variable phpcompta_psql_host to set the postgres server on another server
  ........
................
  r2613 | danydb | 2009-10-27 21:47:44 +0100 (Tue, 27 Oct 2009) | 2 lines
  
  Add script.aculous script
................
  r2614 | danydb | 2009-10-27 22:14:15 +0100 (Tue, 27 Oct 2009) | 2 lines
  
  get_by_qcode remove the heading and trailing space
................
  r2615 | danydb | 2009-10-27 22:42:32 +0100 (Tue, 27 Oct 2009) | 2 lines
  
  Remove trailing and heading space for insert_quant_purchase and insert_quant_sold
................
  r2616 | danydb | 2009-10-27 22:46:26 +0100 (Tue, 27 Oct 2009) | 1 line
  
  Fix bug : if there is no file to upload, returns immediately
................
  r2617 | danydb | 2009-10-27 22:46:54 +0100 (Tue, 27 Oct 2009) | 1 line
  
  Add documentation 
................
  r2618 | danydb | 2009-10-27 22:48:14 +0100 (Tue, 27 Oct 2009) | 1 line
  
  Autocomplete in Ledger of purchase, still missing : detail and add card
................
  r2619 | danydb | 2009-10-28 12:08:19 +0100 (Wed, 28 Oct 2009) | 4 lines
  
  For the auto complete, we can now seek in the quick_code, in the name and in the description
  the part of string which is found is in bold
  Those feature must tested
................
  r2620 | danydb | 2009-10-28 15:34:34 +0100 (Wed, 28 Oct 2009) | 3 lines
  
  * Change the function Acc_Ledger_Purchase::display_form by Acc_Ledger_Purchase::input
  * change the name of form_ledger
................
  r2621 | danydb | 2009-10-28 15:35:10 +0100 (Wed, 28 Oct 2009) | 1 line
  
  Remove form_ledger_detail.php
................
  r2622 | danydb | 2009-10-28 15:35:42 +0100 (Wed, 28 Oct 2009) | 1 line
  
  Rename form_ledger_ven.php to form_ledger_detail.php
................
  r2623 | danydb | 2009-10-28 22:26:04 +0100 (Wed, 28 Oct 2009) | 6 lines
  
  Make the search in description qcode or name
  Add ICard autocomplete to :
  	- Financial ledger
  	- Gestion : details
................
  r2625 | danydb | 2009-10-28 23:30:49 +0100 (Wed, 28 Oct 2009) | 2 lines
  
  ICard autocomplete : add the price
................
  r2628 | danydb | 2009-10-31 02:42:15 +0100 (Sat, 31 Oct 2009) | 10 lines
  
  Improve the facture HTML in the contrib
  Fix bug in generate invoice 
  Manual VAT amount in the ledger of sales
  Add ICard to Ledger Sales, purchase and fin
  Rewrite of javascript for ledger
  Ledger purchase use template
  Fix prob with infobulle in FIN ledger
  Improve ICard and make it work with IE7 and IE8
  Improve support of IE7 and IE8
................
  r2629 | danydb | 2009-10-31 03:03:43 +0100 (Sat, 31 Oct 2009) | 4 lines
  
  Add ajax_saldo
  Fix bug with amount computing
  Improve CSS : input text with 2 px of margin
................
  r2630 | danydb | 2009-10-31 13:17:05 +0100 (Sat, 31 Oct 2009) | 2 lines
  
  Set redirect if disconnected to 1 sec
................
  r2631 | danydb | 2009-10-31 20:07:10 +0100 (Sat, 31 Oct 2009) | 1 line
  
  rewrite of the listing of ledger, with a hidden div for the search
................
  r2632 | danydb | 2009-10-31 20:32:08 +0100 (Sat, 31 Oct 2009) | 1 line
  
  Add name of ledger into list_operation
................
  r2633 | danydb | 2009-10-31 20:33:39 +0100 (Sat, 31 Oct 2009) | 1 line
  
  Add search form for ledger
................
  r2634 | danydb | 2009-10-31 20:39:13 +0100 (Sat, 31 Oct 2009) | 2 lines
  
  Add documentation for new functions
................
  r2635 | danydb | 2009-11-01 12:44:56 +0100 (Sun, 01 Nov 2009) | 7 lines
  
  search : 
  	* by default the search is on the default period, 
  	* move openrecherche into scripts
  	* search ok for list VEN ACH ALL
  	* rewrite of recherche.php
  	* deprecated function showMenuRecherche
................
  r2636 | danydb | 2009-11-01 12:54:12 +0100 (Sun, 01 Nov 2009) | 3 lines
  
  Add in attr_def a nr of customer by default
  Clean code constant.php
................
  r2637 | danydb | 2009-11-01 14:26:52 +0100 (Sun, 01 Nov 2009) | 2 lines
  
  Icard + new search : working for quick_writing
................
  r2638 | danydb | 2009-11-01 14:43:31 +0100 (Sun, 01 Nov 2009) | 2 lines
  
  remove debug info
................
  r2639 | danydb | 2009-11-01 17:48:39 +0100 (Sun, 01 Nov 2009) | 3 lines
  
  For each ledger it is now possible to see the details of card
  when double-clicking on the field
................
  r2640 | danydb | 2009-11-01 18:34:02 +0100 (Sun, 01 Nov 2009) | 2 lines
  
  todo : bug IE cannot solved : bad position IPOPUP
................
  r2641 | danydb | 2009-11-01 18:34:41 +0100 (Sun, 01 Nov 2009) | 1 line
  
  Try to fix problem with IE, IPopup does not WORK !!
................
  r2642 | danydb | 2009-11-01 19:00:24 +0100 (Sun, 01 Nov 2009) | 1 line
  
  Fix position IPopup for card
................
  r2643 | danydb | 2009-11-01 19:55:26 +0100 (Sun, 01 Nov 2009) | 1 line
  
  Fix Problem IE with XML handling; add INum in each ledger
................
  r2644 | danydb | 2009-11-01 22:12:40 +0100 (Sun, 01 Nov 2009) | 2 lines
  
  Improve cosmetic
................
  r2645 | danydb | 2009-11-02 17:36:14 +0100 (Mon, 02 Nov 2009) | 3 lines
  
  Add a button for adding card inside a ledger form, there is no 
  popup window any more for adding a card
................
  r2650 | danydb | 2009-11-03 23:27:30 +0100 (Tue, 03 Nov 2009) | 1 line
  
  ICard : add a new static method for creating the IPopup ICard::ipopup()
................
  r2651 | danydb | 2009-11-04 00:46:05 +0100 (Wed, 04 Nov 2009) | 1 line
  
  Change javascript for IE compatibility for adding row in table
................
  r2652 | danydb | 2009-11-04 10:20:48 +0100 (Wed, 04 Nov 2009) | 1 line
  
  Rename button_href to button_anchor
................
  r2654 | danydb | 2009-11-04 10:29:07 +0100 (Wed, 04 Nov 2009) | 3 lines
  
  Removed merge tracking for "svnmerge" for 
  file:///home/developper/svn/phpcompta/branches/rel500
................
  r2657 | danydb | 2009-11-04 10:56:21 +0100 (Wed, 04 Nov 2009) | 1 line
  
  Update Changelog svn2cl -r 2351:HEAD, 2351 was the start on rel500 branch
................
  r2658 | danydb | 2009-11-04 18:30:35 +0100 (Wed, 04 Nov 2009) | 4 lines
  
  
  Javascript prob.
  Put the javascript script file in the top of the file
................
  r2659 | danydb | 2009-11-04 18:33:19 +0100 (Wed, 04 Nov 2009) | 4 lines
  
  
  Rename ajax_get.php to ajax_card.js
................
  r2660 | danydb | 2009-11-04 19:36:52 +0100 (Wed, 04 Nov 2009) | 2 lines
  
  complete documentation of ajax_card
................
  r2661 | danydb | 2009-11-04 19:57:36 +0100 (Wed, 04 Nov 2009) | 2 lines
  
  add the function escape_xml
................
  r2662 | danydb | 2009-11-05 16:14:02 +0100 (Thu, 05 Nov 2009) | 1 line
  
  Remove useless comment
................
  r2663 | danydb | 2009-11-05 21:34:52 +0100 (Thu, 05 Nov 2009) | 6 lines
  
  Improve IPopup
  --------------
  Add the draggable feature for all ipopup
  Fix position problem with IE
................
  r2664 | danydb | 2009-11-07 00:07:24 +0100 (Sat, 07 Nov 2009) | 2 lines
  
  fix bug in get_row : order must appear in the select
................
  r2665 | danydb | 2009-11-07 01:00:08 +0100 (Sat, 07 Nov 2009) | 6 lines
  
  Accounting 
  ===========
  * finish to add everywhere the ICard
  * finish to add everywhere the IPost
................
  r2666 | danydb | 2009-11-07 12:38:30 +0100 (Sat, 07 Nov 2009) | 1 line
  
  Correct cosmetic + Tabel CSS
................
  r2667 | danydb | 2009-11-07 12:40:21 +0100 (Sat, 07 Nov 2009) | 1 line
  
  Respond to ajax request to manager Accouting item (search)
................
  r2668 | danydb | 2009-11-08 18:39:02 +0100 (Sun, 08 Nov 2009) | 12 lines
  
  Gestion Client
  ==============
  Add the operations 
  add the contacts
  
  General
  =======
  Improve search  into ledger (accouting item + quick code card)
  Improve search  into ledger (internal number)
................
  r2669 | danydb | 2009-11-09 14:12:38 +0100 (Mon, 09 Nov 2009) | 2 lines
  
  Split action.inc.php into 2 parts, the second is usable from anywhere
................
  r2670 | danydb | 2009-11-09 18:31:07 +0100 (Mon, 09 Nov 2009) | 6 lines
  
  Firefox XML
  =============
  
  Firefox split the XML answer in a 4k block, IE doesn't. 
  We add a function to retrieve the full content of a XML node
................
  r2671 | danydb | 2009-11-10 14:23:16 +0100 (Tue, 10 Nov 2009) | 7 lines
  
  Firefox XML
  =============
  
  Firefox split the XML answer in a 4k block, IE doesn't.
  We add a function to retrieve the full content of a XML node
................
  r2672 | danydb | 2009-11-11 16:56:47 +0100 (Wed, 11 Nov 2009) | 5 lines
  
  Todo List
  =========
  To avoid any problem, the JSON format has been dropped and replaced by 
  the XML format
................
  r2673 | danydb | 2009-11-12 16:16:47 +0100 (Thu, 12 Nov 2009) | 7 lines
  
  Dev. Scripts
  ============
  * delete old useless scripts
  * add comments to scripts (purpose, gpl...)
  * add scripts for adding languages
................
  r2674 | danydb | 2009-11-12 21:12:50 +0100 (Thu, 12 Nov 2009) | 5 lines
  
  Translation 
  ===========
  Start translation to English
................
  r2675 | danydb | 2009-11-14 00:58:37 +0100 (Sat, 14 Nov 2009) | 5 lines
  
  Card search button
  -------------------
  Add a search button in accountancy
................
  r2676 | danydb | 2009-11-14 16:57:01 +0100 (Sat, 14 Nov 2009) | 2 lines
  
  Class database : with postgresql > 8.2 the sequence can be less than 1
................
  r2677 | danydb | 2009-11-14 17:00:13 +0100 (Sat, 14 Nov 2009) | 6 lines
  
  Bug
  ===
  Fix Bug in the creation of ledger, and add the new IPoste class
  for searching for an accounting item
................
  r2678 | danydb | 2009-11-15 17:12:59 +0100 (Sun, 15 Nov 2009) | 3 lines
  
  remove debug code 
  Add translation
................
  r2679 | danydb | 2009-11-15 21:48:05 +0100 (Sun, 15 Nov 2009) | 7 lines
  
  Fiche cat
  =========
  Add IPoste, 
  Add correction of accounting item for the cat
  Add correction of auto create for the cat
................
  r2680 | danydb | 2009-11-16 16:06:55 +0100 (Mon, 16 Nov 2009) | 1 line
  
  Add translations
................
  r2681 | danydb | 2009-11-17 20:51:18 +0100 (Tue, 17 Nov 2009) | 5 lines
  
  Card
  ====
  Fix bug with the accounting item when it is not automatically 
  computed
................
  r2682 | danydb | 2009-11-17 21:13:13 +0100 (Tue, 17 Nov 2009) | 1 line
  
  remove debug info and correct the printing of account 
................
  r2683 | danydb | 2009-11-17 21:49:31 +0100 (Tue, 17 Nov 2009) | 4 lines
  
  Report
  ======
  Fix bug with report, add IPoste for helping in creation of new report
................
  r2684 | danydb | 2009-11-18 17:02:36 +0100 (Wed, 18 Nov 2009) | 3 lines
  
  Translation of the template
................
  r2685 | danydb | 2009-11-18 17:20:00 +0100 (Wed, 18 Nov 2009) | 5 lines
  
  BUDGET
  ======
  Remove completely the old BUDGET module
................
  r2686 | danydb | 2009-11-18 17:31:49 +0100 (Wed, 18 Nov 2009) | 1 line
  
  Cosmetic : size of span as row
................
  r2687 | danydb | 2009-11-18 17:32:05 +0100 (Wed, 18 Nov 2009) | 1 line
  
  Typo 
................
  r2688 | danydb | 2009-11-19 12:21:12 +0100 (Thu, 19 Nov 2009) | 2 lines
  
  redirect faster
................
  r2689 | danydb | 2009-11-19 12:22:27 +0100 (Thu, 19 Nov 2009) | 2 lines
  
  Change Liste des tâches to Pense Bete
................
  r2690 | danydb | 2009-11-19 16:58:27 +0100 (Thu, 19 Nov 2009) | 5 lines
  
  Ledger VEN & ACH
  ================
  Translation 
................
  r2691 | danydb | 2009-11-19 22:55:15 +0100 (Thu, 19 Nov 2009) | 2 lines
  
  Fix bug with f_id_Dest
................
  r2692 | danydb | 2009-11-19 23:13:20 +0100 (Thu, 19 Nov 2009) | 1 line
  
  Fix small bug in "gestion"
................
  r2693 | danydb | 2009-11-20 11:57:39 +0100 (Fri, 20 Nov 2009) | 2 lines
  
  Doxygen : introduction in English
................
  r2694 | danydb | 2009-11-20 12:20:43 +0100 (Fri, 20 Nov 2009) | 1 line
  
  Typo in SQL
................
  r2695 | danydb | 2009-11-20 15:30:09 +0100 (Fri, 20 Nov 2009) | 2 lines
  
  Add comment to database
................
  r2696 | danydb | 2009-11-22 11:02:14 +0100 (Sun, 22 Nov 2009) | 1 line
  
  Dashboad
................
  r2697 | danydb | 2009-11-22 11:02:46 +0100 (Sun, 22 Nov 2009) | 1 line
  
  Dashboad
................
  r2698 | danydb | 2009-11-22 11:03:09 +0100 (Sun, 22 Nov 2009) | 1 line
  
  Reconciliation : fix bug
................
  r2699 | danydb | 2009-11-22 11:21:56 +0100 (Sun, 22 Nov 2009) | 2 lines
  
  fix bug for period and show the selected language
................
  r2700 | danydb | 2009-11-22 11:40:10 +0100 (Sun, 22 Nov 2009) | 2 lines
  
  IPeriod improve doc and add javascript
................
  r2701 | danydb | 2009-11-22 11:50:24 +0100 (Sun, 22 Nov 2009) | 5 lines
  
  class ICard
  -----------
  No button search if readOnly  is true
  display  show the value and add a hidden value
................
  r2702 | danydb | 2009-11-22 12:20:22 +0100 (Sun, 22 Nov 2009) | 6 lines
  
  Import Bank
  -----------
  Fix bug import bank
  Add possibility to select directly the period
................
  r2703 | danydb | 2009-11-22 14:10:49 +0100 (Sun, 22 Nov 2009) | 6 lines
  
  Customer
  ---------
  Add a new card in a popup
  Reload window after adding card
................
  r2704 | danydb | 2009-11-22 18:48:07 +0100 (Sun, 22 Nov 2009) | 5 lines
  
  Customer
  ==========
  Add category by ipopup
................
  r2705 | danydb | 2009-11-22 18:59:44 +0100 (Sun, 22 Nov 2009) | 4 lines
  
  Deprecated
  ==========
  remove deprecated function code
................
  r2706 | danydb | 2009-11-22 19:01:53 +0100 (Sun, 22 Nov 2009) | 1 line
  
  code cleaning : remove dead code
................
  r2707 | danydb | 2009-11-22 19:06:34 +0100 (Sun, 22 Nov 2009) | 1 line
  
  remove useless option
................
  r2708 | danydb | 2009-11-22 19:12:53 +0100 (Sun, 22 Nov 2009) | 1 line
  
  Code cleaning : remove dead code
................
  r2709 | danydb | 2009-11-22 22:32:12 +0100 (Sun, 22 Nov 2009) | 1 line
  
  fix bug char set and update translation
................
  r2710 | danydb | 2009-11-23 15:23:09 +0100 (Mon, 23 Nov 2009) | 4 lines
  
  Code cleaning
  =============
  Remove Dead Code 
................
  r2711 | danydb | 2009-11-23 16:09:54 +0100 (Mon, 23 Nov 2009) | 1 line
  
  ICard : improve doc and remove dead code
................
  r2712 | danydb | 2009-11-23 23:36:41 +0100 (Mon, 23 Nov 2009) | 2 lines
  
  Improve appearance
................
  r2713 | danydb | 2009-11-24 00:42:25 +0100 (Tue, 24 Nov 2009) | 7 lines
  
  Acc_Ledger Sales and Expense
  -----------------------------
  * Fix last bugs
  * Add 2 columns : total without VAT, total with VAT
  * Improve INum, the readonly TAGS are in light grey
................
  r2714 | danydb | 2009-11-24 14:48:59 +0100 (Tue, 24 Nov 2009) | 1 line
  
  Generate Doc : clean table document after generating
................
  r2715 | danydb | 2009-11-24 17:28:48 +0100 (Tue, 24 Nov 2009) | 6 lines
  
  Doxygen 
  change setting : 
  	remove code in the documentation
  	Show comment
................
  r2716 | danydb | 2009-11-24 17:29:55 +0100 (Tue, 24 Nov 2009) | 2 lines
  
  Backup - restore : Add the flag --no-owner to avoid some security issues
................
  r2717 | danydb | 2009-11-24 17:31:04 +0100 (Tue, 24 Nov 2009) | 8 lines
  
  Action - customer
  ==================
  Add the search button
  Add the detail double click
  Improve documentation
  Improve search build_sql
................
  r2718 | danydb | 2009-11-24 22:51:53 +0100 (Tue, 24 Nov 2009) | 1 line
  
  Fix char set 
................
  r2719 | danydb | 2009-11-24 23:52:39 +0100 (Tue, 24 Nov 2009) | 1 line
  
  cosmetic
................
  r2720 | danydb | 2009-11-24 23:52:41 +0100 (Tue, 24 Nov 2009) | 1 line
  
  Class fiche: add toArray
................
  r2721 | danydb | 2009-11-24 23:53:38 +0100 (Tue, 24 Nov 2009) | 1 line
  
   add button for the search of action
................
  r2722 | danydb | 2009-11-24 23:54:01 +0100 (Tue, 24 Nov 2009) | 2 lines
  
  Improve ISpan : add the attribute style
................
  r2723 | danydb | 2009-11-26 16:58:23 +0100 (Thu, 26 Nov 2009) | 1 line
  
  Improve doc + test card
................
  r2724 | danydb | 2009-11-28 01:22:43 +0100 (Sat, 28 Nov 2009) | 6 lines
  
  Fix bug in GESTION
  Add search in Recherche (acc_ledger)
  Improve doc and style
  Create file for extension
................
  r2725 | danydb | 2009-11-29 18:13:07 +0100 (Sun, 29 Nov 2009) | 1 line
  
  Card Search in the ledger for all the cards
................
  r2726 | danydb | 2009-11-29 18:26:30 +0100 (Sun, 29 Nov 2009) | 1 line
  
  Add check to avoid to enter twice the same name for cat. of card 
................
  r2727 | danydb | 2009-11-29 18:30:13 +0100 (Sun, 29 Nov 2009) | 1 line
  
  Finish customer 
................
  r2728 | danydb | 2009-11-29 18:35:46 +0100 (Sun, 29 Nov 2009) | 1 line
  
  Operatio customer
................
  r2729 | danydb | 2009-11-29 18:55:34 +0100 (Sun, 29 Nov 2009) | 5 lines
  
  SUPPLIER
  ========
  Add Supplier
................
  r2730 | danydb | 2009-11-29 19:31:42 +0100 (Sun, 29 Nov 2009) | 1 line
  
  Add security for Administration
................
  r2731 | danydb | 2009-11-29 19:32:13 +0100 (Sun, 29 Nov 2009) | 1 line
  
  Add security for Administration
................
  r2732 | danydb | 2009-11-29 19:39:50 +0100 (Sun, 29 Nov 2009) | 2 lines
  
  Change client by supplier
................
  r2733 | danydb | 2009-11-29 20:17:36 +0100 (Sun, 29 Nov 2009) | 5 lines
  
  Administration
  ==============
  Add administration follow-up, detail, history 
................
  r2734 | danydb | 2009-11-29 20:24:46 +0100 (Sun, 29 Nov 2009) | 1 line
  
  Strict Contact::Summary not correct
................
  r2735 | danydb | 2009-11-29 20:31:05 +0100 (Sun, 29 Nov 2009) | 1 line
  
  Fix bug in follow up and ADM
................
  r2736 | danydb | 2009-11-29 20:36:34 +0100 (Sun, 29 Nov 2009) | 1 line
  
  Show the search in Follow up in a criteria exist
................
  r2737 | danydb | 2009-11-30 15:52:21 +0100 (Mon, 30 Nov 2009) | 1 line
  
  Improve ShowPopup: keep the Dialog Box in the current view
................
  r2738 | danydb | 2009-12-01 21:56:24 +0100 (Tue, 01 Dec 2009) | 7 lines
  
  Dashboard
  ---------
  Add last action
  Add Calendar
  Add last operation
................
  r2739 | danydb | 2009-12-01 22:07:12 +0100 (Tue, 01 Dec 2009) | 1 line
  
  Fix bug in middle of payment
................
  r2740 | danydb | 2009-12-01 22:09:28 +0100 (Tue, 01 Dec 2009) | 2 lines
  
  Use gettext
................
  r2741 | danydb | 2009-12-01 22:13:11 +0100 (Tue, 01 Dec 2009) | 2 lines
  
  Add gettext
................
  r2742 | danydb | 2009-12-01 22:15:28 +0100 (Tue, 01 Dec 2009) | 2 lines
  
  Fix bug : add row : 9 col instead of 6
................
  r2743 | danydb | 2009-12-01 22:42:10 +0100 (Tue, 01 Dec 2009) | 1 line
  
  Adapt for MS IE7µ
................
  r2744 | danydb | 2009-12-04 16:15:36 +0100 (Fri, 04 Dec 2009) | 1 line
  
  add iposte, fix size in css
................
  r2745 | danydb | 2009-12-05 01:52:50 +0100 (Sat, 05 Dec 2009) | 8 lines
  
  Parameters
  ==========
  * Move VAT into Divers
  * Update doc iposte
  * Add iposte to Parm Code
  * Add security for extension
................
  r2746 | danydb | 2009-12-06 21:36:16 +0100 (Sun, 06 Dec 2009) | 1 line
  
  Remove autocomplete from the Acc_Ledger::search_form due to a bug in the autocompleter
................
  r2747 | danydb | 2009-12-06 22:12:24 +0100 (Sun, 06 Dec 2009) | 2 lines
  
  add security
................
  r2748 | danydb | 2009-12-06 22:15:23 +0100 (Sun, 06 Dec 2009) | 2 lines
  
  Add documentation
................
  r2749 | danydb | 2009-12-06 22:27:27 +0100 (Sun, 06 Dec 2009) | 4 lines
  
  EXtension
  =========
  Add structure for extension
................
  r2750 | danydb | 2009-12-06 22:35:26 +0100 (Sun, 06 Dec 2009) | 1 line
  
  Fix cosmetic
................
  r2751 | danydb | 2009-12-09 16:36:39 +0100 (Wed, 09 Dec 2009) | 2 lines
  
  remove richtext.js which is obsolete
................
  r2752 | danydb | 2009-12-09 16:52:56 +0100 (Wed, 09 Dec 2009) | 4 lines
  
  Bug in restore
  ===============
  Can not upload a file, the _POST array is empty, because the post_max_size was too small
................
  r2753 | danydb | 2009-12-10 21:05:55 +0100 (Thu, 10 Dec 2009) | 8 lines
  
  Dashboard
  =========
  Improve Layout : size of comment = 20 char
  Follow-up
  =========
  Set default values
................
  r2754 | danydb | 2009-12-10 21:25:05 +0100 (Thu, 10 Dec 2009) | 2 lines
  
  Add the month year in calendar
................
  r2755 | danydb | 2009-12-10 21:25:40 +0100 (Thu, 10 Dec 2009) | 2 lines
  
  Calendar : add documentation and fill from todo list
................
  r2756 | danydb | 2009-12-11 00:12:15 +0100 (Fri, 11 Dec 2009) | 5 lines
  
  Extension
  =========
  Add the class
  Adapt code and template
................
  r2757 | danydb | 2009-12-12 00:38:37 +0100 (Sat, 12 Dec 2009) | 4 lines
  
  Extension
  =========
  Menu for manage extension
................
  r2758 | danydb | 2009-12-12 00:39:27 +0100 (Sat, 12 Dec 2009) | 1 line
  
  add todo : remove plugin
................
  r2759 | danydb | 2009-12-15 21:57:19 +0100 (Tue, 15 Dec 2009) | 2 lines
  
  add documentation
................
  r2760 | danydb | 2009-12-16 19:54:22 +0100 (Wed, 16 Dec 2009) | 1 line
  
  Extension : add security and item in the menu
................
  r2761 | danydb | 2009-12-16 19:58:15 +0100 (Wed, 16 Dec 2009) | 2 lines
  
  typo
................
  r2762 | danydb | 2009-12-16 20:05:26 +0100 (Wed, 16 Dec 2009) | 3 lines
  
  Gestion
  Add printing
................
  r2763 | danydb | 2009-12-16 20:14:13 +0100 (Wed, 16 Dec 2009) | 2 lines
  
  Add prevision to security
................
  r2764 | danydb | 2009-12-16 20:14:28 +0100 (Wed, 16 Dec 2009) | 2 lines
  
  Add prevision to security
................
  r2765 | danydb | 2009-12-16 20:14:44 +0100 (Wed, 16 Dec 2009) | 2 lines
  
  Add prevision to security
................
  r2766 | danydb | 2009-12-16 20:18:22 +0100 (Wed, 16 Dec 2009) | 2 lines
  
  security prevision : mod and consultation
................
  r2767 | danydb | 2009-12-16 20:45:24 +0100 (Wed, 16 Dec 2009) | 1 line
  
  Add security for prevision
................
  r2768 | danydb | 2009-12-18 20:30:59 +0100 (Fri, 18 Dec 2009) | 1 line
  
  Compatible with IE
................
  r2769 | danydb | 2009-12-18 20:36:03 +0100 (Fri, 18 Dec 2009) | 1 line
  
  Remove debug info
................
  r2770 | danydb | 2009-12-18 21:00:02 +0100 (Fri, 18 Dec 2009) | 2 lines
  
  remove debug information
................
  r2771 | danydb | 2009-12-18 21:03:55 +0100 (Fri, 18 Dec 2009) | 2 lines
  
  Add todo 
................
  r2772 | danydb | 2009-12-18 21:28:06 +0100 (Fri, 18 Dec 2009) | 1 line
  
  resize todo list and maximize windows when logon
................
  r2773 | danydb | 2009-12-23 22:48:59 +0100 (Wed, 23 Dec 2009) | 1 line
  
  Action : Improve location button generate document
................
  r2774 | danydb | 2009-12-27 14:26:16 +0100 (Sun, 27 Dec 2009) | 1 line
  
  clean up
................
  r2775 | danydb | 2009-12-27 14:26:32 +0100 (Sun, 27 Dec 2009) | 2 lines
  
  cleanup
................
  r2776 | danydb | 2009-12-27 19:05:53 +0100 (Sun, 27 Dec 2009) | 1 line
  
  Add Documentation 
................
  r2777 | danydb | 2009-12-27 19:51:29 +0100 (Sun, 27 Dec 2009) | 1 line
  
  Start Forecast
................
  r2778 | danydb | 2009-12-28 02:27:56 +0100 (Mon, 28 Dec 2009) | 1 line
  
  Add the class for managing the tables forecast, forecast_cat and forecast_item
................
  r2779 | danydb | 2009-12-30 05:55:38 +0100 (Wed, 30 Dec 2009) | 1 line
  
  Bug : missing the search card popup
................
  r2780 | danydb | 2010-01-02 16:48:25 +0100 (Sat, 02 Jan 2010) | 1 line
  
  Code cleaning : remove blank lines
................
  r2781 | danydb | 2010-01-02 16:50:20 +0100 (Sat, 02 Jan 2010) | 1 line
  
  Change filename prevision.inc.php by forecast.inc.php
................
  r2782 | danydb | 2010-01-02 16:50:53 +0100 (Sat, 02 Jan 2010) | 1 line
  
  remove trailing space
................
  r2783 | danydb | 2010-01-02 16:51:28 +0100 (Sat, 02 Jan 2010) | 1 line
  
  remove trailing space
................
  r2784 | danydb | 2010-01-02 16:51:54 +0100 (Sat, 02 Jan 2010) | 1 line
  
  remove trailing space
................
  r2785 | danydb | 2010-01-02 16:57:19 +0100 (Sat, 02 Jan 2010) | 4 lines
  
  Business Forecast 
  =================
  
  The BF module is now finished 
................
  r2786 | danydb | 2010-01-02 16:57:46 +0100 (Sat, 02 Jan 2010) | 4 lines
  
  Business Forecast 
  =================
  
  The BF module is now finished 
................
  r2787 | danydb | 2010-01-02 21:46:48 +0100 (Sat, 02 Jan 2010) | 2 lines
  
  Analytic accountancy : fixed bug
  Cosmetic bugs
................
  r2788 | danydb | 2010-01-02 22:14:56 +0100 (Sat, 02 Jan 2010) | 2 lines
  
  Analytic accountancy : fixed bug
  Cosmetic bugs
................
  r2789 | danydb | 2010-01-03 00:53:28 +0100 (Sun, 03 Jan 2010) | 1 line
................
  r2790 | danydb | 2010-01-03 01:24:42 +0100 (Sun, 03 Jan 2010) | 1 line
  
  Remove files
................
  r2791 | danydb | 2010-01-03 01:50:21 +0100 (Sun, 03 Jan 2010) | 5 lines
  
  Class periode :
  =============
  change id by p_id
................
  r2792 | danydb | 2010-01-03 02:03:41 +0100 (Sun, 03 Jan 2010) | 1 line
  
  Ad for firefox
................
  r2793 | danydb | 2010-01-03 17:52:58 +0100 (Sun, 03 Jan 2010) | 1 line
  
  Bug : last date was not shown
................
  r2794 | danydb | 2010-01-03 17:58:05 +0100 (Sun, 03 Jan 2010) | 1 line
  
  Translate
................
  r2795 | danydb | 2010-01-03 18:07:24 +0100 (Sun, 03 Jan 2010) | 1 line
  
  Bug : ISelect
................
  r2796 | danydb | 2010-01-03 18:17:41 +0100 (Sun, 03 Jan 2010) | 1 line
  
  Bug : Costing accountancy
................
  r2797 | danydb | 2010-01-03 18:23:13 +0100 (Sun, 03 Jan 2010) | 1 line
  
  Fix bug and correct translation
................
  r2798 | danydb | 2010-01-04 14:58:51 +0100 (Mon, 04 Jan 2010) | 1 line
  
  Cosmetic bug 
................
  r2799 | danydb | 2010-01-04 15:37:02 +0100 (Mon, 04 Jan 2010) | 1 line
  
  Cosmetic fix problem button anchor
................
  r2800 | danydb | 2010-01-04 19:30:31 +0100 (Mon, 04 Jan 2010) | 2 lines
  
  Update Doc
................
  r2801 | danydb | 2010-01-04 19:57:41 +0100 (Mon, 04 Jan 2010) | 2 lines
  
  Fix bug : report : if a  FROM clause do not exist (for example from a previous year) then the report failed with a SQL error
................
  r2802 | danydb | 2010-01-04 20:11:19 +0100 (Mon, 04 Jan 2010) | 1 line
  
  Code cleaning
................
  r2803 | danydb | 2010-01-04 20:11:47 +0100 (Mon, 04 Jan 2010) | 1 line
  
  Change setting for generating doc
................
  r2804 | danydb | 2010-01-04 20:12:25 +0100 (Mon, 04 Jan 2010) | 1 line
  
  Code improve + translation
................
  r2805 | danydb | 2010-01-06 14:50:09 +0100 (Wed, 06 Jan 2010) | 1 line
  
  Dashboad : add card name in last action
................
  r2806 | danydb | 2010-01-06 15:00:06 +0100 (Wed, 06 Jan 2010) | 1 line
  
  Parameter : move Poste to Divers
................
  r2807 | danydb | 2010-01-06 15:22:48 +0100 (Wed, 06 Jan 2010) | 4 lines
  
  Parameters
  Move Extension from Divers to Main
  Move Cat of card from Main to Divers
................
  r2808 | danydb | 2010-01-06 18:08:43 +0100 (Wed, 06 Jan 2010) | 1 line
  
  Extension : plugin in the folder ext
................
  r2809 | danydb | 2010-01-06 19:16:17 +0100 (Wed, 06 Jan 2010) | 1 line
  
  Plugin : locate into the folder ext
................
  r2810 | danydb | 2010-01-06 19:59:55 +0100 (Wed, 06 Jan 2010) | 1 line
  
  CSS : modify button
................
  r2811 | danydb | 2010-01-07 18:55:07 +0100 (Thu, 07 Jan 2010) | 2 lines
  
  Cosmetic : quick code in upper case
................
  r2812 | danydb | 2010-01-07 19:00:07 +0100 (Thu, 07 Jan 2010) | 2 lines
  
  If there is no document template, then hide the generate button
................
  r2813 | danydb | 2010-01-07 19:50:44 +0100 (Thu, 07 Jan 2010) | 2 lines
  
  Cosmetic change TODO
................
  r2814 | danydb | 2010-01-07 20:17:33 +0100 (Thu, 07 Jan 2010) | 1 line
  
  set color to todo in the calendar
................
  r2815 | danydb | 2010-01-07 20:18:22 +0100 (Thu, 07 Jan 2010) | 1 line
  
  Problem with round
................
  r2816 | danydb | 2010-01-07 20:18:37 +0100 (Thu, 07 Jan 2010) | 1 line
  
  set color to todo in the calendar
................
  r2817 | danydb | 2010-01-07 20:26:09 +0100 (Thu, 07 Jan 2010) | 2 lines
  
  Opening entries : account is never found
................
  r2818 | danydb | 2010-01-07 20:32:42 +0100 (Thu, 07 Jan 2010) | 2 lines
  
  Fix Bug : If the name is empty, we don't go backward to correct the name
................
  r2819 | danydb | 2010-01-07 20:36:51 +0100 (Thu, 07 Jan 2010) | 2 lines
  
  Fix Bug: Extension show several times the same user
................
  r2820 | danydb | 2010-01-07 20:59:59 +0100 (Thu, 07 Jan 2010) | 1 line
  
  Modify func alert 
................
  r2821 | danydb | 2010-01-07 21:00:59 +0100 (Thu, 07 Jan 2010) | 1 line
  
  Fix Bug : the extension can be saved with an empty name or code
................
  r2822 | danydb | 2010-01-07 21:01:42 +0100 (Thu, 07 Jan 2010) | 2 lines
  
  indent code
................
  r2823 | danydb | 2010-01-07 21:18:16 +0100 (Thu, 07 Jan 2010) | 2 lines
  
  Protect against forbidden char (javascript attack)
................
  r2824 | danydb | 2010-01-07 21:21:10 +0100 (Thu, 07 Jan 2010) | 1 line
  
  Protect again javascript attack + alert if save extension failed
................
  r2825 | danydb | 2010-01-07 21:25:13 +0100 (Thu, 07 Jan 2010) | 2 lines
  
  Protect against javascript attack
................
  r2826 | danydb | 2010-01-07 21:32:44 +0100 (Thu, 07 Jan 2010) | 1 line
  
  Protect against forb. char
................
  r2827 | danydb | 2010-01-07 22:53:13 +0100 (Thu, 07 Jan 2010) | 1 line
  
  AJAX : add security to ajax file
................
  r2828 | danydb | 2010-01-07 22:57:24 +0100 (Thu, 07 Jan 2010) | 2 lines
  
  Cosmetic
................
  r2829 | danydb | 2010-01-07 23:11:42 +0100 (Thu, 07 Jan 2010) | 2 lines
  
  Fix Bug : cannot update name of cost accounting
................
  r2830 | danydb | 2010-01-07 23:12:52 +0100 (Thu, 07 Jan 2010) | 1 line
  
  Add forgotten file for extension
................
  r2831 | danydb | 2010-01-08 14:03:03 +0100 (Fri, 08 Jan 2010) | 1 line
  
  Fix Bug : too many error in the table TVA for France
................
  r2832 | danydb | 2010-01-08 14:04:12 +0100 (Fri, 08 Jan 2010) | 1 line
  
  Fix Bug : too many error in the table TVA for France
................
  r2833 | danydb | 2010-01-08 14:50:15 +0100 (Fri, 08 Jan 2010) | 1 line
  
  Update Belgium accountancy
................
  r2834 | danydb | 2010-01-08 16:53:40 +0100 (Fri, 08 Jan 2010) | 1 line
  
  Improve replace periode by date in print Poste 
................
  r2835 | danydb | 2010-01-08 19:20:38 +0100 (Fri, 08 Jan 2010) | 2 lines
  
  correct tva_FR
................
  r2836 | danydb | 2010-01-08 19:21:11 +0100 (Fri, 08 Jan 2010) | 1 line
  
  Cosmetic CSS
................
  r2837 | danydb | 2010-01-08 19:53:12 +0100 (Fri, 08 Jan 2010) | 1 line
  
  fix bug tva_france
................
  r2838 | danydb | 2010-01-08 20:11:53 +0100 (Fri, 08 Jan 2010) | 1 line
  
  Correct order for printing accounting
................
  r2839 | danydb | 2010-01-08 20:18:18 +0100 (Fri, 08 Jan 2010) | 2 lines
  
  Bug : Printing ledger simple, show always the same line
................
  r2840 | danydb | 2010-01-10 15:16:48 +0100 (Sun, 10 Jan 2010) | 1 line
  
  Fix problem accentuated char + view vw_fiche_def
................
  r2841 | danydb | 2010-01-10 15:19:19 +0100 (Sun, 10 Jan 2010) | 2 lines
  
  Remove owner SQL command
................
  r2842 | danydb | 2010-01-10 15:37:37 +0100 (Sun, 10 Jan 2010) | 1 line
  
  Improve Detail operation : simple
................
  r2843 | danydb | 2010-01-11 13:59:49 +0100 (Mon, 11 Jan 2010) | 2 lines
  
  Fix bug  : when type an sale and a payment, user gets a warning about unknown variable mt
................
  r2844 | danydb | 2010-01-11 14:17:22 +0100 (Mon, 11 Jan 2010) | 2 lines
  
  Fix Bug : double click in "middle of payment" does not work
................
  r2845 | danydb | 2010-01-11 14:26:19 +0100 (Mon, 11 Jan 2010) | 1 line
  
  Improve popup detail operation : align amount to right
................
  r2846 | danydb | 2010-01-11 18:59:29 +0100 (Mon, 11 Jan 2010) | 1 line
  
  Bug : generate document does not work
................
  r2847 | danydb | 2010-01-11 19:25:57 +0100 (Mon, 11 Jan 2010) | 1 line
  
  Bug : after creating an invoice or a fee note, the link does not show the generated document
................
  r2848 | danydb | 2010-01-11 19:30:08 +0100 (Mon, 11 Jan 2010) | 1 line
  
  Bug Cosmetic : improve link for Receipt
................
  r2849 | danydb | 2010-01-11 19:32:47 +0100 (Mon, 11 Jan 2010) | 1 line
  
  Bug : no security on remove or consult a document
................
  r2850 | danydb | 2010-01-11 21:29:32 +0100 (Mon, 11 Jan 2010) | 2 lines
  
  Bug : does not show accounting when po_description is null (costing accounting)
................
  r2851 | danydb | 2010-01-12 14:02:32 +0100 (Tue, 12 Jan 2010) | 1 line
  
  Update StyleSheet
................
  r2852 | danydb | 2010-01-12 14:16:16 +0100 (Tue, 12 Jan 2010) | 1 line
  
  Update EN translation
................
  r2853 | danydb | 2010-01-12 15:14:08 +0100 (Tue, 12 Jan 2010) | 1 line
  
  Remove deprecated functions
................
  r2854 | danydb | 2010-01-12 15:43:52 +0100 (Tue, 12 Jan 2010) | 1 line
  
  Complete all the todo
................
  r2855 | danydb | 2010-01-12 21:11:45 +0100 (Tue, 12 Jan 2010) | 1 line
  
  Cosmetic : add the calc in ACH + move button, bug in recherche.php, the qcode does not appear after request
................
  r2856 | danydb | 2010-01-13 12:16:01 +0100 (Wed, 13 Jan 2010) | 1 line
  
  Dashboard: add the possibility to change the periode
................
  r2857 | danydb | 2010-01-13 14:15:45 +0100 (Wed, 13 Jan 2010) | 3 lines
  
  add translation
  Fix Bug : The query in follow up does not work when a part of the title was specified
................
2010-01-13 14:36:24 +00:00

2318 lines
71 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
require_once("class_iselect.php");
require_once("class_icard.php");
require_once("class_ispan.php");
require_once("class_ihidden.php");
require_once("class_idate.php");
require_once("class_itext.php");
require_once("class_icheckbox.php");
require_once('class_iperiod.php');
require_once('class_fiche.php');
require_once('class_user.php');
require_once ('class_dossier.php');
require_once ('class_own.php');
require_once ('class_anc_operation.php');
require_once ('class_acc_operation.php');
require_once ('class_acc_account_ledger.php');
require_once ('class_pre_op_advanced.php');
require_once ('jrn.php');
require_once ('class_acc_reconciliation.php');
require_once ('class_periode.php');
require_once ('class_gestion_purchase.php');
require_once ('class_acc_account.php');
require_once('ac_common.php');
require_once('class_inum.php');
/*!\file
* \brief Class for jrn, class acc_ledger for manipulating the ledger
*/
/*!\brief Class for jrn, class acc_ledger for manipulating the ledger
*
*/
class Acc_Ledger {
var $id; /*!< jrn_def.jrn_def_id */
var $name; /*!< jrn_def.jrn_def_name */
var $db; /*!< database connextion */
var $row; /*!< row of the ledger */
var $type; /*!< type of the ledger ACH ODS FIN
VEN or GL */
var $nb; /*!< default number of rows by
default 10 */
function Acc_Ledger ($p_cn,$p_id){
$this->id=$p_id;
$this->db=$p_cn;
$this->row=null;
$this->nb=10;
}
function get_last_pj() {
if ( $this->db->exist_sequence("s_jrn_pj".$this->id) ) {
$ret= $this->db->get_array("select last_value,is_called from s_jrn_pj".$this->id);
$last=$ret[0]['last_value'];
/*!
*\note With PSQL sequence , the last_value column is 1 when before AND after the first call, to make the difference between them
* I have to check whether the sequence has been already called or not */
if ($ret[0]['is_called']=='f' ) $last--;
return $last;
}
else
$this->db->create_sequence("s_jrn_pj".$this->id);
return 0;
}
/*!
* \brief Return the type of a ledger (ACH,VEN,ODS or FIN) or GL
*
*/
function get_type() {
if ( $this->id==0 ) {
$this->name=" Grand Livre ";
$this->type="GL";
return "GL";
}
$Res=$this->db->exec_sql("select jrn_def_type from ".
" jrn_def where jrn_def_id=".
$this->id);
$Max=Database::num_row($Res);
if ($Max==0) return null;
$ret=Database::fetch_array($Res,0);
$this->type=$ret['jrn_def_type'];
return $ret['jrn_def_type'];
}
/*!
* \brief Return the name of a ledger
*
*/
function get_name() {
if ( $this->id==0 ) {
$this->name=" Grand Livre ";
return $this->name;
}
$Res=$this->db->exec_sql("select jrn_def_name from ".
" jrn_def where jrn_def_id=".
$this->id);
$Max=Database::num_row($Res);
if ($Max==0) return null;
$ret=Database::fetch_array($Res,0);
$this->name=$ret['jrn_def_name'];
return $ret['jrn_def_name'];
}
/*! \function get_row
* \brief Get The data
*
*
* \param p_from from periode
* \param p_to to periode
* \param $p_cent (on or off)
* \param p_limit starting line
* \param p_offset number of lines
* \return Array with the asked data
*
*/
function get_row($p_from,$p_to,$cent='off',$p_limit=-1,$p_offset=-1) {
echo_debug('class_acc_ledger.php',__LINE__,"get_row ( $p_from,$p_to,$cent,$p_limit,$p_offset)");
$periode=sql_filter_per($this->db,$p_from,$p_to,'p_id','jr_tech_per');
$cond_limite=($p_limit!=-1)?" limit ".$p_limit." offset ".$p_offset:"";
// retrieve the type
$this->get_type();
// Grand livre == 0
if ( $this->id != 0 ) {
if ( $cent=='off' ) {
echo_debug('class_acc_ledger.php',__LINE__,"journaux non centralise");
// Journaux non centralises
$Res=$this->db->exec_sql("select j_id,j_id as int_j_id,to_char(j_date,'DD.MM.YYYY') as j_date,
jr_internal,
case j_debit when 't' then j_montant::text else ' ' end as deb_montant,
case j_debit when 'f' then j_montant::text else ' ' end as cred_montant,
j_debit as debit,j_poste as poste,jr_montant , ".
"coalesce(j_text,pcm_lib) as description,j_grpt as grp,
jr_comment||' ('||jr_internal||')'||case when jr_pj_number is not null and jr_pj_number !='' then jr_pj_number else '' end as jr_comment,
j_qcode,
jr_rapt as oc, j_tech_per as periode
from jrnx left join jrn on ".
"jr_grpt_id=j_grpt ".
" left join tmp_pcmn on pcm_val=j_poste ".
" where j_jrn_def=".$this->id.
" and ".$periode." order by j_date::date asc,jr_internal,j_debit desc ".
$cond_limite);
}else {
// Journaux centralises
// echo'class_acc_ledger.php',__LINE__,"journaux centralise";
$Sql="select jr_opid as j_id,
c_order as int_j_id,
to_char (c_date,'DD.MM.YYYY') as j_date ,
c_internal as jr_internal,
case c_debit when 't' then c_montant::text else ' ' end as deb_montant,
case c_debit when 'f' then c_montant::text else ' ' end as cred_montant,
c_debit as j_debit,
c_poste as poste,
coalesce(j_text,pcm_lib) as description,
j_qcode,
jr_comment||' ('||c_internal||')'||case when jr_pj_number is not null and jr_pj_number !='' then 'pj:'||coalesce(jr_pj_number,'-') else '' end as jr_comment,
jr_montant,
c_grp as grp,
c_comment as comment,
c_rapt as oc,
c_periode as periode
from
centralized left join jrnx on j_id=c_j_id
left join tmp_pcmn on pcm_val=c_poste
left join jrn on jr_grpt_id=c_grp
where ".
" c_jrn_def=".$this->id." and ".
$periode." order by c_order ";
$Res=$this->db->exec_sql($Sql.$cond_limite);
}
} else {
// Grand Livre
if ( $cent == 'off') {
echo_debug('class_acc_ledger.php',__LINE__,"Grand livre non centralise");
// Non centralise
$Res=$this->db->exec_sql("select j_id,j_id as int_j_id,to_char(j_date,'DD.MM.YYYY') as j_date,
jr_internal,
case j_debit when 't' then j_montant::text else ' ' end as deb_montant,
case j_debit when 'f' then j_montant::text else ' ' end as cred_montant,
j_debit as debit,j_poste as poste,".
"coalesce(j_text,pcm_lib) as description,j_grpt as grp,
jr_comment||' ('||jr_internal||')'||case when jr_pj_number is not null and jr_pj_number !='' then 'pj:'||coalesce(jr_pj_number,'-') else '' end as jr_comment,
jr_montant,
j_qcode,
jr_rapt as oc, j_tech_per as periode from jrnx left join jrn on ".
"jr_grpt_id=j_grpt left join tmp_pcmn on pcm_val=j_poste where ".
" ".$periode." order by j_date::date,j_grpt,j_debit desc ".
$cond_limite);
} else {
echo_debug('class_acc_ledger.php',__LINE__,"Grand livre centralise");
// Centralise
$Sql="select jr_c_opid as j_id,
c_order as int_j_id,
c_j_id,
to_char (c_date,'DD.MM.YYYY') as j_date ,
c_internal as jr_internal,
case c_debit when 't' then c_montant::text else ' ' end as deb_montant,
case c_debit when 'f' then c_montant::text else ' ' end as cred_montant,
c_debit as j_debit,
c_poste as poste,
coalesce(j_text,pcm_lib) as description,
jr_comment||' ('||c_internal||')'||case when jr_pj_number is not null and jr_pj_number !='' then 'pj:'||coalesce(jr_pj_number,'-') else '' end as jr_comment,
jr_montant,
c_grp as grp,
c_comment||' ('||c_internal||' '||jr_opid||')'||'pj:'||coalesce(jr_pj_number,'-') as comment,
c_rapt as oc,
j_qcode,
c_periode as periode
from centralized left join jrn on ".
"jr_grpt_id=c_grp left join tmp_pcmn ".
" on (pcm_val=c_poste) ".
" join jrnx on (j_id=c_j_id)".
" where ".
$periode." order by c_order ";
$Res=$this->db->exec_sql($Sql.$cond_limite);
} // Grand Livre
}
$array=array();
$Max=Database::num_row($Res);
if ($Max==0) return null;
$case="";
$tot_deb=0;
$tot_cred=0;
$row=Database::fetch_all($Res);
for ($i=0;$i<$Max;$i++) {
$fiche=new fiche($this->db);
$line=$row[$i];
$mont_deb=($line['deb_montant']!=0)?sprintf("% 8.2f",$line['deb_montant']):"";
$mont_cred=($line['cred_montant']!=0)?sprintf("% 8.2f",$line['cred_montant']):"";
$jr_montant=($line['jr_montant']!=0)?sprintf("% 8.2f",$line['jr_montant']):"";
$tot_deb+=$line['deb_montant'];
$tot_cred+=$line['cred_montant'];
$tot_op=$line['jr_montant'];
echo_debug('class_acc_ledger.php',__LINE__," get_row : mont_Deb ".$mont_deb);
echo_debug('class_acc_ledger.php',__LINE__," get_row : mont_cred ".$mont_cred);
/* Check first if there is a quickcode */
if ( strlen(trim($line['j_qcode'])) != 0 )
{
if ( $fiche->get_by_qcode($line['j_qcode'],false) == 0 )
{
$line['description']=$fiche->strAttribut(ATTR_DEF_NAME);
}
}
if ( $case != $line['grp'] ) {
$case=$line['grp'];
// for financial, we show if the amount is or not in negative
if ( $this->type=='FIN') {
echo_debug(__FILE__,__LINE__,"Journal FIN");
$eMax=(($i+20) < $Max)?$i+20:$Max;
// check in $row if the BQE is in deb or cred
for ($e=$i;$e<$Max;$e++) {
echo_debug(__FILE__,__LINE__,$row[$e]);
if ( $row[$e]['grp'] != $case ) continue;
if ( strlen(trim($row[$e]['j_qcode'])) == 0 ) continue;
$f=new fiche($this->db);
$f->get_by_qcode($row[$e]['j_qcode'],false);
echo_debug(__FILE__,__LINE__,$f);
if ( $f->get_fiche_def_ref_id() == FICHE_TYPE_FIN ) {
$tot_op=($row[$e]['debit'] == 't')?$jr_montant:" - ".$jr_montant;
break;
}
}
}
$array[]=array (
'int_j_id' => $line['int_j_id'],
'j_id'=>$line['j_id'],
'j_date' => $line['j_date'],
'internal'=>$line['jr_internal'],
'deb_montant'=>'',
'cred_montant'=>' ',
'description'=>'<b><i>'.h($line['jr_comment']).' ['.$tot_op.'] </i></b>',
'poste' => $line['oc'],
'qcode' => $line['j_qcode'],
'periode' =>$line['periode'] );
$array[]=array (
'int_j_id' => $line['int_j_id'],
'j_id'=>'',
'j_date' => '',
'internal'=>'',
'deb_montant'=>$mont_deb,
'cred_montant'=>$mont_cred,
'description'=>$line['description'],
'poste' => $line['poste'],
'qcode' => $line['j_qcode'],
'periode' => $line['periode']
);
}else {
$array[]=array (
'int_j_id' => $line['int_j_id'],
'j_id'=>'',
'j_date' => '',
'internal'=>'',
'deb_montant'=>$mont_deb,
'cred_montant'=>$mont_cred,
'description'=>$line['description'],
'poste' => $line['poste'],
'qcode' => $line['j_qcode'],
'periode' => $line['periode']);
}
}
echo_debug('class_acc_ledger.php',__LINE__,"Total debit $tot_deb,credit $tot_cred");
$this->row=$array;
$a=array($array,$tot_deb,$tot_cred);
return $a;
}
/*! \brief Get simplified row from ledger
*
* \param from periode
* \param to periode
* \param centralized (on or off)
* \param p_limit starting line
* \param p_offset number of lines
* \param trunc if data must be truncated (pdf export)
*
* \return an Array with the asked data
*/
function get_rowSimple($p_from,$p_to,$cent='off',$trunc=0,$p_limit=-1,$p_offset=-1)
{
// Grand-livre : id= 0
//---
$jrn=($this->id == 0 )?"":"and jrn_def_id = ".$this->id;
// Non Centralise si cent=off
//--
if ($cent=='off')
{// Non centralise
$periode=sql_filter_per($this->db,$p_from,$p_to,'p_id','jr_tech_per');
$cond_limite=($p_limit!=-1)?" limit ".$p_limit." offset ".$p_offset:"";
//---
$sql="
SELECT jrn.jr_id as jr_id ,
jrn.jr_id as num ,
jrn.jr_def_id as jr_def_id,
jrn.jr_montant as montant,
substr(jrn.jr_comment,1,30)|| case when jr_pj_number is not null and jr_pj_number !='' then 'pj:'||coalesce(jr_pj_number,'-') else '' end as comment,
to_char(jrn.jr_date,'DD-MM-YYYY') as date,
jr_internal,
jrn.jr_grpt_id as grpt_id,
jrn.jr_pj_name as pj,
jrn_def_type,
jrn.jr_tech_per
FROM jrn join jrn_def on (jrn_def_id=jr_def_id)
WHERE $periode $jrn order by jr_date $cond_limite";
}
else
{
$periode=sql_filter_per($this->db,$p_from,$p_to,'p_id','jr_tech_per');
$cond_limite=($p_limit!=-1)?" limit ".$p_limit." offset ".$p_offset:"";
//Centralise
//---
$id=($this->id == 0 ) ?"jr_c_opid as num":"jr_opid as num";
$sql="
SELECT jrn.jr_id as jr_id ,
$id ,
jrn.jr_def_id as jr_def_id,
jrn.jr_montant as montant,
substr(jrn.jr_comment,1,30)|| case when jr_pj_number is not null and jr_pj_number !='' then 'pj:'||coalesce(jr_pj_number,'-') else '' end as comment,
to_char(jrn.jr_date,'DD-MM-YYYY') as date,
jr_internal,
jrn.jr_grpt_id as grpt_id,
jrn.jr_pj_name as pj,
jrn_def_type,
jrn.jr_tech_per
FROM jrn join jrn_def on (jrn_def_id=jr_def_id)
where
$periode $jrn and
jr_opid is not null
order by num $cond_limite";
}// end else $cent=='off'
//load all data into an array
//---
$Res=$this->db->exec_sql($sql);
$Max=Database::num_row($Res);
if ( $Max == 0 )
{
return null;
}
$type=$this->get_type();
// for type ACH and Ven we take more info
if ( $type == 'ACH' || $type == 'VEN')
{
$a_ParmCode=$this->db->get_array('select p_code,p_value from parm_code');
$a_TVA=$this->db->get_array('select tva_id,tva_label,tva_poste
from tva_rate where tva_rate != 0 order by tva_id');
for ( $i=0;$i<$Max;$i++)
{
$array[$i]=Database::fetch_array($Res,$i);
$p=$this->get_detail($array[$i],$type,$trunc,$a_TVA,$a_ParmCode);
if ( $array[$i]['dep_priv'] != 0.0) {
$array[$i]['comment'].="(priv. ".$array[$i]['dep_priv'].")";
}
}
}
else
{
$array=Database::fetch_all($Res);
}
return $array;
}// end function get_rowSimple
/*!\brief guess what the next pj should be
*/
function guess_pj() {
$prop=$this->get_propertie();
$pj_pref=$prop["jrn_def_pj_pref"];
$pj_seq=$this->get_last_pj()+1;
return $pj_pref.$pj_seq;
}
/*!\brief Show all the operation
*\param $sql is the sql stmt, normally created by build_search_sql
*\param $offset the offset
*\param $p_paid if we want to see info about payment
\code
// Example
// Build the sql
list($sql,$where)=$Ledger->build_search_sql($_GET);
// Count nb of line
$max_line=$cn->count_sql($sql);
$step=$_SESSION['g_pagesize'];
$page=(isset($_GET['offset']))?$_GET['page']:1;
$offset=(isset($_GET['offset']))?$_GET['offset']:0;
// create the nav. bar
$bar=jrn_navigation_bar($offset,$max_line,$step,$page);
// show a part
list($count,$html)= $Ledger->list_operation($sql,$offset,0);
echo $html;
// show nav bar
echo $bar;
\endcode
*\see build_search_sql
*\see display_search_form
*\see search_form
*\return HTML string
*/
public function list_operation($sql,$offset,$p_paid=0) {
$user=new User($this->db);
$gDossier=dossier::id();
$amount_paid=0.0;
$amount_unpaid=0.0;
include_once("central_inc.php");
$limit=($_SESSION['g_pagesize']!=-1)?" LIMIT ".$_SESSION['g_pagesize']:"";
$offset=($_SESSION['g_pagesize']!=-1)?" OFFSET ".Database::escape_string($offset):"";
$order=" order by jr_date_order asc,jr_internal asc";
// Sort
$url=CleanUrl();
$str_dossier=dossier::get();
$image_asc='<IMAGE SRC="image/down.gif" border="0" >';
$image_desc='<IMAGE SRC="image/up.gif" border="0">';
$image_sel_desc='<IMAGE SRC="image/select1.gif">';
$image_sel_asc='<IMAGE SRC="image/select2.gif">';
$sort_date="<th> <A class=\"mtitle\" HREF=\"?$url&o=da\">$image_asc</A>"._('Date')."<A class=\"mtitle\" HREF=\"?$url&o=dd\">$image_desc</A></th>";
$sort_description="<th> <A class=\"mtitle\" HREF=\"?$url&o=ca\">$image_asc</A>"._('Description')."<A class=\"mtitle\" HREF=\"?$url&o=cd\">$image_desc</A></th>";
$sort_amount="<th> <A class=\"mtitle\" HREF=\"?$url&o=ma\">$image_asc</A>"._('Montant')." <A class=\"mtitle\" HREF=\"?$url&o=md\">$image_desc</A></th>";
$sort_pj="<th> <A class=\"mtitle\" HREF=\"?$url&o=pja\">$image_asc</A>"._('PJ')."<A class=\"mtitle\" HREF=\"?$url&o=pjd\">$image_desc</A></th>";
$sort_echeance="<th> <A class=\"mtitle\" HREF=\"?$url&o=ea\">$image_asc</A>"._('Ech')." <A class=\"mtitle\" HREF=\"?$url&o=ed\">$image_desc</A> </th>";
$own=new Own($this->db);
// if an order is asked
if ( isset ($_GET['o']) )
{
switch ($_GET['o'])
{
case 'pja':
// pj asc
$sort_pj="<th>$image_sel_asc PJ <A class=\"mtitle\" HREF=\"?$url&o=pjd\">$image_desc</A></th>";
$order=" order by jr_pj_number asc ";
break;
case 'pjd':
$sort_pj="<th> <A class=\"mtitle\" HREF=\"?$url&o=pja\">$image_asc</A> PJ $image_sel_desc</th>";
// pj desc
$order=" order by jr_pj_number desc ";
break;
case 'da':
// date asc
$sort_date="<th>$image_sel_asc Date <A class=\"mtitle\" HREF=\"?$url&o=dd\">$image_desc</A></th>";
$order=" order by jr_date_order asc ";
break;
case 'dd':
$sort_date="<th> <A class=\"mtitle\" HREF=\"?$url&o=da\">$image_asc</A> Date $image_sel_desc</th>";
// date desc
$order=" order by jr_date_order desc ";
break;
case 'ma':
// montant asc
$sort_amount="<th> $image_sel_asc Montant <A class=\"mtitle\" HREF=\"?$url&o=md\">$image_desc</A></th>";
$order=" order by jr_montant asc ";
break;
case 'md':
// montant desc
$sort_amount="<th> <A class=\"mtitle\" HREF=\"?$url&o=ma\">$image_asc</A>Montant $image_sel_desc</th>";
$order=" order by jr_montant desc ";
break;
case 'ca':
// jr_comment asc
$sort_description="<th> $image_sel_asc Description <A class=\"mtitle\" HREF=\"?$url&o=cd\">$image_desc</A></th>";
$order=" order by jr_comment asc ";
break;
case 'cd':
// jr_comment desc
$sort_description="<th> <A class=\"mtitle\" HREF=\"?$url&o=ca\">$image_asc</A>Description $image_sel_desc</th>";
$order=" order by jr_comment desc ";
break;
case 'ea':
// jr_comment asc
$sort_echeance="<th> $image_sel_asc Ech. <A class=\"mtitle\" HREF=\"?$url&o=ed\">$image_desc</A></th>";
$order=" order by jr_ech asc ";
break;
case 'ed':
// jr_comment desc
$sort_echeance="<th> <A class=\"mtitle\" HREF=\"?$url&o=ea\">$image_asc</A> Ech. $image_sel_desc</th>";
$order=" order by jr_ech desc ";
break;
}
} else {
// date asc
$sort_date="<th>$image_sel_asc Date <A class=\"mtitle\" HREF=\"?$url&o=dd\">$image_desc</A></th>";
$order=" order by jr_date_order asc ";
}
// set a filter for the FIN
$a_parm_code=$this->db->get_array("select p_value from parm_code where p_code in ('BANQUE','COMPTE_COURANT','CAISSE')");
$sql_fin="(";
$or="";
foreach ($a_parm_code as $code) {
$sql_fin.="$or j_poste::text like '".$code['p_value']."%'";
$or=" or ";
}
$sql_fin.=")";
// Count
$count=$this->db->count_sql($sql);
// Add the limit
$sql.=$order.$limit.$offset;
// Execute SQL stmt
$Res=$this->db->exec_sql($sql);
//starting from here we can refactor, so that instead of returning the generated HTML,
//this function returns a tree structure.
$r="";
$r.=JS_LEDGER;
$Max=Database::num_row($Res);
if ($Max==0) return array(0,_("Aucun enregistrement trouvé"));
$r.='<table class="result">';
$l_sessid=$_REQUEST['PHPSESSID'];
$r.="<tr >";
$r.="<th>Internal</th>";
if ( $this->type=='') {
$r.=th('Journal');
}
$r.=$sort_date;
$r.=$sort_echeance;
$r.=$sort_pj;
$r.=$sort_description;
$r.=$sort_amount;
// if $p_paid is not equal to 0 then we have a paid column
if ( $p_paid != 0 )
{
$r.="<th> "._('Payé')."</th>";
}
$r.="<th>"._('Op. Concernée')."</th>";
if ($own->MY_STRICT=='N' && $user->check_action(GEOP)==1)
$r.='<th>'._('Action').'</th>';
$r.="<th>"._('Document')."</th>";
$r.="</tr>";
// Total Amount
$tot=0.0;
$gDossier=dossier::id();
for ($i=0; $i < $Max;$i++) {
$row=Database::fetch_array($Res,$i);
if ( $i % 2 == 0 ) $tr='<TR class="odd">';
else $tr='<TR class="even">';
$r.=$tr;
//internal code
// button modify
$r.="<TD>";
// If url contains
//
$href=basename($_SERVER['PHP_SELF']);
echo_debug(__FILE__,__LINE__,"href = $href");
switch ($href)
{
// user_jrn.php
case 'compta.php':
$vue="S"; //Expert View
break;
case 'commercial.php':
$vue="S"; //Simple View
break;
case 'recherche.php':
$vue=(isset($_GET['expert']))?'E':'S';
break;
default:
echo_error('user_form_ach.php',__LINE__,'Erreur invalid request uri');
exit (-1);
}
//DEBUG
// $r.=$l_sessid;
$r.=sprintf('<A class="detail" HREF="javascript:modifyOperation(\'%s\',\'%s\',\'%s\',\'%s\',\'%s\')" >%s</A>',
$row['jr_id'], $l_sessid,$gDossier, $row['jrn_def_id'],$vue, $row['jr_internal']);
$r.="</TD>";
if ( $this->type=='') $r.=td($row['jrn_def_name']);
// date
$r.="<TD>";
$r.=$row['jr_date'];
$r.="</TD>";
// echeance
$r.="<TD>";
$r.=$row['jr_ech'];
$r.="</TD>";
// pj
$r.="<TD>";
$r.=$row['jr_pj_number'];
$r.="</TD>";
// comment
$r.="<TD>";
$tmp_jr_comment=h($row['jr_comment']);
$r.=$tmp_jr_comment;
$r.="</TD>";
// Amount
// If the ledger is financial :
// the credit must be negative and written in red
$positive=0;
// Check ledger type :
if ( $row['jrn_def_type'] == 'FIN' )
{
$positive = $this->db->count_sql("select * from jrn inner join jrnx on jr_grpt_id=j_grpt ".
" where jr_id=".$row['jr_id']." and $sql_fin ".
" and j_debit='f'");
}
$r.="<TD align=\"right\">";
$tot=($positive != 0)?$tot-$row['jr_montant']:$tot+$row['jr_montant'];
//STAN $positive always == 0
$r.=( $positive != 0 )?"<font color=\"red\"> - ".sprintf("%8.2f",$row['jr_montant'])."</font>":sprintf("%8.2f",$row['jr_montant']);
$r.="</TD>";
// Show the paid column if p_paid is not null
if ( $p_paid !=0 )
{
$w=new ICheckBox();
$w->name="rd_paid".$row['jr_id'];
$w->selected=($row['jr_rapt']=='paid')?true:false;
// if p_paid == 2 then readonly
$w->readonly=( $p_paid == 2)?true:false;
$h=new IHidden();
$h->name="set_jr_id".$row['jr_id'];
$r.='<TD>'.$w->input().$h->input().'</TD>';
if ( $row['jr_rapt']=='paid')
$amount_paid+=$row['jr_montant'];
else
$amount_unpaid+=$row['jr_montant'];
}
// Rapprochement
$rec=new Acc_Reconciliation($this->db);
$rec->set_jr_id($row['jr_id']);
$a=$rec->get();
$r.="<TD>";
if ( $a != null ) {
foreach ($a as $key => $element)
{
$operation=new Acc_Operation($this->db);
$operation->jr_id=$element;
$l_amount=$this->db->get_value("select jr_montant from jrn ".
" where jr_id=$element");
$r.= "<A class=\"detail\" HREF=\"javascript:modifyOperation('".$element."','".$l_sessid."',".$gDossier.")\" > ".$operation->get_internal()." [ $l_amount &euro; ]</A>";
}//for
}// if ( $a != null ) {
$r.="</TD>";
if ( $row['jr_valid'] == 'f' ) {
$r.="<TD> Op&eacute;ration annul&eacute;e</TD>";
} else if ( $own->MY_STRICT=='N' ) {
// all operations can be removed either by setting to 0 the amount
// or by writing the opposite operation if the period is closed
$r.="<TD>";
// cancel operation
if ( $user->check_action(GEOP)==1)
$r.=sprintf('<input TYPE="BUTTON" VALUE="%s" onClick="cancelOperation(\'%s\',\'%s\',%d,\'%s\')">',
_("Effacer"),$row['jr_grpt_id'],$l_sessid,$gDossier,$row['jrn_def_id']);
$r.="</TD>";
} // else
//document
if ( $row['jr_pj_name'] != "")
{
$image='<IMG SRC="image/insert_table.gif" title="'.$row['jr_pj_name'].'" border="0">';
$r.="<TD>".sprintf('<A class="detail" HREF="show_pj.php?jrn=%s&jr_grpt_id=%s&%s&PHPSESSID=%s">%s</A>',
$row['jrn_def_id'],
$row['jr_grpt_id'],
$str_dossier,
$_REQUEST['PHPSESSID'],
$image)
."</TD>";
}
else
$r.="<TD></TD>";
// end row
$r.="</tr>";
}
$amount_paid=round($amount_paid,4);
$amount_unpaid=round($amount_unpaid,4);
$tot=round($tot,4);
$r.="<TR>";
$r.='<TD COLSPAN="5">Total</TD>';
$r.='<TD ALIGN="RIGHT">'.$tot."</TD>";
$r.="</tr>";
if ( $p_paid != 0 ) {
$r.="<TR>";
$r.='<TD COLSPAN="5">Pay&eacute;</TD>';
$r.='<TD ALIGN="RIGHT">'.$amount_paid."</TD>";
$r.="</tr>";
$r.="<TR>";
$r.='<TD COLSPAN="5">Non pay&eacute;</TD>';
$r.='<TD ALIGN="RIGHT">'.$amount_unpaid."</TD>";
$r.="</tr>";
}
$r.="</table>";
return array ($count,$r);
}
/*!
* \brief get_detail gives the detail of row
* this array must contains at least the field
* <ul>
* <li> montant</li>
* <li> grpt_id
* </ul>
* the following field will be added
* <ul>
* <li> HTVA
* <li> TVAC
* <li> TVA array with
* <ul>
* <li> field 0 idx
* <li> array containing tva_id,tva_label and tva_amount
* </ul>
* </ul>
*
* \param p_array the structure is set in get_rowSimple, this array is
* modified,
* \param $trunc if the data must be truncated, usefull for pdf export
* \param p_jrn_type is the type of the ledger (ACH or VEN)
* \param $a_TVA TVA Array (default null)
* \param $a_ParmCode Array (default null)
* \return p_array
*/
function get_detail(&$p_array,$p_jrn_type,$trunc=0,$a_TVA=null,$a_ParmCode=null)
{
echo_debug(__FILE__.':'.__LINE__.'- get_detail','$p_array',$p_array);
if ( $a_TVA == null )
{
//Load TVA array
$a_TVA=$this->db->get_array('select tva_id,tva_label,tva_poste
from tva_rate where tva_rate != 0 order by tva_id');
}
if ( $a_ParmCode == null )
{
//Load Parm_code
$a_ParmCode=$this->db->get_array('select p_code,p_value from parm_code');
}
// init
$p_array['client']="";
$p_array['TVAC']=0;
$p_array['TVA']=array();
$p_array['AMOUNT_TVA']=0.0;
$p_array['dep_priv']=0;
$dep_priv=0.0;
//
// Retrieve data from jrnx
$sql="select j_id,j_poste,j_montant, j_debit,j_qcode from jrnx where ".
" j_grpt=".$p_array['grpt_id'];
$Res2=$this->db->exec_sql($sql);
$data_jrnx=Database::fetch_all($Res2);
$c=0;
// Parse data from jrnx and fill diff. field
foreach ( $data_jrnx as $code ) {
$idx_tva=0;
echo_debug('class_acc_ledger',__LINE__,'Code is');
echo_debug('class_acc_ledger',__LINE__,$code);
$poste=new Acc_Account_Ledger($this->db,$code['j_poste']);
// if card retrieve name if the account is not a VAT account
if ( strlen(trim($code['j_qcode'] )) != 0 && $poste->isTva() == 0 )
{
echo_debug('class_acc_ledger',__LINE__,'fiche_def = '.$code['j_qcode']);
$fiche=new fiche($this->db);
$fiche->get_by_qcode(trim($code['j_qcode']),false);
$fiche_def_id=$fiche->get_fiche_def_ref_id();
// Customer or supplier
if ( $fiche_def_id == FICHE_TYPE_CLIENT ||
$fiche_def_id == FICHE_TYPE_FOURNISSEUR )
{
echo_debug('class_acc_ledger',__LINE__,$code['j_qcode'].'est F ou C');
$p_array['TVAC']=$code['j_montant'];
$p_array['client']=($trunc==0)?$fiche->getName():substr($fiche->getName(),0,20);
$p_array['reversed']=false;
if ( $fiche_def_id == FICHE_TYPE_CLIENT && $code['j_debit']=='f')
{
$p_array['reversed']=true;
$p_array['TVAC']*=-1;
}
if ( $fiche_def_id == FICHE_TYPE_FOURNISSEUR && $code['j_debit']=='t')
{
$p_array['reversed']=true;
$p_array['TVAC']*=-1;
}
} else {
// if we use the ledger ven / ach for others card than supplier and customer
if ( $fiche_def_id != FICHE_TYPE_VENTE &&
$fiche_def_id != FICHE_TYPE_ACH_MAR &&
$fiche_def_id != FICHE_TYPE_ACH_SER ) {
echo_debug('class_acc_ledger',__LINE__,$code['j_qcode']."n 'est PAS F ou C");
$p_array['TVAC']=$code['j_montant'];
$p_array['client']= ($trunc==0)?$fiche->getName():substr($fiche->getName(),0,20);
$p_array['reversed']=false;
if ($p_jrn_type == 'ACH' && $code['j_debit']=='t')
{
$p_array['reversed']=true;
$p_array['TVAC']*=-1;
}
if ($p_jrn_type == 'VEN' && $code['j_debit']=='f')
{
$p_array['reversed']=true;
$p_array['TVAC']*=-1;
}
}
}
}
echo_debug('class_acc_ledger',__LINE__,$a_TVA);
// if TVA, load amount, tva id and rate in array
foreach ( $a_TVA as $line_tva)
{
echo_debug('class_acc_ledger',__LINE__,'ICI');
echo_debug('class_acc_ledger',__LINE__,'Montant TVA = '.$p_array['AMOUNT_TVA']);
list($tva_deb,$tva_cred)=split(',',$line_tva['tva_poste']);
if ( $code['j_poste'] == $tva_deb ||
$code['j_poste'] == $tva_cred )
{
// For the reversed operation
if ( $p_jrn_type == 'ACH' && $code['j_debit'] == 'f')
{
$code['j_montant']=-1*$code['j_montant'];
}
if ( $p_jrn_type == 'VEN' && $code['j_debit'] == 't')
{
$code['j_montant']=-1*$code['j_montant'];
}
$p_array['AMOUNT_TVA']+=$code['j_montant'];
$p_array['TVA'][$c]=array($idx_tva,array($line_tva['tva_id'],$line_tva['tva_label'],$code['j_montant']));
echo_debug('class_acc_ledger',__LINE__,'Montant TVA = '.$p_array['AMOUNT_TVA']);
$c++;
$idx_tva++;
}
}
// isDNA
// If operation is reversed then amount are negatif
/* if ND */
if ( $p_array['jrn_def_type'] == 'ACH') {
$purchase=new Gestion_Purchase($this->db);
$purchase->search_by_jid($code['j_id']);
$purchase->load();
$dep_priv+=$purchase->qp_dep_priv;
echo_debug(__FILE__.':'.__LINE__.'- get_detail','$dep_priv',$dep_priv);
$p_array['dep_priv']=$dep_priv;
}
}
$p_array['TVAC']=sprintf('% 10.2f',$p_array['TVAC']-$dep_priv);
$p_array['HTVA']=sprintf('% 10.2f',$p_array['TVAC']-$p_array['AMOUNT_TVA']);
$r="";
$a_tva_amount=array();
// inline TVA (used for the PDF)
foreach ($p_array['TVA'] as $linetva)
{
foreach ($a_TVA as $tva)
{
if ( $tva['tva_id'] == $linetva[1][0] )
{
$a=$tva['tva_id'];
$a_tva_amount[$a]=$linetva[1][2];
}
}
}
foreach ($a_TVA as $line_tva)
{
$a=$line_tva['tva_id'];
if ( isset($a_tva_amount[$a]))
{
$tmp=sprintf("% 10.2f",$a_tva_amount[$a]);
$r.="$tmp";
}
else
$r.=sprintf("% 10.2f",0);
}
$p_array['TVA_INLINE']=$r;
return $p_array;
} // retrieve data from jrnx
/*!
* \brief Get the properties of a journal
*
* \return an array containing properties
*
*/
function get_propertie()
{
if ( $this->id == 0 ) return;
$Res=$this->db->exec_sql("select jrn_Def_id,jrn_def_name,jrn_def_class_deb,jrn_def_class_cred,jrn_def_type,
jrn_deb_max_line,jrn_cred_max_line,jrn_def_ech,jrn_def_ech_lib,jrn_def_code,
jrn_def_fiche_deb,jrn_def_fiche_deb,jrn_def_pj_pref
from jrn_Def
where jrn_def_id=$1",array($this->id));
$Count=Database::num_row($Res);
if ( $Count == 0 ) {
echo '<DIV="redcontent"><H2 class="error">'._('Parametres journaux non trouves').'</H2> </DIV>';
return null;
}
return Database::fetch_array($Res,0);
}
/*! \function GetDefLine
* \brief Get the number of lines of a journal
* \param $p_cred deb or cred
*
* \return an integer
*/
function GetDefLine()
{
$sql_cred='jrn_deb_max_line';
$sql="select jrn_deb_max_line as value from jrn_def where jrn_def_id=$1";
$r=$this->db->exec_sql($sql,array($this->id));
$Res=Database::fetch_all($r);
echo_debug('class_acc_ledger',__LINE__,$Res);
if ( sizeof($Res) == 0 ) return 1;
return $Res[0]['value'];
}
/*!\brief get the saldo of a ledger for a specific period
* \param $p_from start period
* \param $p_to end period
* \param $p_cent 1 for a centralized period otherwise 0
*/
function get_solde($p_from,$p_to,$p_cent) {
$ledger="";
if ( $this->id != 0 && $p_cent=='off') {
$ledger=" and j_jrn_def = ".$this->id;
}
if ( $this->id != 0 && $p_cent=='on') {
$ledger=" and c_jrn_def = ".$this->id;
}
// we ask for a specific ledger
if ( $p_cent == 'off') {
$periode=sql_filter_per($this->db,$p_from,$p_to,'p_id','j_tech_per');
$sql='select j_montant as montant,j_debit as deb from jrnx where '
.$periode.$ledger;
}else {
$periode=sql_filter_per($this->db,$p_from,$p_to,'p_id','c_periode');
$sql='select c_montant as montant,c_debit as deb from centralized where '
.$periode.$ledger;
}
$ret=$this->db->exec_sql($sql);
$array=Database::fetch_all($ret);
$deb=0.0;
$cred=0.0;
foreach ($array as $line) {
if ( $line['deb']=='t' )
$deb+=$line['montant'];
else
$cred+=$line['montant'];
}
$response=array($deb,$cred);
return $response;
}
/*!
* \brief Show a select list of the ledger you can access in
* writing, the security is taken in care but show the readable AND
* writable ledger.
* \param $p_type = ALL or the type of the ledger (ACH,VEN,FIN,ODS)
* \param $p_access =3 for READ and WRITE, 2 for write and 1 for readonly
* \return object HtmlInput select
*/
function select_ledger($p_type="ALL",$p_access=3) {
$user=new User($this->db);
$array=$user->get_ledger($p_type,$p_access);
if ( $array == null ) return null;
$idx=0;
$ret=array();
foreach ( $array as $value) {
$ret[$idx]['value']=$value['jrn_def_id'];
$ret[$idx]['label']=h($value['jrn_def_name']);
$idx++;
}
$select=new ISelect();
$select->name='p_jrn';
$select->value=$ret;
$select->selected=$this->id;
return $select;
}
/*!
* \brief retrieve the jrn_def_fiche and return them into a array
* index deb, cred
* \param
* \param
* \param
*
*
* \return return an array ('deb'=> ,'cred'=>)
*/
function get_fiche_def() {
$sql="select jrn_def_fiche_deb as deb,jrn_def_fiche_cred as cred ".
" from jrn_def where ".
" jrn_def_id = $1 ";
$r=$this->db->exec_sql($sql,array($this->id));
$res=Database::fetch_all($r);
if ( empty($res) ) return null;
return $res[0];
}
/*!
* \brief retrieve the jrn_def_class_deb and return it
*
*
* \return return an string
*/
function get_class_def() {
$sql="select jrn_def_class_deb ".
" from jrn_def where ".
" jrn_def_id = $1";
$r=$this->db->exec_sql($sql,array($this->id));
$res=Database::fetch_all($r);
if ( empty($res) ) return null;
return $res[0];
}
/*!
* \brief show the result of the array
* \param $p_array array from the form
* \return string
*/
function show_summary($p_array) {
$this->id=$p_array['p_jrn'];
if ( empty($p_array)) return 'Aucun r&eacute;sultat';
extract($p_array);
$ret="";
$ret.="<table>";
$ret.="<tr><td>"._('Date')." : </td><td>$date</td></tr>";
$ret.="<tr><td>"._('Description')." </td><td>".h($desc)."</td></tr>";
$ret.="<tr><td>"._('PJ Num')." </td><td>".h($e_pj)."</td></tr>";
$ret.='</table>';
$ret.="<table>";
$ret.="<tr>";
$ret.="<th>"._('Quick Code ou');
$ret.=_("Poste")." </th>";
$ret.="<th> "._("Montant")." </th>";
$ret.="<th>"._("Débit")."</th>";
$ret.="</tr>";
$own=new own($this->db);
$ret.=HtmlInput::hidden('date',$date);
$ret.=HtmlInput::hidden('desc',$desc);
$ret.=HtmlInput::hidden('e_pj',$e_pj);
$ret.=HtmlInput::hidden('e_pj_suggest',$e_pj_suggest);
$mt=microtime(true);
$ret.=HtmlInput::hidden('mt',$mt);
// For predefined operation
$ret.=HtmlInput::hidden('e_comm',$desc);
$ret.=HtmlInput::hidden('jrn_type',$this->get_type());
$ret.=HtmlInput::hidden('p_jrn',$this->id);
$ret.=HtmlInput::hidden('nb_item',$nb_item);
if ( $this->with_concerned==true) {
$ret.=HtmlInput::hidden('jrn_concerned',$jrn_concerned);
}
$ret.=dossier::hidden();
$count=0;
for ($i=0;$i<$nb_item;$i++) {
$ret.="<tr>";
if ( trim(${'qc_'.$i})!="") {
$oqc=new fiche($this->db);
$oqc->get_by_qcode(${'qc_'.$i},false);
$strPoste=$oqc->strAttribut(ATTR_DEF_ACCOUNT);
$ret.="<td>".
${'qc_'.$i}.' - '.
$oqc->strAttribut(ATTR_DEF_NAME).HtmlInput::hidden('qc_'.$i,${'qc_'.$i}).
'</td>';
}
if ( trim(${'qc_'.$i})=="" && trim(${'poste'.$i}) != "") {
$oposte=new Acc_Account_Ledger($this->db,${'poste'.$i});
$strPoste=$oposte->id;
$ret.="<td>".h(${"poste".$i}." - ".
$oposte->get_name()).HtmlInput::hidden('poste'.$i,${'poste'.$i}).
'</td>';
}
if ( trim(${'qc_'.$i})=="" && trim(${'poste'.$i}) == "")
continue;
$ret.="<td>".h(${"ld".$i}).HtmlInput::hidden('ld'.$i,${'ld'.$i})."</td>";
$ret.="<td>".${"amount".$i}.HtmlInput::hidden('amount'.$i,${'amount'.$i})."</td>";
$ret.="<td>";
$ret.=(isset(${"ck$i"}))?"D":"C";
$ret.=(isset(${"ck$i"}))?HtmlInput::hidden('ck'.$i,${'ck'.$i}):"";
$ret.="</td>";
// CA
if ( $own->MY_ANALYTIC!='nu') // use of AA
{
if ( ereg("^[6,7]+",$strPoste)) {
// show form
$op=new Anc_Operation($this->db);
$null=($own->MY_ANALYTIC=='op')?1:0;
$ret.='<td>';
$ret.=$op->display_form_plan(null,$null,1,$count,round(${'amount'.$i},2));
$ret.='</td>';
$count++;
}
}
$ret.="</tr>";
}
$ret.="</table>";
return $ret;
}
/*!
* \brief Show the form to encode your operation
* \param $p_array if you correct or use a predef operation
* \param $p_readonly 1 for readonly 0 for writable
*
* \return a string containing the form
*/
function show_form($p_array=null,$p_readonly=0)
{
if ( $p_readonly == 1 )
return $this->show_summary($p_array);
if ( $p_array != null )
extract($p_array);
$ret="";
/* Add button */
$f_add_button=new IButton('add_card');
$f_add_button->label=_('Créer une nouvelle fiche');
$f_add_button->set_attribute('ipopup','ipop_newcard');
$f_add_button->set_attribute('filter',$this->get_all_fiche_def ());
// $f_add_button->set_attribute('jrn',$this->id);
$f_add_button->javascript=" select_card_type(this);";
$ret.=$f_add_button->input();
// Load the javascript
//
$ret.="<table>";
$ret.= '<tr><td>';
$wDate=new IDate('date');
$wDate->readonly=$p_readonly;
$date=(isset($date)&&trim($date)!='')?$date:'';
if (trim($date)=='') {
$user=new User($this->db);
$periode=new Periode($this->db);
list ($l_date_start,$l_date_end)=$periode->get_date_limit($user->get_periode());
$date=$l_date_start;
}
$wDate->value=$date;
$ret.=_("Date").' : '.$wDate->input();
$ret.= '</td></tr>';
$ret.= '<tr><td>'._('Description');
$wDescription=new IText('desc');
$wDescription->readonly=$p_readonly;
$wDescription->size=100;
$wDescription->value=(isset($desc))?$desc:'';
$ret.=$wDescription->input();
$ret.= '</td>';
$wPJ=new IText('e_pj');
$wPJ->readonly=false;
$wPJ->size=10;
/* suggest PJ ? */
$default_pj='';
$own=new Own($this->db);
if ( $own->MY_PJ_SUGGEST=='Y') {
$default_pj=$this->guess_pj();
}
$wPJ->value=(isset($e_pj))?$e_pj:$default_pj;
$ret.='<td> '._('Pièce').' : '.$wPJ->input();
$ret.=HtmlInput::hidden('e_pj_suggest',$default_pj);
$ret.= '</td></tr>';
$ret.= '</table>';
$nb_row=(isset($nb_item) )?$nb_item:$this->nb;
$ret.=HtmlInput::hidden('nb_item',$nb_row);
$ret.=dossier::hidden();
$ret.=HtmlInput::hidden('p_jrn',$this->id);
$ret.=dossier::hidden();
$ret.=HtmlInput::hidden('phpsessid',$_REQUEST['PHPSESSID']);
$ret.=HtmlInput::hidden('jrn_type',$this->get_type());
$info= HtmlInput::infobulle(0);
$info_poste=HtmlInput::infobulle(9);
$ret.='<table id="quick_item" style="width:100%">';
$ret.='<tr>'.
'<th >Quickcode'.$info.'</th>'.
'<th >'._('Poste').$info_poste.'</th>'.
'<th >'._('Libellé').'</th>'.
'<th>'._('Montant').'</th>'.
'<th>'._('Débit').'</th>'.
'</tr>';
$l_sessid=$_REQUEST['PHPSESSID'];
for ($i = 0 ;$i<$nb_row;$i++){
// Quick Code
$quick_code=new ICard('qc_'.$i);
$quick_code->set_dblclick("fill_ipopcard(this);");
$quick_code->set_attribute('ipopup','ipopcard');
// name of the field to update with the name of the card
$quick_code->set_attribute('label',"ld".$i);
$quick_code->set_attribute('jrn',$this->id);
// name of the field to update with the name of the card
$quick_code->set_attribute('typecard','filter');
$quick_code->extra='filter';
// Add the callback function to filter the card on the jrn
$quick_code->set_callback('filter_card');
$quick_code->set_function('fill_data');
$quick_code->javascript=sprintf(' onchange="fill_data_onchange(\'%s\');" ',
$quick_code->name);
$quick_code->jrn=$this->id;
$quick_code->value=(isset(${'qc_'.$i}))?${'qc_'.$i}:"";
$quick_code->readonly=$p_readonly;
$label='';
if ( $quick_code->value != '' ) {
$Fiche=new fiche($this->db);
$Fiche->get_by_qcode($quick_code->value);
$label=$Fiche->strAttribut(ATTR_DEF_NAME);
}
// Account
$poste=new IPoste();
$poste->name='poste'.$i;
$poste->set_attribute('jrn',$this->id);
$poste->set_attribute('ipopup','ipop_account');
$poste->set_attribute('label','ld'.$i);
$poste->set_attribute('account','poste'.$i);
$poste->value=(isset(${'poste'.$i}))?${"poste".$i}:'';
$poste->readonly=$p_readonly;
if ( $poste->value != '' ) {
$Poste=new Acc_Account($this->db);
$Poste->set_parameter('value',$poste->value);
$label=$Poste->get_lib();
}
// Description of the line
$line_desc=new IText();
$line_desc->name='ld'.$i;
$line_desc->size=30;
$line_desc->value=(isset(${"ld".$i}))?${"ld".$i}:$label;
// Amount
$amount=new INum();
$amount->size=10;
$amount->name='amount'.$i;
$amount->value=(isset(${'amount'.$i}))?${"amount".$i}:'';
$amount->readonly=$p_readonly;
$amount->javascript=' onChange="format_number(this);checkTotalDirect()"';
// D/C
$deb=new ICheckBox();
$deb->name='ck'.$i;
$deb->selected=(isset(${'ck'.$i}))?true:false;
$deb->readonly=$p_readonly;
$deb->javascript=' onChange="checkTotalDirect()"';
$ret.='<tr>';
$ret.='<td>'.$quick_code->search().$quick_code->input().'</td>';
$ret.='<td>'.$poste->input().
'<script> document.getElementById(\'poste'.$i.'\').onblur=function(){ if (trim(this.value) !=\'\') {document.getElementById(\'qc_'.$i.'\').value="";}}</script>'.
'</td>';
$ret.='<td>'.$line_desc->input().'</td>';
$ret.='<td>'.$amount->input().'</td>';
$ret.='<td>'.$deb->input().'</td>';
$ret.='</tr>';
// If readonly == 1 then show CA
}
$ret.='</table>';
if ( isset ($this->with_concerned) && $this->with_concerned==true) {
$oRapt=new Acc_Reconciliation($this->db);
$w=$oRapt->widget();
$w->name='jrn_concerned';
$w->value=(isset($jrn_concerned))?$jrn_concerned:"";
$ret.="R&eacute;conciliation/rapprochements : ".$w->input();
}
return $ret;
}
/*!\brief
* check if the current ledger is closed
*\return 1 for yes, otherwise 0
*\see Periode::is_closed
*/
function is_closed($p_periode) {
$per=new Periode($this->db);
$per->set_jrn($this->id);
$per->set_periode($p_periode);
$ret=$per->is_closed();
echo_debug(__FILE__.':'.__LINE__.'- is_closed','return',$ret);
return $ret;
}
/*!
* \brief verify that the operation can be saved
* \param $p_array array of data same layout that the $_POST from show_form
*
*
* \throw the getcode value is 1 incorrect balance, 2 date
* invalid, 3 invalid amount, 4 the card is not in the range of
* permitted card, 5 not in the user's period, 6 closed period
*
*/
function verify($p_array)
{
extract ($p_array);
$user=new User($this->db);
$tot_cred=0;$tot_deb=0;
/* check for a double reload */
if ( isset($mt) && $this->db->count_sql('select jr_mt from jrn where jr_mt=$1',array($mt)) != 0 )
throw new Exception ('Double Encodage',5);
// Check the periode and the date
if ( isDate($date) == null ) {
throw new Exception('Date invalide', 2);
}
$periode=new Periode($this->db);
/* find the periode if we have enabled the check_periode*/
if ($this->check_periode()==false) {
$periode->find_periode($date);
} else {
$periode->p_id=$user->get_periode();
list ($l_date_start,$l_date_end)=$periode->get_date_limit();
// Date dans la periode active
if ( cmpDate($date,$l_date_start)<0 ||
cmpDate($date,$l_date_end)>0 )
{
throw new Exception(_('Pas dans la periode active'),5);
}
}
// Periode ferme
if ( $this->is_closed($periode->p_id)==1 )
{
echo_debug(__FILE__.':'.__LINE__.'- verify',' the periode is closed ');
throw new Exception('Periode fermee',6);
}
/* check if we are using the strict mode */
if( $this->check_strict() == true) {
/* if we use the strict mode, we get the date of the last
operation */
$last_date=$this->get_last_date();
if ( $last_date !=null && cmpDate($date,$last_date) < 0 )
throw new Exception(_('Vous utilisez le mode strict la dernière operation est la date du ')
.$last_date.' '._('vous ne pouvez pas encoder à une date antérieure'),15);
}
for ($i=0;$i<$nb_item;$i++)
{
$err=0;
// Check the balance
if ( ! isset (${'amount'.$i}))
continue;
$amount=round(${'amount'.$i},2);
$tot_deb+=(isset(${'ck'.$i}))?$amount:0;
$tot_cred+=(! isset(${'ck'.$i}))?$amount:0;
// Check if the card is permitted
if ( isset (${'qc_'.$i}) && trim(${'qc_'.$i}) !="") {
$f=new fiche($this->db);
$f->quick_code=${'qc_'.$i};
if ( $f->belong_ledger($p_jrn) < 0 )
throw new Exception("La fiche quick_code = ".
$f->quick_code." n\'est pas dans ce journal",4);
if ( strlen(trim(${'qc_'.$i}))!=0 && isNumber(${'amount'.$i} ) == 0 )
throw new Exception('Montant invalide',3);
}
// Check if the account is permitted
if ( isset (${'poste'.$i}) && strlen (trim(${'poste'.$i})) != 0 ) {
$p=new Acc_Account_Ledger($this->db,${'poste'.$i});
if ( $p->belong_ledger ($p_jrn) < 0 )
throw new Exception(_("Le poste")." ".$p->id." "._("n'est pas dans ce journal"),5);
if ( strlen(trim(${'poste'.$i}))!=0 && isNumber(${'amount'.$i} ) == 0 )
throw new Exception(_('Poste invalide'),3);
if ( $p->do_exist() == 0 )
throw new Exception(_('Poste Inexistant'),4);
}
}
$tot_deb=round($tot_deb,4);
$tot_cred=round($tot_cred,4);
if ( $tot_deb != $tot_cred ) {
throw new Exception(_("Balance incorrecte ")." debit = $tot_deb credit=$tot_cred ",1);
}
}
/*!
* \brief compute the internal code of the saved operation and set the $this->jr_internal to
* the computed value
*
* \param $p_grpt id in jr_grpt_
*
* \return string internal_code
* -
*
*/
function compute_internal_code($p_grpt)
{
if ( $this->id==0) return;
$num = $this->db->get_next_seq('s_internal');
$atype=$this->get_propertie();
$type=$atype['jrn_def_code'];
$internal_code=sprintf("%d%s-%s",dossier::id(),$type,$num);
echo_debug (__FILE__,__LINE__,"internal_code = $internal_code");
$this->jr_internal=$internal_code;
return $internal_code;
}
/*!
* \brief save the operation into the jrnx,jrn, ,
* CA and pre_def
* \param $p_array
*
* \return array with [0] = false if failed otherwise true, [1] error
* code
*/
function save ($p_array) {
extract ($p_array);
try {
$this->verify($p_array);
$this->db->start() ;
$seq=$this->db->get_next_seq('s_grpt');
$internal=$this->compute_internal_code($seq);
$group=$this->db->get_next_seq("s_oa_group");
$own=new own($this->db);
$tot_amount=0;
$tot_deb=0;
$tot_cred=0;
$oPeriode=new Periode($this->db);
$check_periode=$this->check_periode();
if ( $check_periode == false) {
$oPeriode->find_periode($date);
}
$count=0;
for ($i=0;$i<$nb_item;$i++)
{
if ( ! isset (${'qc_'.$i}) && ! isset(${'poste'.$i}))
continue;
$acc_op=new Acc_Operation($this->db);
$quick_code="";
// First we save the jrnx
if ( isset(${'qc_'.$i})) {
$qc=new fiche($this->db);
$qc->get_by_qcode(${'qc_'.$i},false);
$poste=$qc->strAttribut(ATTR_DEF_ACCOUNT);
$quick_code=${'qc_'.$i};
}
else {
$poste=${'poste'.$i};
}
$acc_op->date=$date;
// compute the periode is do not check it
if ($check_periode == false ) $acc_op->periode=$oPeriode->p_id;
$acc_op->desc=$desc;
$acc_op->amount=round(${'amount'.$i},2);
$acc_op->grpt=$seq;
$acc_op->poste=$poste;
$acc_op->jrn=$this->id;
$acc_op->type=(isset (${'ck'.$i}))?'d':'c';
$acc_op->qcode=$quick_code;
$j_id=$acc_op->insert_jrnx();
if ( strlen(trim(${'ld'.$i})) != 0 )
$acc_op->update_comment(${'ld'.$i});
$tot_amount+=round($acc_op->amount,2);
$tot_deb+=($acc_op->type=='d')?$acc_op->amount:0;
$tot_cred+=($acc_op->type=='c')?$acc_op->amount:0;
if ( $own->MY_ANALYTIC != "nu" )
{
if ( ereg("^[6,7]+",$poste)) {
// for each item, insert into operation_analytique */
$op=new Anc_Operation($this->db);
$op->oa_group=$group;
$op->j_id=$j_id;
$op->oa_date=$date;
$op->oa_debit=($acc_op->type=='d' )?'t':'f';
$op->oa_description=$desc;
$op->save_form_plan($p_array,$count);
$count++;
}
}
}// loop for each item
$acc_end=new Acc_Operation($this->db);
$acc_end->amount=$tot_deb;
if ($check_periode == false ) $acc_end->periode=$oPeriode->p_id;
$acc_end->date=$date;
$acc_end->desc=$desc;
$acc_end->grpt=$seq;
$acc_end->jrn=$this->id;
$acc_end->mt=$mt;
$jr_id= $acc_end->insert_jrn();
if ($jr_id == false )
throw new Exception('Balance incorrecte');
$acc_end->pj=$e_pj;
/* if e_suggest != e_pj then do not increment sequence */
if ( strcmp($e_pj,$e_pj_suggest) == 0 && strlen(trim($e_pj)) !=0) {
$this->inc_seq_pj();
}
$this->pj=$acc_end->set_pj();
$this->db->exec_sql("update jrn set jr_internal='".$internal."' where ".
" jr_grpt_id = ".$seq);
// Save now the predef op
//------------------------
if ( isset($save_opd)) {
$opd=new Pre_Op_Advanced($this->db);
$opd->name=(trim($desc)=='')?$internal:$desc;
$opd->get_post();
$opd->save();
}
if ( isset($this->with_concerned) && $this->with_concerned==true) {
$orap=new acc_reconciliation($this->db);
$orap->jr_id=$jr_id;
$orap->insert($jrn_concerned);
}
}
catch (Exception $a) {
throw $a;
}
catch (Exception $e) {
$this->db->rollback();
echo 'OPERATION ANNULEE ';
echo '<hr>';
echo __FILE__.__LINE__.$e->getMessage();
exit();
}
$this->db->commit();
return true;
}
/*!
* \brief get all the data from request and build the object
*/
function get_request()
{
$this->id=$_REQUEST['p_jrn'];
}
/*!
* \brief retrieve the next number for this type of ledger
* \param p_cn connx
* \param p_type ledger type
*
* \return the number
*
*
*/
static function next_number($p_cn,$p_type)
{
$Ret=$p_cn->count_sql("select * from jrn_def where jrn_def_type='".$p_type."'");
return $Ret+1;
}
/*!\brief get the first ledger
*\param the type
*\return the j_id
*/
public function get_first($p_type) {
$user=new User($this->db);
$all=$user->get_ledger($p_type);
return $all[0];
}
/*!\brief Update the paiment in the list of operation
*\param $p_array is normally $_GET
*/
function update_paid($p_array) {
// reset all the paid flag because the checkbox is post only
// when checked
foreach ($p_array as $name=>$paid)
{
list($ad) = sscanf($name,"set_jr_id%d");
if ( $ad == null ) continue;
$sql="update jrn set jr_rapt='' where jr_id=$ad";
$Res=$this->db->exec_sql($sql);
}
// set a paid flag for the checked box
foreach ($p_array as $name=>$paid)
{
list ($id) = sscanf ($name,"rd_paid%d");
if ( $id == null ) continue;
$paid=($paid=='on')?'paid':'';
$sql="update jrn set jr_rapt='$paid' where jr_id=$id";
$Res=$this->db->exec_sql($sql);
}
}
function update_internal_code($p_internal) {
if ( ! isset($this->grpt_id) )
exit( 'ERREUR '.__FILE__.":".__LINE__);
$Res=$this->db->exec_sql("update jrn set jr_internal='".$p_internal."' where ".
" jr_grpt_id = ".$this->grpt_id);
}
/*!\brief retrieve all the card for this type of ledger, make them
*into a string separated by comma
*\param none
*\return all the card or null is nothing is found
*/
function get_all_fiche_def() {
$sql="select jrn_def_fiche_deb as deb,jrn_def_fiche_cred as cred ".
" from jrn_def where ".
" jrn_def_type = $1 ";
$r=$this->db->exec_sql($sql,array($this->type));
$res=Database::fetch_all($r);
if ( empty($res) ) return null;
$card="";
$comma='';
foreach ($res as $item ) {
if ( strlen(trim($item['deb'])) != 0 ) {
$card.=$comma.$item['deb'];
$comma=',';
}
if ( strlen(trim($item['cred'])) != '') {
$card.=$comma.$item['cred'];
$comma=',';
}
}
return $card;
}
/*!\brief get the saldo of an exercice, used for the opening of a folder
*\param $p_exercice is the exercice we want
*\return an array
* index =
* - solde (debit > 0 ; credit < 0)
* - j_poste
* - j_qcode
*/
function get_saldo_exercice($p_exercice) {
$sql="select sum(a.montant) as solde, j_poste, j_qcode
from
(select j_id, case when j_debit='t' then j_montant
else j_montant * (-1) end as montant
from jrnx) as a
join jrnx using (j_id)
join parm_periode on (j_tech_per = p_id )
where
p_exercice=$1
and j_poste::text not like '7%'
and j_poste::text not like '6%'
group by j_poste,j_qcode
having (sum(a.montant) != 0 )";
$res=$this->db->get_array($sql,array($p_exercice));
return $res;
}
/*!
*\brief Check if a Dossier is using the strict mode or not
* \return true if we are using the strict_mode
*/
function check_strict() {
$own=new Own($this->db);
if ( $own->MY_STRICT=='Y') return true;
if ( $own->MY_STRICT=='N') return false;
exit("Valeur invalid ".__FILE__.':'.__LINE__);
}
/*!
*\brief Check if a Dossier is using the check on the periode, if true than the user has to enter the date
* and the periode, it is a security check
* \return true if we are using the double encoding (date+periode)
*/
function check_periode() {
$own=new Own($this->db);
if ( $own->MY_CHECK_PERIODE=='Y') return true;
if ( $own->MY_CHECK_PERIODE=='N') return false;
exit("Valeur invalid ".__FILE__.':'.__LINE__);
}
/*!\brief get the date of the last operation
*/
function get_last_date()
{
if ( $this->id==0) throw new Exception (__FILE__.":".__LINE__."Journal incorrect ");
$sql="select to_char(max(jr_date),'DD.MM.YYYY') from jrn where jr_def_id=$1";
$date=$this->db->get_value($sql,array($this->id));
return $date;
}
/*!\brief retrieve the jr_id thanks the internal code, do not change
*anything to the current object
*\param the internal code
*\return the jr_id or 0 if not found
*/
function get_id($p_internal) {
$sql='select jr_id from jrn where jr_internal=$1';
$value=$this->db->get_value($sql,array($p_internal));
if ($value=='') $value=0;
return $value;
}
/*!\brief create the invoice and saved it as attachment to the
*operation,
*\param $internal is the internal code
*\param $p_array is normally the $_POST
*\return a string
*/
function create_document($internal,$p_array) {
extract ($p_array);
$doc=new Document($this->db);
$doc->f_id=$e_client;
$doc->md_id=$gen_doc;
$doc->ag_id=0;
$str_file=$doc->Generate();
// Move the document to the jrn
$doc->MoveDocumentPj($internal);
// Update the comment with invoice number
$sql="update jrn set jr_comment=' document ".$doc->d_number."' where jr_internal='$internal'";
$this->db->exec_sql($sql);
return '<h2 class="info">'.$str_file.'</h2>';
}
/*!\brief check if the payment method is valid
*\param $e_mp is the value and $e_mp_qcode is the quickcode
*\return nothing throw an Exception
*/
public function check_payment($e_mp,$e_mp_qcode) {
/* Check if the "paid by" is empty, */
if ( $e_mp != 0) {
/* the paid by is not empty then check if valid */
$empl=new fiche($this->db);
$empl->get_by_qcode($e_mp_qcode);
if ( $empl->empty_attribute(ATTR_DEF_ACCOUNT)== true) {
throw new Exception('Celui qui paie n\' a pas de poste comptable',20);
}
$poste=new Acc_Account_Ledger($this->db,$empl->strAttribut(ATTR_DEF_ACCOUNT));
if ( $poste->load() == false ){
throw new Exception('Pour la fiche'.$empl->quick_code.' le poste comptable ['.$poste->id.'n\'existe pas',9);
}
}
}
/*!\brief increment the sequence for the pj */
function inc_seq_pj() {
$sql="select nextval('s_jrn_pj".$this->id."')";
$this->db->exec_sql($sql);
}
/*!\brief return a HTML string with the form for the search
*\param $p_type if the type of ledger possible values=ALL,VEN,ACH,ODS,FIN
*\param $all_type_ledger
* values :
* - 1 means all the ledger of this type
* - 0 No have the "Tous les journaux" availables
*\return a HTML String without the tag FORM or DIV
*\see build_search_sql
*\see display_search_form
*\see list_operation
*/
function search_form($p_type,$all_type_ledger=1) {
$user=new User($this->db);
$r='';
/* security : filter ledger on user */
$filter_ledger=$user->get_ledger_sql($p_type,3);
$f_ledger=new ISelect('p_jrn');
$aLedger=$this->db->make_array('select jrn_def_id,jrn_def_name from jrn_def where '.$filter_ledger);
if ( $all_type_ledger==1)
$aLedger[]=array('value'=>-1,'label'=>'Tous les journaux');
/* if not p_jrn then all */
if( ! isset($_REQUEST['p_jrn'])) {
/* By default all ledger of this type */
$this->id=-1;
} else {
$this->id=$_REQUEST['p_jrn'];
}
$f_ledger->selected=$this->id;
$f_ledger->value=$aLedger;
/* widget for date_start */
$f_date_start=new IDate('date_start');
/* all periode or only the selected one */
if ( isset($_REQUEST['date_start'])) {
$f_date_start->value=$_REQUEST['date_start'];
} else {
$period=$user->get_periode();
$per=new Periode($this->db,$period);
list($date_start,$date_end)=$per->get_date_limit();
$f_date_start->value=$date_start;
}
/* widget for date_end */
$f_date_end=new IDate('date_end');
/* all date or only the selected one */
if ( isset($_REQUEST['date_end'])) {
$f_date_end->value=$_REQUEST['date_end'];
} else {
$f_date_end->value=$date_end;
}
/* widget for desc */
$f_descript=new IText('desc');
$f_descript->size=40;
if ( isset($_REQUEST['desc'])) {
$f_descript->value=$_REQUEST['desc'];
}
/* widget for amount */
$f_amount_min=new INum('amount_min');
$f_amount_min->value=(isset($_REQUEST['amount_min']))?$_REQUEST['amount_min']:0;
$f_amount_max=new INum('amount_max');
$f_amount_max->value=(isset($_REQUEST['amount_max']))?$_REQUEST['amount_max']:0;
/* input quick code */
$f_qcode=new ICard('qcode');
$f_qcode->extra='filter';
$f_qcode->set_attribute('typecard','all');
$f_qcode->set_callback('filter_card');
$f_txt_qcode=new IText('qcode');
$f_txt_qcode->value=(isset($_REQUEST['qcode']))?$_REQUEST['qcode']:'';
/* input poste comptable */
$f_accounting=new IPoste('accounting');
$f_accounting->value=(isset($_REQUEST['accounting']))?$_REQUEST['accounting']:'';
if ( $this->id=-1) $jrn=0;else $jrn=$this->id;
$f_accounting->set_attribute('jrn',$jrn);
$f_accounting->set_attribute('ipopup','ipop_account');
$f_accounting->set_attribute('label','ld');
$f_accounting->set_attribute('account','accounting');
$info=HtmlInput::infobulle(13);
$f_paid=new ICheckbox('unpaid');
$f_paid->selected=(isset($_REQUEST['unpaid']))?true:false;
$r.=HtmlInput::hidden('phpsessid',$_REQUEST['PHPSESSID']);
$r.=dossier::hidden();
$r.=HtmlInput::hidden('ledger_type',$this->type);
ob_start();
require_once('template/ledger_search.php');
$r.=ob_get_contents();
ob_clean();
return $r;
}
/*!\brief this function will create a sql stmt to use to create the list for
* the ledger,
*\param $p_array is usually the $_GET,
*\param $p_order the order of the row
*\param $p_where is the sql condition if not null then the $p_array will not be used
*\note the p_action will be used to filter the ledger but gl means ALL
* struct array $p_array
\verbatim
(
[phpsessid] => 016710a766b3c7b137ce6ee5bfbacc00
[gDossier] => 13
[p_jrn] => -1
[date_start] =>
[date_end] =>
[amount_min] => 0
[amount_max] => 0
[desc] =>
[search] => Rechercher
[p_action] => ven
[sa] => l
[PHPSESSID] => 016710a766b3c7b137ce6ee5bfbacc00
)
\endverbatim
*\return an array with a valid sql statement, an the where clause => array[sql] array[where]
*\see list_operation
*\see display_search_form
*\see search_form
*/
public function build_search_sql($p_array,$p_order="",$p_where="") {
$sql="select jr_id ,
jr_montant,
substr(jr_comment,1,60) as jr_comment,
to_char(jr_ech,'DD.MM.YYYY') as jr_ech,
to_char(jr_date,'DD.MM.YYYY') as jr_date,
jr_date as jr_date_order,
jr_grpt_id,
jr_rapt,
jr_internal,
jrn_def_id,
jrn_def_name,
jrn_def_ech,
jrn_def_type,
jr_valid,
jr_tech_per,
jr_pj_name,
p_closed,
jr_pj_number
from
jrn
join jrn_def on jrn_def_id=jr_def_id
join parm_periode on p_id=jr_tech_per";
if ( $p_array != null )
extract($p_array);
/* if no variable are set then give them a default
* value */
if ( $p_array == null || empty($p_array) || ! isset($amount_min) ) {
$amount_min=0;
$amount_max=0;
if ( ! isset ($date_start)) {
$user=new User($this->db);
$period=$user->get_periode();
$per=new Periode($this->db);
list($date_start,$date_end)=$per->get_date_limit();
}
$desc='';
$p_jrn=(isset($p_jrn))?$p_jrn:-1;
$qcode=(isset($qcode))?$qcode:"";
$accounting=(isset($accounting))?$accounting:"";
}
/* if p_jrn : 0 if means all ledgers, if -1 means all ledger of this
* type otherwise only one ledger*/
$fil_ledger='';
$fil_amount='';
$fil_date='';
$fil_desc='';
$fil_sec='';
$fil_qcode='';
$fil_account='';
$fil_paid='';
$and='';
if ( $p_jrn == -1 ) {
$user=new User($this->db);
/* Specific action allow to see all the ledgers in once */
if ( $p_action == 'gl') $p_action='ALL';
/* actions from commercial.php */
if ( $p_action == 'client') $p_action='ALL';
if ( $p_action == 'fournisseur') $p_action='ALL';
if ( $p_action == 'adm') $p_action='ALL';
$fil_ledger=$user->get_ledger_sql($p_action,2);
$and=' and ';
} else if ( $p_jrn != 0 ){
$fil_ledger = ' jrn_def_id = '.$p_jrn;
$and=' and ';
}
/* format the number */
$amount_min=toNumber($amount_min);
$amount_max=toNumber($amount_max);
if ( $amount_min > 0 && isNumber($amount_min) ) {
$fil_amount=$and.' jr_montant >=' .$amount_min; $and=' and ';
}
if ( $amount_max > 0 && isNumber($amount_max) ) {
$fil_amount.=$and.' jr_montant <=' .$amount_max; $and=' and ';
}
/* -------------------------------------------------------------------------- *
* if both amount are the same then we need to search into the detail
* and we reset the fil_amount
* -------------------------------------------------------------------------- */
if ( isNumber($amount_min) &&
isNumber($amount_max) &&
$amount_min > 0 &&
bccomp($amount_min, $amount_max,2)==0 )
{
$fil_amount= $and. 'jr_grpt_id in ( select distinct j_grpt from jrnx where j_montant = '.$amount_min.')';
$and=" and ";
}
// date
if ( isDate($date_start) != null )
{
$fil_date=$and." jr_date >= to_date('".$date_start."','DD.MM.YYYY')";
$and=" and ";
}
if ( isDate($date_end) != null ) {
$fil_date.=$and." jr_date <= to_date('".$date_end."','DD.MM.YYYY')";
$and=" and ";
}
// comment
$desc=FormatString($desc);
if ( $desc != null )
{
$fil_desc=$and." ( upper(jr_comment) like upper('%".$desc."%') or upper(jr_pj_number) like upper('%".$desc."%') ".
" or upper(jr_internal) like upper('%".$desc."%') )";
$and=" and ";
}
// Poste
if ( $accounting != null ) {
$fil_account=$and." jr_grpt_id in (select j_grpt
from jrnx where j_poste::text like '$accounting%' ) ";
$and=" and ";
}
// Quick Code
if ( $qcode != null )
{
$fil_qcode=$and." jr_grpt_id in ( select j_grpt from
jrnx where trim(j_qcode) = upper(trim('$qcode')))";
$and=" and ";
}
// Only the unpaid
if ( isset($unpaid) ) {
$fil_paid=$and.SQL_LIST_UNPAID_INVOICE;
$and =" and ";
}
$User=new User(new Database());
$User->Check();
$User->check_dossier(dossier::id());
if ( $User->admin == 0 && $User->is_local_admin()==0 )
{
$fil_sec=$and." jr_def_id in ( select uj_jrn_id ".
" from user_sec_jrn where ".
" uj_login='".$_SESSION['g_user']."'".
" and uj_priv in ('R','W'))";
}
$where=$fil_ledger.$fil_amount.$fil_date.$fil_desc.$fil_sec.$fil_amount.$fil_qcode.$fil_paid.$fil_account;
$sql.=" where ".$where;
return array($sql,$where);
}
/*!\brief return a html string with the search_form
*\return a HTML string with the FORM
*\see build_search_sql
*\see search_form
*\see list_operation
*/
function display_search_form() {
$r='';
$type=$this->type;
if ( $type=="" || $this->id==0) $type='ALL';
if ( isset($_GET['amount_min']) ) { $display='block';} else {$display='none';}
$r.='<div id="search_form" style="display:'.$display.'">';
$r.='<FORM METHOD="GET">';
$r.=$this->search_form($type);
$r.=HtmlInput::submit('search',_('Rechercher'));
$r.=HtmlInput::hidden('p_action',$_REQUEST['p_action']);
/* when called from commercial.php some hidden values are needed */
if (isset($_REQUEST['sa'])) $r.= HtmlInput::hidden("sa",$_REQUEST['sa']);
if (isset($_REQUEST['sb'])) $r.= HtmlInput::hidden("sb",$_REQUEST['sb']);
if (isset($_REQUEST['sc'])) $r.= HtmlInput::hidden("sc",$_REQUEST['sc']);
if (isset($_REQUEST['f_id'])) $r.=HtmlInput::hidden("f_id",$_REQUEST['f_id']);
$r.='</FORM>';
$button=new IButton('tfs');
$button->label=_("Afficher recherche");
$button->javascript="toggleHideShow('search_form','tfs');";
$r.='</div>';
$r.=$button->input();
return $r;
}
/*!
* \brief this function is intended to test this class
*/
static function test_me($pCase='')
{
if ( $pCase=='') {
echo Acc_Reconciliation::$javascript;
html_page_start();
$cn=new Database(dossier::id());
$_SESSION['g_user']='phpcompta';
$_SESSION['g_pass']='phpcompta';
$id=(isset ($_REQUEST['p_jrn']))?$_REQUEST['p_jrn']:-1;
$a=new Acc_Ledger($cn,$id);
$a->with_concerned=true;
// Vide
echo '<FORM method="post">';
echo $a->select_ledger()->input();
echo HtmlInput::submit('go','Test it');
echo '</form>';
if ( isset($_POST['go'])) {
echo "Ok ";
echo '<form method="post">';
echo $a->show_form();
echo HtmlInput::submit('post_id','Try me');
echo '</form>';
// Show the predef operation
// Don't forget the p_jrn
echo '<form>';
echo dossier::hidden();
echo '<input type="hidden" value="'.$id.'" name="p_jrn">';
$op=new Pre_operation($cn);
$op->p_jrn=$id;
$op->od_direct='t';
if ($op->count() != 0 ) {
echo HtmlInput::submit('use_opd','Utilisez une op.pr&eacute;d&eacute;finie');
echo $op->show_button();
}
echo '</form>';
exit();
}
if ( isset($_POST['post_id' ])) {
echo '<form method="post">';
echo $a->show_form($_POST,1);
echo HtmlInput::button('add','Ajout d\'une ligne','onClick="quick_writing_add_row()"');
echo HtmlInput::submit('save_it',"Sauver");
echo '</form>';
exit();
}
if ( isset($_POST['save_it' ])) {
print 'saving';
$array=$_POST;
$array['save_opd']=1;
try {
$a->save($array);
} catch (Exception $e) {
alert($e->getMessage());
echo '<form method="post">';
echo $a->show_form($_POST);
echo HtmlInput::submit('post_id','Try me');
echo '</form>';
}
exit();
}
// The GET at the end because automatically repost when you don't
// specify the url in the METHOD field
if ( isset ($_GET['use_opd'])) {
$op=new Pre_op_advanced($cn);
$op->set_od_id($_REQUEST['pre_def']);
//$op->p_jrn=$id;
$p_post=$op->compute_array();
echo '<FORM method="post">';
echo $a->show_form($p_post);
echo HtmlInput::submit('post_id','Use predefined operation');
echo '</form>';
exit();
}
}// if case = ''
if ( $pCase == 'search') {
html_page_start();
$cn=new Database(dossier::id());
$ledger=new Acc_Ledger($cn,0);
$_SESSION['g_user']='phpcompta';
$_SESSION['g_pass']='phpcompta';
echo $ledger->search_form('ALL');
}
}
/*!\brief return the last p_limit operation into an array
*\param $p_limit is the max of operation to return
*\return $p_array of Action object
*/
function get_last($p_limit) {
$user=new User($this->db);
$filter_ledger=$user->get_ledger_sql('ALL',3);
$filter_ledger=str_replace('jrn_def_id','jr_def_id',$filter_ledger);
$sql="select jr_date,to_char(jr_date,'DD.MM.YYYY') as jr_date_fmt,jr_montant, jr_comment,jr_internal from jrn ".
" where $filter_ledger ".
" order by jr_date desc limit $p_limit";
$array=$this->db->get_array($sql);
return $array;
}
/**
*@brief retreive the jr_grpt_id from a ledger
*@param $p_what the column to seek
* possible values are
* - internal
*@param $p_value the value of the col.
*/
function search_group($p_what,$p_value) {
switch($p_what) {
case 'internal':
return $this->db->get_value('select jr_grpt_id from jrn where jr_internal=$1',
array($p_value));
}
}
}