diff --git a/html/js/card.js b/html/js/card.js index 02541d3aa..0ec07ff6c 100644 --- a/html/js/card.js +++ b/html/js/card.js @@ -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; diff --git a/include/class_acc_ledger.php b/include/class_acc_ledger.php index bd1553564..0f839c88f 100644 --- a/include/class_acc_ledger.php +++ b/include/class_acc_ledger.php @@ -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 diff --git a/include/class_acc_ledger_fin.php b/include/class_acc_ledger_fin.php index ca7e7851d..af011a70f 100644 --- a/include/class_acc_ledger_fin.php +++ b/include/class_acc_ledger_fin.php @@ -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 diff --git a/include/class_acc_ledger_purchase.php b/include/class_acc_ledger_purchase.php index 031442aae..832ddf536 100644 --- a/include/class_acc_ledger_purchase.php +++ b/include/class_acc_ledger_purchase.php @@ -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(); diff --git a/include/class_acc_ledger_sold.php b/include/class_acc_ledger_sold.php index 7947366fd..c3b06f7ea 100644 --- a/include/class_acc_ledger_sold.php +++ b/include/class_acc_ledger_sold.php @@ -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();