[Phpcompta-dev] r366 - in trunk: . import_doli import_doli/include

[phpcompta-dev]

Author: danydb
Date: 2012-05-26 21:25:41 +0200 (Sat, 26 May 2012)
New Revision: 366

Modified:
   trunk/
   trunk/import_doli/include/class_impdol_operation.php
   trunk/import_doli/index.php
Log:
Merged revisions 358-360 via svnmerge from 
svn+ssh://address@hidden/svn_extension/tag/rel605

........
  r358 | danydb | 2012-04-24 19:17:21 +0200 (Tue, 24 Apr 2012) | 4 lines
  
  Version 1 for import_doli
........
  r359 | danydb | 2012-04-24 19:34:02 +0200 (Tue, 24 Apr 2012) | 1 line
  
  update version for impdol
........
  r360 | danydb | 2012-05-25 19:32:48 +0200 (Fri, 25 May 2012) | 1 line
  
  bug : substr doesn't cut properly unicode string
........



Property changes on: trunk
___________________________________________________________________
Name: svnmerge-integrated
   - /tag/rel605:1-357
   + /tag/rel605:1-365

Modified: trunk/import_doli/include/class_impdol_operation.php
===================================================================
--- trunk/import_doli/include/class_impdol_operation.php        2012-05-26 
19:24:47 UTC (rev 365)
+++ trunk/import_doli/include/class_impdol_operation.php        2012-05-26 
19:25:41 UTC (rev 366)
@@ -341,7 +341,7 @@
                                        $jrnx->user = $_SESSION['g_user'];
                                        $jrnx->periode = 0;
                                        $jrnx->qcode = $oper->getp("qcode");
-                                       $jrnx->desc = 
substr($oper->getp("desc"),0,80);
+                                       $jrnx->desc = 
mb_substr($oper->getp("desc"),0,80,'UTF8');
                                        $id = $jrnx->insert_jrnx();
 
                                        $transfer = new 
impdol_operation_transfer_sql();
@@ -402,7 +402,7 @@
                                $jtiers->user = $_SESSION['g_user'];
                                $jtiers->periode = 0;
                                $jtiers->qcode = $oper_tiers->getp("qcode");
-                               $jtiers->desc = 
substr($oper_tiers->getp("desc"),0,80);
+                               $jtiers->desc = 
mb_substr($oper_tiers->getp("desc"),0,80,'UTF8');
                                $jtiers->insert_jrnx();
 
                                /* Record the vat 1 */
@@ -429,7 +429,7 @@
                                $acc_jrn = new Acc_Operation($cn);
                                $acc_jrn->jrn = $jrn;
                                $acc_jrn->amount = $sum;
-                               $acc_jrn->desc = 
substr($oper_tiers->getp("desc"),0,80);
+                               $acc_jrn->desc = 
mb_substr($oper_tiers->getp("desc"),0,80,'UTF8');
                                $acc_jrn->date = $date;
                                $acc_jrn->grpt = $grpt;
                                $acc_jrn->periode = 0;
@@ -456,7 +456,7 @@
                catch (Exception $e)
                {
                        print_r($e->getTraceAsString());
-                       $cn->rollback;
+                       $cn->rollback();
                }
        }
 

Modified: trunk/import_doli/index.php
===================================================================
--- trunk/import_doli/index.php 2012-05-26 19:24:47 UTC (rev 365)
+++ trunk/import_doli/index.php 2012-05-26 19:25:41 UTC (rev 366)
@@ -39,7 +39,7 @@
 $cn=new Database(dossier::id());
 
 
-Extension::check_version(4800);
+Extension::check_version(4802);
 
 // Javascript
  ob_start();



---
PhpCompta est un logiciel de comptabilité libre en ligne (full web)
Projet opensource http://www.phpcompta.eu