[Phpcompta-dev] r197 - in trunk: backup_noadmin/include/template importbank/include importbank/include/template tva

[phpcompta-dev]

Author: danydb
Date: 2011-11-27 21:34:55 +0100 (Sun, 27 Nov 2011)
New Revision: 197

Modified:
   trunk/backup_noadmin/include/template/home.php
   trunk/importbank/include/class_import_bank.php
   trunk/importbank/include/import_bank.php
   trunk/importbank/include/template/show_list.php
   trunk/tva/ajax.php
Log:

TVA : cosmetic + lettering 



Modified: trunk/backup_noadmin/include/template/home.php
===================================================================
--- trunk/backup_noadmin/include/template/home.php      2011-11-26 23:04:38 UTC 
(rev 196)
+++ trunk/backup_noadmin/include/template/home.php      2011-11-27 20:34:55 UTC 
(rev 197)
@@ -1,7 +1,8 @@
 <h2> Backup du dossier courant </h2>
 <form method="get" ACTION="extension.raw.php">
-Voulez-vous avoir une copie de ce dossier 
+Voulez-vous avoir une copie de ce dossier
 <?=HtmlInput::submit('backup','backup')?>
 <?=dossier::hidden()?>
 <?=HtmlInput::extension();?>
+<?=HtmlInput::hidden('ac',$_REQUEST['ac']);?>
 </form>
\ No newline at end of file

Modified: trunk/importbank/include/class_import_bank.php
===================================================================
--- trunk/importbank/include/class_import_bank.php      2011-11-26 23:04:38 UTC 
(rev 196)
+++ trunk/importbank/include/class_import_bank.php      2011-11-27 20:34:55 UTC 
(rev 197)
@@ -151,11 +151,11 @@
 
 
       }
-    $array=$cn->get_array('select a.id as id,to_char(i_date,\'DD.MM.YYYY 
HH24:MI\') as i_date,format_name
+    $array=$cn->get_array('select a.id as id,to_char(i_date,\'DD.MM.YYYY 
HH24:MI\') as i_date,format_name,jrn_def_id
                                from importbank.import as a
                                join importbank.format_bank as b on 
(format_bank_id=b.id)
                            where a.id=$1',array($p_id));
-    echo h2($array[0]['id']." ".$array[0]['i_date']." 
".$array[0]['format_name'],'');
+    echo h1($array[0]['id']." ".$array[0]['i_date']." 
".$array[0]['format_name'],'');
     $ret=$cn->exec_sql(" SELECT id ,ref_operation,tp_date, amount,
                                case when status='N' then 'Nouveau'
                                when status='T' then 'Transfèré'
@@ -170,6 +170,10 @@
                          FROM importbank.temp_bank
                          where import_id=$1 $sql_filter
                          order by tp_date,ref_operation,amount",array($p_id));
+       $jrn_name=$cn->get_value('select jrn_def_name from jrn_def where  
jrn_def_id=$1',array($array[0]['jrn_def_id']));
+       $jrn_account=$cn->get_value ("select ad_value from fiche_detail
+                                               where ad_id=1 and f_id=(select 
jrn_Def_bank from jrn_def where jrn_def_id=$1) "
+                       ,array($array[0]['jrn_def_id']));
     require_once('template/show_list.php');
 
 
@@ -329,6 +333,24 @@
                        $acc_reconc=new Acc_Reconciliation($cn);
                        $acc_reconc->set_jr_id($jr_id);
                        $acc_reconc->insert($row->tp_rec);
+                       // lettering
+                       $a_rec=$cn->get_array('select j_id
+                                                                               
from jrnx join jrn on (j_grpt=jr_grpt_id)
+                                                                         where
+                                                                         
f_id=$1 and jr_id=$2',array($row->f_id,$row->tp_rec));
+                       if ( count($a_rec) == 1 )
+                       {
+                               $a_target=$cn->get_array('select j_id
+                                                                               
from jrnx join jrn on (j_grpt=jr_grpt_id)
+                                                                         where
+                                                                         
f_id=$1 and jr_id=$2',array($row->f_id,$jr_id));
+                               if ( count($a_target)==1)
+                               {
+                                       $lc=new Lettering_Card($cn);
+                                       
$lc->insert_couple($a_rec[0]['j_id'],$a_target[0]['j_id']);
+                               }
+                       }
+
              }
 
             $sql2 = "update importbank.temp_bank set status = 
'T',tp_error_msg=null  where id=$1";

Modified: trunk/importbank/include/import_bank.php
===================================================================
--- trunk/importbank/include/import_bank.php    2011-11-26 23:04:38 UTC (rev 
196)
+++ trunk/importbank/include/import_bank.php    2011-11-27 20:34:55 UTC (rev 
197)
@@ -24,7 +24,7 @@
  */
 $format=new IText('format_name');
 $jrn_def=new ISelect('jrn_def');
-$jrn_def->value=$cn->make_array('select jrn_def_id,jrn_def_name from jrn_def 
where '.$user->get_ledger_sql('FIN',3).' order by jrn_def_name');
+$jrn_def->value=$cn->make_array('select jrn_def_id,jrn_def_name from jrn_def 
where '.$g_user->get_ledger_sql('FIN',3).' order by jrn_def_name');
 $sep_decimal=new ISelect('sep_dec');
 $sep_decimal->value=$adecimal;
 

Modified: trunk/importbank/include/template/show_list.php
===================================================================
--- trunk/importbank/include/template/show_list.php     2011-11-26 23:04:38 UTC 
(rev 196)
+++ trunk/importbank/include/template/show_list.php     2011-11-27 20:34:55 UTC 
(rev 197)
@@ -1,3 +1,4 @@
+<h2 class="info"> Journal cible = <?=$jrn_name?> Compte de ce journal 
<?=$jrn_account?></h2>
 <form method="get">
 
 Filtrer : <?=$filter->input()?>

Modified: trunk/tva/ajax.php
===================================================================
--- trunk/tva/ajax.php  2011-11-26 23:04:38 UTC (rev 196)
+++ trunk/tva/ajax.php  2011-11-27 20:34:55 UTC (rev 197)
@@ -7,7 +7,10 @@
 require_once('class_acc_ledger.php');
 
 extract($_GET);
+global $g_parameter;
 $cn=new Database($gDossier);
+$g_parameter=new Own($cn);
+
 $html='';$extra='';$ctl='';
 switch($act) {
 case 'dsp_decl':
@@ -52,11 +55,10 @@
   $count=$cn->get_value('select count(*) from tva_belge.declaration_amount 
where da_id=$1',array($_REQUEST['p_id']));
   if ( $count == 1 )
     {
-      $r='<div style="float:right"><a class="mtitle" href="javascript:void(0)" 
onclick="removeDiv(\'record_write\')">fermer</a></div>';
       $ctl='record_write';
       $ledger=new Acc_ledger($cn,0);
       $sel_ledger=$ledger->select_ledger('ODS',1);
-      $r.=h2info('Génération écriture');
+      $r=HtmlInput::title_box('Génération écriture','record_write');
          if ($sel_ledger != null)
          {
                  $r.='<form onsubmit="save_write(this);return false;">';