[Phpcompta-dev] r5064 - in phpcompta/tags/rel650: html/document/fr_be include

[phpcompta-dev]

Author: danydb
Date: 2012-07-03 00:56:38 +0200 (Tue, 03 Jul 2012)
New Revision: 5064

Modified:
   phpcompta/tags/rel650/html/document/fr_be/bnb.form
   phpcompta/tags/rel650/include/class_impress.php
Log:
Due to rewrite of parse formula, formula are not evaluated properly

Modified: phpcompta/tags/rel650/html/document/fr_be/bnb.form
===================================================================
--- phpcompta/tags/rel650/html/document/fr_be/bnb.form  2012-07-01 15:42:31 UTC 
(rev 5063)
+++ phpcompta/tags/rel650/html/document/fr_be/bnb.form  2012-07-02 22:56:38 UTC 
(rev 5064)
@@ -1,147 +1,147 @@
 # Les postesg*(-1)
- $C10=round([10%S],2)*(-1)
- $C100=round([100%S],2)*(-1)
- $C101=round([101%S],2)
- $C11=round([11%S],2)*(-1)
- $C12=round([12%S],2)*(-1)
- $C13=round([13%S],2)*(-1)
- $C130=round([130%S],2)*(-1)
- $C131=round([131%S],2)*(-1)
- $C1310=round([1310%S],2)*(-1)
- $C1311=round([1311%S],2)*(-1)
- $C132=round([132%S],2)*(-1)
- $C133=round([133%S],2)*(-1)
- $C14=round([14%S],2)*(-1)
- $C140=round([140%S],2)*(-1)
- $C141=round([141%S],2)
- $C15=round([15%S],2)*(-1)
- $C16=round([16%S],2)*(-1)
- $C160=round([160%S],2)*(-1)
- $C161=round([161%S],2)*(-1)
- $C162=round([162%S],2)*(-1)
- $C163=round([163%S],2)*(-1)
- $C164=round([164%S],2)*(-1)
- $C165=round([165%S],2)*(-1)
- $C168=round([168%S],2)*(-1)
-$C17=round([17%S],2)*(-1)
- $C170=round([170%S],2)*(-1)
- $C171=round([171%S],2)*(-1)
- $C172=round([172%S],2)*(-1)
- $C173=round([173%S],2)*(-1)
- $C174=round([174%S],2)*(-1)
- $C175=round([175%S],2)*(-1)
- $C176=round([176%S],2)*(-1)
- $C178=round([178%S],2)*(-1)
- $C179=round([179%S],2)*(-1)
-$C2=round([2%S],2)*(-1)
- $C20=round([20%S],2)
- $C21=round([21%S],2)
- $C22=round([22%S],2)
- $C23=round([23%S],2)
- $C24=round([24%S],2)
- $C25=round([25%S],2)
- $C26=round([26%S],2)
- $C27=round([27%S],2)
- $C28=round([28%S],2)
- $C29=round([29%S],2)
- $C290=round([290%S],2)
- $C291=round([291%S],2)
-$C3=round([3%S],2)
- $C30=round([30%S],2)
- $C31=round([31%S],2)
- $C32=round([32%S],2)
- $C33=round([33%S],2)
- $C34=round([34%S],2)
- $C35=round([35%S],2)
- $C36=round([36%S],2)
- $C37=round([37%S],2)
- $C40=round([40%S],2)
- $C41=round([41%S],2)
- $C42=round([42%S],2)*(-1)
- $C43=round([43%S],2)*(-1)
- $C439=round([439%S],2)*(-1)
- $C44=round([44%S],2)*(-1)
- $C440=round([440%S],2)*(-1)
- $C441=round([441%S],2)*(-1)
- $C444=round([444%S],2)*(-1)
- $C45=round([45%S],2)*(-1)
- $C450=round([450%S],2)*(-1)
- $C451=round([451%S],2)*(-1)
- $C452=round([452%S],2)*(-1)
- $C453=round([453%S],2)*(-1)
- $C454=round([454%S],2)*(-1)
-$C455=round([455%S],2)*(-1)
-$C456=round([456%S],2)*(-1)
-$C457=round([457%S],2)*(-1)
-$C458=round([458%S],2)*(-1)
- $C459=round([459%S],2)*(-1)
- $C46=round([46%S],2)
- $C47=round([47%S],2)*(-1)
- $C48=round([48%S],2)*(-1)
- $C49=round([49%S],2)
- $C490=round([490%S],2)
- $C491=round([491%S],2)
- $C492=round([492%S],2)*(-1)
- $C493=round([493%S],2)*(-1)
- $C50=round([50%S],2)
- $C51=round([51%S],2)
- $C52=round([52%S],2)
- $C53=round([53%S],2)
- $C54=round([54%S],2)
- $C55=round([55%S],2)
- $C56=round([56%S],2)
- $C57=round([57%S],2)
- $C58=round([58%S],2)
- $C60=round([60%S],2)
- $C61=round([61%S],2)
- $C62=round([62%S],2)
- $C63=round([63%S],2)
-$C630=round([630%S],2)
-$C631=round([631%S],2)
-$C632=round([632%S],2)
-$C633=round([633%S],2)
-$C634=round([634%S],2)
-$C635=round([635%S],2)
-$C636=round([636%S],2)
-$C637=round([637%S],2)
+ $C10=round([10%s],2)*(-1)
+ $C100=round([100%s],2)*(-1)
+ $C101=round([101%s],2)
+ $C11=round([11%s],2)*(-1)
+ $C12=round([12%s],2)*(-1)
+ $C13=round([13%s],2)*(-1)
+ $C130=round([130%s],2)*(-1)
+ $C131=round([131%s],2)*(-1)
+ $C1310=round([1310%s],2)*(-1)
+ $C1311=round([1311%s],2)*(-1)
+ $C132=round([132%s],2)*(-1)
+ $C133=round([133%s],2)*(-1)
+ $C14=round([14%s],2)*(-1)
+ $C140=round([140%s],2)*(-1)
+ $C141=round([141%s],2)
+ $C15=round([15%s],2)*(-1)
+ $C16=round([16%s],2)*(-1)
+ $C160=round([160%s],2)*(-1)
+ $C161=round([161%s],2)*(-1)
+ $C162=round([162%s],2)*(-1)
+ $C163=round([163%s],2)*(-1)
+ $C164=round([164%s],2)*(-1)
+ $C165=round([165%s],2)*(-1)
+ $C168=round([168%s],2)*(-1)
+$C17=round([17%s],2)*(-1)
+ $C170=round([170%s],2)*(-1)
+ $C171=round([171%s],2)*(-1)
+ $C172=round([172%s],2)*(-1)
+ $C173=round([173%s],2)*(-1)
+ $C174=round([174%s],2)*(-1)
+ $C175=round([175%s],2)*(-1)
+ $C176=round([176%s],2)*(-1)
+ $C178=round([178%s],2)*(-1)
+ $C179=round([179%s],2)*(-1)
+$C2=round([2%s],2)*(-1)
+ $C20=round([20%s],2)
+ $C21=round([21%s],2)
+ $C22=round([22%s],2)
+ $C23=round([23%s],2)
+ $C24=round([24%s],2)
+ $C25=round([25%s],2)
+ $C26=round([26%s],2)
+ $C27=round([27%s],2)
+ $C28=round([28%s],2)
+ $C29=round([29%s],2)
+ $C290=round([290%s],2)
+ $C291=round([291%s],2)
+$C3=round([3%s],2)
+ $C30=round([30%s],2)
+ $C31=round([31%s],2)
+ $C32=round([32%s],2)
+ $C33=round([33%s],2)
+ $C34=round([34%s],2)
+ $C35=round([35%s],2)
+ $C36=round([36%s],2)
+ $C37=round([37%s],2)
+ $C40=round([40%s],2)
+ $C41=round([41%s],2)
+ $C42=round([42%s],2)*(-1)
+ $C43=round([43%s],2)*(-1)
+ $C439=round([439%s],2)*(-1)
+ $C44=round([44%s],2)*(-1)
+ $C440=round([440%s],2)*(-1)
+ $C441=round([441%s],2)*(-1)
+ $C444=round([444%s],2)*(-1)
+ $C45=round([45%s],2)*(-1)
+ $C450=round([450%s],2)*(-1)
+ $C451=round([451%s],2)*(-1)
+ $C452=round([452%s],2)*(-1)
+ $C453=round([453%s],2)*(-1)
+ $C454=round([454%s],2)*(-1)
+$C455=round([455%s],2)*(-1)
+$C456=round([456%s],2)*(-1)
+$C457=round([457%s],2)*(-1)
+$C458=round([458%s],2)*(-1)
+ $C459=round([459%s],2)*(-1)
+ $C46=round([46%s],2)
+ $C47=round([47%s],2)*(-1)
+ $C48=round([48%s],2)*(-1)
+ $C49=round([49%s],2)
+ $C490=round([490%s],2)
+ $C491=round([491%s],2)
+ $C492=round([492%s],2)*(-1)
+ $C493=round([493%s],2)*(-1)
+ $C50=round([50%s],2)
+ $C51=round([51%s],2)
+ $C52=round([52%s],2)
+ $C53=round([53%s],2)
+ $C54=round([54%s],2)
+ $C55=round([55%s],2)
+ $C56=round([56%s],2)
+ $C57=round([57%s],2)
+ $C58=round([58%s],2)
+ $C60=round([60%s],2)
+ $C61=round([61%s],2)
+ $C62=round([62%s],2)
+ $C63=round([63%s],2)
+$C630=round([630%s],2)
+$C631=round([631%s],2)
+$C632=round([632%s],2)
+$C633=round([633%s],2)
+$C634=round([634%s],2)
+$C635=round([635%s],2)
+$C636=round([636%s],2)
+$C637=round([637%s],2)
  
