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

rel8100

Browse source 
Merge branch 'master' into entreprise
This commit is contained in:
sparkyx 2021-03-12 19:19:00 +01:00
commit 3867346d28
297 changed files with 22561 additions and 7418 deletions
Download patch file Download diff file Expand all files Collapse all files

46
html/js/acc_ledger.js
View file

@ -1110,16 +1110,16 @@ function search_letter(obj)
function op_save(obj)
{
try {
var queryString = $(obj).serialize();
queryString += "&gDossier=" + obj.gDossier.value;
var queryString = $(obj).serialize(true);
queryString ["gDossier"]= obj.gDossier.value;
var rapt2 = "rapt" + obj.whatdiv.value;
queryString += "&rapt=" + g(rapt2).value;
queryString += '&jr_id=' + obj.jr_id.value;
queryString ["rapt"] = g(rapt2).value;
queryString ["jr_id"] = obj.jr_id.value;
var jr_id=obj.jr_id.value;
queryString += '&div=' + obj.whatdiv.value;
queryString ["div"]= obj.whatdiv.value;
var divid=obj.whatdiv.value;
queryString += '&act=save';
queryString += '&op=ledger';
queryString ["act"]="save";
queryString ["op"]="ledger";
waiting_box();
/*
@ -1130,7 +1130,7 @@ function op_save(obj)
var action = new Ajax.Request('ajax_misc.php',
{
method: 'post',
parameters: encodeURI(queryString),
parameters: queryString,
onFailure: null,
onSuccess: infodiv
}
@ -1301,8 +1301,8 @@ function manage_search_filter(p_obj) {
onSuccess:function(req) {
remove_waiting_box();
var x=posX;
var y=posY-20;
create_div({'id':'boxfilter'+p_obj.div,'cssclass':'inner_box','html':req.responseText,'style':'top:'+y+'px;left:'+x+'px;position:absolute;width:400px'});
var y=calcy(200)
create_div({'id':'boxfilter'+p_obj.div,'cssclass':'inner_box','html':req.responseText,'style':'top:'+y+'px;left:'+x+'px;position:absolute;width:400px',drag:1});
$('boxfilter'+p_obj.div).show();
}
});
@ -1319,8 +1319,9 @@ function manage_search_filter(p_obj) {
function save_filter(p_div,p_dossier) {
var elt=['ledger_type','nb_jrn','date_start','date_end',
'date_paid_start','date_paid_end','desc','amount_min','amount_max','qcode','accounting',
'operation_filter'];
'operation_filter','tag_option'];
var eltValue={};
var i =0;
eltValue['gDossier']=p_dossier;
eltValue['op']="save_filter";
eltValue['div']=p_div;
@ -1342,6 +1343,12 @@ function save_filter(p_div,p_dossier) {
eltValue['r_jrn'+i]=$(idx).value
}
}
//ledger's tags
var aTag=Array.from(document.getElementsByName(p_div+"tag[]"));
eltValue["tag[]"]=[];
for (i=0 ; i < aTag.length;i++) {
eltValue["tag[]"][i]=aTag[i].value;
}
new Ajax.Request('ajax_misc.php', {
method:"POST",
@ -1353,7 +1360,7 @@ function save_filter(p_div,p_dossier) {
/*Add the new list to the selection */
var new_item=document.createElement('li');
new_item.innerHTML=answer.filter_name;
new_item.setAttribute("id","li"+p_div+"_"+answer.filter_id);
new_item.setAttribute("id","manageli"+p_div+"_"+answer.filter_id);
$('manage'+p_div).appendChild(new_item);
$(p_div+"filter_new").value="";
} else {
@ -1381,7 +1388,7 @@ function load_filter(p_div,p_dossier,p_filter_id) {
var answer=req.responseJSON;
console.log(answer);
var elt=['ledger_type','date_start','date_end','date_paid_start','date_paid_end',
'desc','amount_min','amount_max','qcode','accounting','operation_filter'];
'desc','amount_min','amount_max','qcode','accounting','operation_filter','tag_option'];
for (var i=0;i<elt.length;i++) {
var idx=elt[i];
$(p_div+idx).value=answer[elt[i]];
@ -1406,8 +1413,15 @@ function load_filter(p_div,p_dossier,p_filter_id) {
eltHidden.setAttribute("value",answer.r_jrn[i]);
eltLedgerId.appendChild(eltHidden);
}
new Ajax.Request("ajax_misc.php",{
method:"get",
parameters:{"gDossier":p_dossier,"div":p_div,"op":"display_filter_tag","filter_id":p_filter_id,
uf_tag:answer.uf_tag},
onSuccess:function (req) {
$(p_div+'tag_choose_td').update(req.responseText);
}
})
} catch (e) {
smoke.alert(e.message);
@ -1491,17 +1505,13 @@ function duplicate_operation(p_dossier,p_jr_id) {
},
onSuccess:function(req) {
remove_waiting_box();
console.debug("success");
var xml=req.responseXML;
console.debug ("received"+xml);
if ( xml.getElementsByTagName("ctl").length==0) {
console.log("erreur"+req.responseText);
}
console.debug("ok we display");
add_div(duplicate_div);
console.debug (getNodeText(xml.getElementsByTagName("code")[0]));
console.debug("fill div");
duplicate_div.setStyle({"position":"fixed","top":"15%","z-index":"999",
"min-width":"30rem",
"left":"30%",