[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpcompta-dev] r188 - in trunk/amortis: . include include/template
|
From: |
phpcompta-dev |
|
Subject: |
[Phpcompta-dev] r188 - in trunk/amortis: . include include/template |
|
Date: |
Sun, 30 Oct 2011 18:15:54 +0100 (CET) |
Author: danydb
Date: 2011-10-30 18:15:52 +0100 (Sun, 30 Oct 2011)
New Revision: 188
Modified:
trunk/amortis/amortize_javascript.js
trunk/amortis/include/am_card.php
trunk/amortis/include/am_histo.inc.php
trunk/amortis/include/am_print.php
trunk/amortis/include/am_util.php
trunk/amortis/include/print_all.inc.php
trunk/amortis/include/print_fiche.inc.php
trunk/amortis/include/print_table.inc.php
trunk/amortis/include/template/listing_histo.php
trunk/amortis/include/template/listing_year.php
trunk/amortis/index.php
Log:
Adapt prototype.js
Modified: trunk/amortis/amortize_javascript.js
===================================================================
--- trunk/amortis/amortize_javascript.js 2011-09-08 17:50:04 UTC (rev
187)
+++ trunk/amortis/amortize_javascript.js 2011-10-30 17:15:52 UTC (rev
188)
@@ -3,8 +3,8 @@
*/
function add_material(dossier_id,plugin_code,target)
{
- var
qs="?gDossier="+dossier_id+'&plugin_code='+plugin_code+'&op=add_mat&t='+target;
-
+ var
qs="gDossier="+dossier_id+'&plugin_code='+plugin_code+'&op=add_mat&t='+target;
+
var action=new Ajax.Request ( 'ajax.php',
{
method:'get',
@@ -13,7 +13,7 @@
onSuccess:success_add_material
}
);
- if ( $(target))
+ if ( $(target))
{
removeDiv(target);
}
@@ -30,14 +30,14 @@
var str_style="top:"+sx+";width:50%;height:70%";
var div={id:target, cssclass:'op_detail',style:str_style,html:loading()};
-
+
add_div(div);
}
function display_material(dossier_id,f_id,plugin_code,target)
{
- var
qs="?gDossier="+dossier_id+'&plugin_code='+plugin_code+'&op=display_modify&t='+target+'&f='+f_id;
-
+ var
qs="gDossier="+dossier_id+'&plugin_code='+plugin_code+'&op=display_modify&t='+target+'&f='+f_id;
+
var action=new Ajax.Request ( 'ajax.php',
{
method:'get',
@@ -46,7 +46,7 @@
onSuccess:success_add_material
}
);
- if ( $(target))
+ if ( $(target))
{
removeDiv(target);
}
@@ -63,7 +63,7 @@
var str_style="top:"+sx+";width:50%;height:auto";
var div={id:target, cssclass:'op_detail',style:str_style,html:loading()};
-
+
add_div(div);
}
@@ -82,7 +82,7 @@
function save_new_material(obj)
{
- var querystring="?"+$(obj).serialize()+'&op=save_new_material&t=bxmat';
+ var querystring=$(obj).serialize()+'&op=save_new_material&t=bxmat';
// Create a ajax request to get all the person
var action = new Ajax.Request ('ajax.php',
@@ -94,7 +94,7 @@
}
);
- return false;
+ return false;
}
function success_save_new_material(req)
@@ -104,7 +104,7 @@
}
function save_modify(obj)
{
- var querystring="?"+$(obj).serialize()+'&op=save_modify&t=bxmat';
+ var querystring=$(obj).serialize()+'&op=save_modify&t=bxmat';
// Create a ajax request to get all the person
var action = new Ajax.Request ('ajax.php',
@@ -116,8 +116,8 @@
}
);
- return false;
-
+ return false;
+
}
function success_save_modify(req)
{
@@ -127,7 +127,7 @@
function remove_mat(g_dossier,plugin_code,a_id)
{
if ( ! confirm('Vous confirmez EFFACEMENT')) { return false;}
- var
qs="?gDossier="+g_dossier+"&plugin_code="+plugin_code+"&a_id="+a_id+"&op=rm&t=bxmat";
+ var
qs="gDossier="+g_dossier+"&plugin_code="+plugin_code+"&a_id="+a_id+"&op=rm&t=bxmat";
var action=new Ajax.Request ( 'ajax.php',
{
method:'get',
@@ -136,15 +136,15 @@
onSuccess:success_add_material
}
);
-
-
+
+
}
function list_csv(obj)
{
alert ("dossier = "+obj.dossier+" plugin :"+obj.plugin+" year "+obj.year);
- var
qs="?gDossier="+obj.dossier+"&plugin_code="+obj.plugin+"&list_year=1"+"&year="+obj.year;
+ var
qs="gDossier="+obj.dossier+"&plugin_code="+obj.plugin+"&list_year=1"+"&year="+obj.year;
var action=new Ajax.Request ( 'extension.raw.php',
{
method:'get',
@@ -153,6 +153,6 @@
onSuccess:null
}
);
-
+
}
\ No newline at end of file
Modified: trunk/amortis/include/am_card.php
===================================================================
--- trunk/amortis/include/am_card.php 2011-09-08 17:50:04 UTC (rev 187)
+++ trunk/amortis/include/am_card.php 2011-10-30 17:15:52 UTC (rev 188)
@@ -37,6 +37,7 @@
echo dossier::hidden();
echo HtmlInput::hidden('plugin_code',$_REQUEST['plugin_code']);
echo HtmlInput::hidden('sa',$_REQUEST['sa']);
+echo HtmlInput::hidden('ac',$_REQUEST['ac']);
$ck=new ICheckBox('all');
$ck->selected=(isset ($_GET['all']))?true:false;
echo '<p> Tous les biens y compris ceux qui sont complétement amortis
'.$ck->input();
Modified: trunk/amortis/include/am_histo.inc.php
===================================================================
--- trunk/amortis/include/am_histo.inc.php 2011-09-08 17:50:04 UTC (rev
187)
+++ trunk/amortis/include/am_histo.inc.php 2011-10-30 17:15:52 UTC (rev
188)
@@ -21,11 +21,11 @@
// Copyright Author Dany De Bontridder address@hidden
/*!\file
- * \brief print all
+ * \brief print all
*/
$sql="select quick_code,a_id,ha_id,h_amount,jr_internal,h_year,h_pj,vw_name
from amortissement.amortissement join amortissement.amortissement_histo using
(a_id) join vw_fiche_attr using(f_id) where h_amount > 0 order by vw_name";
-$array=$cn->get_array($sql);
+
if ( isset($_POST['remove']))
{
for ($i=0;$i<count($_POST['h']);$i++)
@@ -37,5 +37,6 @@
}
}
}
+$array=$cn->get_array($sql);
require_once('template/listing_histo.php');
Modified: trunk/amortis/include/am_print.php
===================================================================
--- trunk/amortis/include/am_print.php 2011-09-08 17:50:04 UTC (rev 187)
+++ trunk/amortis/include/am_print.php 2011-10-30 17:15:52 UTC (rev 188)
@@ -23,10 +23,10 @@
/*!\file
* \brief this file let you print a report about
* - card (simple listing)
- * - paid off of the selected year
+ * - paid off of the selected year
* - ...
*/
-$url='?'.dossier::get().'&plugin_code='.$_REQUEST['plugin_code'].'&sa=report';
+$url='?'.dossier::get().'&plugin_code='.$_REQUEST['plugin_code'].'&sa=report'."&ac=".$_REQUEST['ac'];
$menu=array(
array($url.'&sb=dfiche','Détail fiche',' Détail fiche ',1),
Modified: trunk/amortis/include/am_util.php
===================================================================
--- trunk/amortis/include/am_util.php 2011-09-08 17:50:04 UTC (rev 187)
+++ trunk/amortis/include/am_util.php 2011-10-30 17:15:52 UTC (rev 188)
@@ -24,7 +24,7 @@
* \brief let you generate the accounting for the paid off for a selected
* year history and remove
*/
-$url='?'.dossier::get().'&plugin_code='.$_REQUEST['plugin_code'].'&sa=util';
+$url='?'.dossier::get().'&plugin_code='.$_REQUEST['plugin_code'].'&sa=util'.'&ac='.$_REQUEST['ac'];
$menu=array(
array($url.'&sb=generate','Génére écriture',' Génération écriture
comptable ',1),
Modified: trunk/amortis/include/print_all.inc.php
===================================================================
--- trunk/amortis/include/print_all.inc.php 2011-09-08 17:50:04 UTC (rev
187)
+++ trunk/amortis/include/print_all.inc.php 2011-10-30 17:15:52 UTC (rev
188)
@@ -35,6 +35,7 @@
<form method="GET" action="extension.raw.php" style="display:inline">
<?=dossier::hidden()?>
<?=HtmlInput::hidden('material','1');?>
+<?=HtmlInput::hidden('ac',$_REQUEST['ac']);?>
<?=HtmlInput::extension()?>
<?=HtmlInput::submit('csv','Export CSV');?>
</form>
Modified: trunk/amortis/include/print_fiche.inc.php
===================================================================
--- trunk/amortis/include/print_fiche.inc.php 2011-09-08 17:50:04 UTC (rev
187)
+++ trunk/amortis/include/print_fiche.inc.php 2011-10-30 17:15:52 UTC (rev
188)
@@ -27,6 +27,7 @@
echo '<FORM METHOD="GET">';
echo HtmlInput::hidden('sa',$_REQUEST['sa']);
echo HtmlInput::hidden('sb',$_REQUEST['sb']);
+echo HtmlInput::hidden('ac',$_REQUEST['ac']);
echo HtmlInput::hidden('plugin_code',$_REQUEST['plugin_code']);
echo dossier::hidden();
$list=$cn->make_list('select fd_id from fiche_def where frd_id=7');
@@ -53,7 +54,7 @@
echo "Fiche ".$p_card->input().$p_card->search();
echo HtmlInput::submit('search','Accepter');
echo '</form>';
-
+
echo '<FORM METHOD="GET" ACTION="extension.raw.php">';
echo HtmlInput::hidden('sa',$_REQUEST['sa']);
echo HtmlInput::hidden('sb',$_REQUEST['sb']);
@@ -61,7 +62,7 @@
echo dossier::hidden();
echo HtmlInput::submit('pdf_all','Toutes les fiches en PDF');
echo '</form>';
-
+
if ( isset($_GET['search']))
{
$a=new Am_Card();
Modified: trunk/amortis/include/print_table.inc.php
===================================================================
--- trunk/amortis/include/print_table.inc.php 2011-09-08 17:50:04 UTC (rev
187)
+++ trunk/amortis/include/print_table.inc.php 2011-10-30 17:15:52 UTC (rev
188)
@@ -28,6 +28,7 @@
echo '<FORM METHOD="GET">';
echo HtmlInput::hidden('sa',$_REQUEST['sa']);
echo HtmlInput::hidden('sb',$_REQUEST['sb']);
+echo HtmlInput::hidden('ac',$_REQUEST['ac']);
echo HtmlInput::hidden('plugin_code',$_REQUEST['plugin_code']);
echo dossier::hidden();
$year=new INum('p_year');
Modified: trunk/amortis/include/template/listing_histo.php
===================================================================
--- trunk/amortis/include/template/listing_histo.php 2011-09-08 17:50:04 UTC
(rev 187)
+++ trunk/amortis/include/template/listing_histo.php 2011-10-30 17:15:52 UTC
(rev 188)
@@ -4,6 +4,7 @@
<?
echo HtmlInput::hidden('sa',$_REQUEST['sa']);
echo HtmlInput::hidden('sb',$_REQUEST['sb']);
+echo HtmlInput::hidden('ac',$_REQUEST['ac']);
echo HtmlInput::hidden('plugin_code',$_REQUEST['plugin_code']);
echo dossier::hidden();
?>
@@ -25,7 +26,7 @@
echo td($array[$i]['vw_name']);
echo td(nbm($array[$i]['h_amount']), 'align="right"');
echo td($array[$i]['h_year'],'align="center"');
-
+
echo td($array[$i]['h_pj']);
$msg='';
if ( $array[$i]['jr_internal'] != '' )
@@ -37,9 +38,9 @@
$ic=new ICheckBox('p_sel[]');
echo td($ic->input().HtmlInput::hidden('h[]',$array[$i]['ha_id']));
-
+
echo '</tr>';
endfor;
?>
Modified: trunk/amortis/include/template/listing_year.php
===================================================================
--- trunk/amortis/include/template/listing_year.php 2011-09-08 17:50:04 UTC
(rev 187)
+++ trunk/amortis/include/template/listing_year.php 2011-10-30 17:15:52 UTC
(rev 188)
@@ -2,7 +2,7 @@
<style>
@PAGE landscape {size: landscape;}
TABLE {PAGE: landscape;}
-</style>
+</style>
<table class="result">
<tr>
<th>Code</th>
@@ -24,7 +24,7 @@
echo td($fiche->strAttribut(ATTR_DEF_QUICKCODE));
echo td($fiche->strAttribut(ATTR_DEF_NAME));
echo td(format_date($array[$i]['a_date']));
-
+
echo td($array[$i]['a_start']);
echo td(nbm($array[$i]['a_amount']),'style="text-align:right"');
@@ -44,11 +44,11 @@
$pct=$cn->get_value("select ad_percentage from
amortissement.amortissement_detail
where a_id=$1 and ad_year = $2",
array($array[$i]['a_id'],$year));
-
+
echo td(nbm($remain),'style="text-align:right"');
echo td(nbm($amortize),'style="text-align:right"');
- echo td(nbm($pct),'style="text-align:right"');
+ echo td(nbm($pct),'style="text-align:right"');
echo td(nbm($toamortize),'style="text-align:right"');
echo '</tr>';
endfor;
@@ -81,6 +81,7 @@
<form method="GET" action="extension.raw.php">
<?=dossier::hidden()?>
<?=HtmlInput::hidden('list_year',$year);?>
+<?=HtmlInput::hidden('ac',$_REQUEST['ac']);?>
<?=HtmlInput::extension()?>
<?=HtmlInput::submit('csv','Export CSV');?>
</form>
Modified: trunk/amortis/index.php
===================================================================
--- trunk/amortis/index.php 2011-09-08 17:50:04 UTC (rev 187)
+++ trunk/amortis/index.php 2011-10-30 17:15:52 UTC (rev 188)
@@ -35,7 +35,7 @@
ob_clean();
echo create_script($j);
-$url='?'.dossier::get().'&plugin_code='.$_REQUEST['plugin_code'];
+$url='?'.dossier::get().'&plugin_code='.$_REQUEST['plugin_code'].'&ac='.$_REQUEST['ac'];
$cn=new Database (dossier::id());
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpcompta-dev] r188 - in trunk/amortis: . include include/template,
phpcompta-dev <=