admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Now we want to add a card (autocomplete + search) we can give a different ledger than the current one

Browse source
This commit is contained in:
Dany De Bontridder 2010-08-08 16:41:33 +00:00
parent 7acef0849b
commit 1b5c936dda
5 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
html/js/card.js
View file

@ -54,6 +54,7 @@ function search_card(obj) {
'typecard':typecard,'query':string_to_search
});
showIPopup(obj.popup);
var action=new Ajax.Request ( 'ajax_card.php',
{
method:'get',
@ -283,7 +284,7 @@ function select_card_type(obj) {
queryString+='&fil='+filter;
// filter on the ledger, -1 if not
var oledger=$(obj).jrn;
if (oledger==undefined) {ledger=-1;} else {ledger=g('p_jrn').value;}
if (oledger==undefined) {ledger=-1;} else {ledger=$(obj).jrn;}
queryString+='&ledger='+ledger;

4
include/class_acc_ledger.php
View file

@ -1048,7 +1048,7 @@ jr_comment||' ('||jr_internal||')'||case when jr_pj_number is not null and jr_pj
$Res=$this->db->exec_sql("select jrn_Def_id,jrn_def_name,jrn_def_class_deb,jrn_def_class_cred,jrn_def_type,
jrn_deb_max_line,jrn_cred_max_line,jrn_def_ech,jrn_def_ech_lib,jrn_def_code,
jrn_def_fiche_deb,jrn_def_fiche_deb,jrn_def_pj_pref
jrn_def_fiche_deb,jrn_def_fiche_cred,jrn_def_pj_pref
from jrn_Def
where jrn_def_id=$1",array($this->id));
$Count=Database::num_row($Res);
@ -1317,7 +1317,7 @@ jr_comment||' ('||jr_internal||')'||case when jr_pj_number is not null and jr_pj
$f_add_button->label=_('Créer une nouvelle fiche');
$f_add_button->set_attribute('ipopup','ipop_newcard');
$f_add_button->set_attribute('jrn',$this->id);
$f_add_button->javascript=" select_card_type(this);";
$f_add_button->javascript=" this.jrn=\$('p_jrn').value;select_card_type(this);";
$ret.=$f_add_button->input();
// Load the javascript

2
include/class_acc_ledger_fin.php
View file

@ -182,7 +182,7 @@ class Acc_Ledger_Fin extends Acc_Ledger {
$f_add_button->label=_('Créer une nouvelle fiche');
$f_add_button->set_attribute('ipopup','ipop_newcard');
$f_add_button->set_attribute('jrn',$this->id);
$f_add_button->javascript=" select_card_type(this);";
$f_add_button->javascript=" this.jrn=\$('p_jrn').value;select_card_type(this);";
$str_add_button=$f_add_button->input();
// The first day of the periode

4
include/class_acc_ledger_purchase.php
View file

@ -727,14 +727,14 @@ array
$f_add_button->label=_('Créer une nouvelle fiche');
$f_add_button->set_attribute('ipopup','ipop_newcard');
$f_add_button->set_attribute('jrn',$this->id);
$f_add_button->javascript=" select_card_type(this);";
$f_add_button->javascript=" this.jrn=\$('p_jrn').value;select_card_type(this);";
$f_add_button2=new IButton('add_card2');
$f_add_button2->label=_('Créer une nouvelle fiche');
$f_add_button2->set_attribute('ipopup','ipop_newcard');
$f_add_button2->set_attribute('filter',$this->get_all_fiche_def ());
// $f_add_button2->set_attribute('jrn',$this->id);
$f_add_button2->javascript=" select_card_type(this);";
$f_add_button2->javascript=" this.jrn=\$('p_jrn').value;select_card_type(this);";
$str_add_button=$f_add_button->input();
$str_add_button2=$f_add_button2->input();

4
include/class_acc_ledger_sold.php
View file

@ -859,14 +859,14 @@ class Acc_Ledger_Sold extends Acc_Ledger {
$f_add_button->label=_('Créer une nouvelle fiche');
$f_add_button->set_attribute('ipopup','ipop_newcard');
$f_add_button->set_attribute('jrn',$this->id);
$f_add_button->javascript=" select_card_type(this);";
$f_add_button->javascript="this.jrn=\$('p_jrn').value; select_card_type(this);";
$f_add_button2=new IButton('add_card2');
$f_add_button2->label=_('Créer une nouvelle fiche');
$f_add_button2->set_attribute('ipopup','ipop_newcard');
$f_add_button2->set_attribute('filter',$this->get_all_fiche_def ());
// $f_add_button2->set_attribute('jrn',$this->id);
$f_add_button2->javascript=" select_card_type(this);";
$f_add_button2->javascript=" this.jrn=\$('p_jrn').value;select_card_type(this);";
$str_add_button=$f_add_button->input();
$str_add_button2=$f_add_button2->input();