- $C649=round([649%S],2)*(-1)
- $C64=round([64%S],2)
+ $C649=round([649%s],2)*(-1)
+ $C64=round([64%s],2)
 
- $C65=round([65%S],2)
- $C66=round([66%S],2)
- $C67=round([67%S],2)
- $C68=round([68%S],2)
- $C680=round([680%S],2)
-$C689=round([689%S],2)
- $C69=round([69%S],2)
- $C690=round([690%S],2)
- $C691=round([691%S],2)
- $C692=round([692%S],2)
- $C6920=round([6920%S],2)
- $C6921=round([6921%S],2)
- $C693=round([693%S],2)
- $C694=round([694%S],2)
- $C695=round([695%S],2)
- $C696=round([696%S],2)
+ $C65=round([65%s],2)
+ $C66=round([66%s],2)
+ $C67=round([67%s],2)
+ $C68=round([68%s],2)
+ $C680=round([680%s],2)
+$C689=round([689%s],2)
+ $C69=round([69%s],2)
+ $C690=round([690%s],2)
+ $C691=round([691%s],2)
+ $C692=round([692%s],2)
+ $C6920=round([6920%s],2)
+ $C6921=round([6921%s],2)
+ $C693=round([693%s],2)
+ $C694=round([694%s],2)
+ $C695=round([695%s],2)
+ $C696=round([696%s],2)
 
