[Phpcompta-dev] r4193 - in phpcompta/trunk: . html include

[phpcompta-dev]

Author: danydb
Date: 2011-09-02 02:28:42 +0200 (Fri, 02 Sep 2011)
New Revision: 4193

Modified:
   phpcompta/trunk/
   phpcompta/trunk/html/ajax_card.php
   phpcompta/trunk/html/ajax_misc.php
   phpcompta/trunk/include/class_fiche.php
   phpcompta/trunk/include/class_icard.php
   phpcompta/trunk/include/class_iposte.php
Log:
Merged revisions 4187-4192 via svnmerge from 
svn+ssh://address@hidden/svn/phpcompta/branches/rel560

........
  r4187 | danydb | 2011-08-03 22:43:06 +0200 (Wed, 03 Aug 2011) | 2 lines
  
  change button_close by anchor_close
........
  r4188 | danydb | 2011-09-01 10:43:56 +0200 (Thu, 01 Sep 2011) | 2 lines
  
  bug the table is always = 3
........
  r4189 | danydb | 2011-09-01 12:35:45 +0200 (Thu, 01 Sep 2011) | 2 lines
  
  update documentation
........
  r4190 | danydb | 2011-09-01 22:31:33 +0200 (Thu, 01 Sep 2011) | 2 lines
  
  Fix cosmetic bug : in card detail , the accounting is misplaced
........
  r4191 | danydb | 2011-09-02 02:26:40 +0200 (Fri, 02 Sep 2011) | 2 lines
  
  Bug = set upper case
........
  r4192 | danydb | 2011-09-02 02:27:21 +0200 (Fri, 02 Sep 2011) | 2 lines
  
  cosmetic : button_close instead of anchor_close
........



Property changes on: phpcompta/trunk
___________________________________________________________________
Name: svnmerge-integrated
   - /phpcompta/branches/rel560:1-4185
   + /phpcompta/branches/rel560:1-4192

Modified: phpcompta/trunk/html/ajax_card.php
===================================================================
--- phpcompta/trunk/html/ajax_card.php  2011-09-02 00:27:21 UTC (rev 4192)
+++ phpcompta/trunk/html/ajax_card.php  2011-09-02 00:28:42 UTC (rev 4193)
@@ -279,7 +279,7 @@
      *
      ----------------------------------------------------------------------*/
 case 'sc':
-  $html=HtmlInput::button_close($ctl);
+  $html=HtmlInput::anchor_close($ctl);
   $html.=h2info('Nouvelle fiche');
     if ( $user->check_action(FICADD)==1 )
     {

Modified: phpcompta/trunk/html/ajax_misc.php
===================================================================
--- phpcompta/trunk/html/ajax_misc.php  2011-09-02 00:27:21 UTC (rev 4192)
+++ phpcompta/trunk/html/ajax_misc.php  2011-09-02 00:28:42 UTC (rev 4193)
@@ -173,7 +173,7 @@
     $Res=$cn->exec_sql("select * from tva_rate order by tva_rate desc");
     $Max=Database::num_row($Res);
     $r="";
-    $r=HtmlInput::button_close('tva_select');
+    $r=HtmlInput::anchor_close('tva_select');
     $r.=h2info('Choississez la TVA ');
     $r.='<div >';
     $r.= '<TABLE style="padding-left:10%;padding-right:10%;width:80%">';

Modified: phpcompta/trunk/include/class_fiche.php
===================================================================
--- phpcompta/trunk/include/class_fiche.php     2011-09-02 00:27:21 UTC (rev 
4192)
+++ phpcompta/trunk/include/class_fiche.php     2011-09-02 00:28:42 UTC (rev 
4193)
@@ -580,7 +580,7 @@
                     $w->set_attribute('ipopup','ipop_account');
                     $w->set_attribute('account',"av_text".$r->ad_id);
                     //  account created automatically
-                    $w->table=1;
+                    $w->table=0;
                     //  account created automatically
                     $sql="select account_auto($this->fiche_def)";
                     $ret_sql=$this->cn->exec_sql($sql);
@@ -643,7 +643,7 @@
                      $w=new IPoste("av_text".$r->ad_id);
                      $w->set_attribute('ipopup','ipop_account');
                      $w->set_attribute('account',"av_text".$r->ad_id);
-                     $w->table=1;
+                     $w->table=0;
                      $bulle=HtmlInput::infobulle(14);
                      break;
                    case 'card':
@@ -974,7 +974,7 @@
                 }
 
                 // Normal traitement
-                $sql="update fiche_detail set ad_value=upper($1) where 
jft_id=$2";
+                $sql="update fiche_detail set ad_value=$1 where jft_id=$2";
                $this->cn->exec_sql($sql,array($value,$jft_id));
             }
         }

Modified: phpcompta/trunk/include/class_icard.php
===================================================================
--- phpcompta/trunk/include/class_icard.php     2011-09-02 00:27:21 UTC (rev 
4192)
+++ phpcompta/trunk/include/class_icard.php     2011-09-02 00:28:42 UTC (rev 
4193)
@@ -61,13 +61,7 @@
 // If double click call the javascript fill_ipopcard
   $W1->set_dblclick("fill_ipopcard(this);");
  
-// This attribute is mandatory, it is the name of the IPopup
-  $W1->set_attribute('ipopup','ipopcard');
- 
- // name of the field to update with the name of the card
-  $W1->set_attribute('label','e_client_label');
- 
-  // Type of card : deb, cred,
+  // Type of card : deb, cred or all
   $W1->set_attribute('typecard','deb');
  
   $W1->extra='deb';
@@ -81,10 +75,14 @@
 // when the data change
   $W1->javascript=sprintf(' onchange="fill_data_onchange(\'%s\');" ',
            $W1->name);
-  $f_client_qcode=$W1->input();
+
+ // name of the field to update with the name of the card
+  $W1->set_attribute('label','e_client_label');
   $client_label=new ISpan();
   $client_label->table=0;
   $f_client=$client_label->input("e_client_label",$e_client_label);
+
+  $f_client_qcode=$W1->input();
  
 // Search button for card
   $f_client_bt=$W1->search(); 
@@ -92,18 +90,9 @@
 For searching a card, you need a popup, the script card.js and set
 the values for card, popup filter_card callback
 @code
-echo JS_CARD;
- 
- 
-$search_card=new IPopup('ipop_card');
-$search_card->title=_('Recherche de fiche');
-$search_card->value='';
-echo $search_card->input();
- 
 $card=new ICard('acc');
 $card->name="acc";
 $card->extra="all";
-$card->set_attribute('popup','ipopcard');
 $card->set_attribute('typecard','all');
 $card->set_callback('filter_card');
  
@@ -159,6 +148,7 @@
     }
     /*!\brief return the html string for creating the ipopup, this ipopup
      * can be used for adding, modifying or display a card
+     address@hidden ipopup is obsolete, the popin is created by javascript
      *\param $p_name name of the ipopup, must be set after with set_attribute
     \code
       $f_add_button=new IButton('add_card');

Modified: phpcompta/trunk/include/class_iposte.php
===================================================================
--- phpcompta/trunk/include/class_iposte.php    2011-09-02 00:27:21 UTC (rev 
4192)
+++ phpcompta/trunk/include/class_iposte.php    2011-09-02 00:28:42 UTC (rev 
4193)
@@ -138,7 +138,7 @@
 
         /* create the button */
         $ibutton=$this->dsp_button();
-        if ( $this->table=3)
+        if ( $this->table==3)
         {
             $r='<table>'.tr(td($ibutton).td($itext->input()));
             $r.='</table>';