-$C7=round([7%S],2)*(-1)
- $C70=round([70%S],2)*(-1)
- $C71=round([71%S],2)*(-1)
- $C73=round([73%S],2)*(-1)
- $C72=round([72%S],2)*(-1)
- $C74=round([74%S],2)*(-1)
- $C75=round([75%S],2)*(-1)
- $C76=round([76%S],2)*(-1)
- $C77=round([77%S],2)*(-1)
-$C780=round([780%S],2)*(-1)
-$C789=round([789%S],2)*(-1)
- $C79=round([79%S],2)*(-1)
-$C790=round([790%S],2)*(-1)
-$C791=round([791%S],2)*(-1)
-$C792=round([792%S],2)*(-1)
-$C793=round([793%S],2)*(-1)
-$C794=round([794%S],2)*(-1)
+$C7=round([7%s],2)*(-1)
+ $C70=round([70%s],2)*(-1)
+ $C71=round([71%s],2)*(-1)
+ $C73=round([73%s],2)*(-1)
+ $C72=round([72%s],2)*(-1)
+ $C74=round([74%s],2)*(-1)
+ $C75=round([75%s],2)*(-1)
+ $C76=round([76%s],2)*(-1)
+ $C77=round([77%s],2)*(-1)
+$C780=round([780%s],2)*(-1)
+$C789=round([789%s],2)*(-1)
+ $C79=round([79%s],2)*(-1)
+$C790=round([790%s],2)*(-1)
+$C791=round([791%s],2)*(-1)
+$C792=round([792%s],2)*(-1)
+$C793=round([793%s],2)*(-1)
+$C794=round([794%s],2)*(-1)
 # Les formules (*-1)
 #
 $S1=abs($C2-$C29)

Modified: phpcompta/tags/rel650/include/class_impress.php
===================================================================
--- phpcompta/tags/rel650/include/class_impress.php     2012-07-01 15:42:31 UTC 
(rev 5063)
+++ phpcompta/tags/rel650/include/class_impress.php     2012-07-02 22:56:38 UTC 
(rev 5064)
@@ -208,8 +208,9 @@
         $p_string=str_replace("<=","+",$p_string);
         $p_string=str_replace(">","+",$p_string);
         $p_string=str_replace("<","+",$p_string);
-        // eat Space
+        // eat Space + comma
         $p_string=str_replace(" ","",$p_string);
+        $p_string=str_replace(",","",$p_string);
         // Remove D/C/S
         $p_string=str_replace("c","",$p_string);
         $p_string=str_replace("d","",$p_string);
@@ -219,13 +220,18 @@
 
                // remove date
                $p_string=  preg_replace("/FROM*=*[0-9]+/", "", $p_string);
+               // remove comment
+               $p_string=  preg_replace("/#.*/", "", $p_string);
+               // remove $C=
+               $p_string=  preg_replace('/\$[a-z]*[A-Z]*[0-9]*[A-Z]*[a-z]*/', 
"", $p_string);
+               $p_string=  preg_replace('/=/', "", $p_string);
 
                // remove account
                $p_string=  preg_replace("/\[[0-9]*[A-Z]*%*\]/", "", $p_string);
 
                $p_string=  preg_replace("/\+|-|\/|\*/", "", $p_string);
                $p_string=  preg_replace("/[0-9]*\.*[0-9]/", "", $p_string);
-               
+
                
//********************************************************************************************************************
                // If the string is empty then formula should be good
                //



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