From ccbbcf5eda1b4263021433254e32b15b8a522d26 Mon Sep 17 00:00:00 2001 From: sparkyx Date: Wed, 21 Jan 2026 16:36:21 +0100 Subject: [PATCH 1/2] Javascript correct Layer for Dialog Box --- html/js/accounting_item.js | 2 +- html/js/card.js | 4 ++-- html/js/gestion.js | 4 ++-- html/js/modele_document.js | 2 +- html/js/noalyss_script.js | 30 +++++++++++++++--------------- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/html/js/accounting_item.js b/html/js/accounting_item.js index d8f18af0a..841e69a68 100644 --- a/html/js/accounting_item.js +++ b/html/js/accounting_item.js @@ -273,7 +273,7 @@ function search_account_card(p_obj) onSuccess: function (req){ var pos=calcy(50); - var obj={id:"search_account_div",cssclass:"inner_box",style:"top:"+pos+"px", + var obj={id:"search_account_div",cssclass:"inner_box",style:"top:"+pos+"px;z-index:"+get_next_layer(), html:req.responseText}; add_div(obj); remove_waiting_box(); diff --git a/html/js/card.js b/html/js/card.js index 1ca042912..3f690e4d2 100644 --- a/html/js/card.js +++ b/html/js/card.js @@ -1215,7 +1215,7 @@ function modify_card(p_fiche_id) nTop = 170; } var str_top = fixed_position(250, nTop) - var str_style = str_top + ";width:45em;height:auto;position:absolute"; + var str_style = str_top + ";width:45em;height:auto;position:absolute"+"; z-index:"+get_next_layer(); var popup = {'id': content, 'cssclass': 'inner_box', 'style': str_style, 'html': loading(), 'drag': false}; @@ -1383,7 +1383,7 @@ function linked_card_option(p_action_person_id,p_dossier) { }, onSuccess:function(req) { remove_waiting_box(); - add_div({ "id":"d_linked_card_option",cssclass:"inner_box",style:"position:fixed;top:30%;min-width:20rem;width:auto;",drag:0}); + add_div({ "id":"d_linked_card_option",cssclass:"inner_box",style:"position:fixed;top:30%;min-width:20rem;width:auto;z-index:"+get_next_layer(),drag:0}); id$("d_linked_card_option").update(req.responseText); } diff --git a/html/js/gestion.js b/html/js/gestion.js index 6de51f234..44d6d7665 100644 --- a/html/js/gestion.js +++ b/html/js/gestion.js @@ -282,7 +282,7 @@ function action_show(p_dossier) parameters : {gDossier:p_dossier,'op':'action_show'}, onSuccess : function(p_xml, p_text) { remove_waiting_box(); - add_div({id: 'action_list_div', style:"position:fixed;top:1%;width:90%;left:5%" , cssclass: 'inner_box'}); + add_div({id: 'action_list_div', style:"position:fixed;top:1%;width:90%;left:5%;z-index:"+get_next_layer() , cssclass: 'inner_box'}); $('action_list_div').innerHTML=p_xml.responseText; var table_followup=document.getElementById('event_followup'); if ( table_followup) { sorttable.makeSortable(table_followup); } @@ -312,7 +312,7 @@ function action_add(p_dossier) { onSuccess : function(p_xml, p_text) { if (p_xml.responseText === 'NOCONX') { reconnect();return;} remove_waiting_box(); - add_div({id: 'action_add_div',style:'top:25px', + add_div({id: 'action_add_div',style:'top:25px;z-index:'+get_next_layer(), cssclass: 'inner_box'}); $('action_add_div').innerHTML=p_xml.responseText; p_xml.responseText.evalScripts(); diff --git a/html/js/modele_document.js b/html/js/modele_document.js index 3813caf9e..644b4d911 100644 --- a/html/js/modele_document.js +++ b/html/js/modele_document.js @@ -25,7 +25,7 @@ function modifyModeleDocument(p_value,dossier) id='det'+layer; var pos_y=posY+offsetY-20; var pos_x=posX+offsetX+40; - var style="position:absolute;top:"+pos_y+"px;left:10%;width:80%"; + var style="position:absolute;top:"+pos_y+"px;left:10%;width:80%;z-index:"+get_next_layer(); var popup={'id':'mod_doc', 'cssclass':'inner_box', 'html': loading(), diff --git a/html/js/noalyss_script.js b/html/js/noalyss_script.js index 714f61a4a..8d46b46c4 100644 --- a/html/js/noalyss_script.js +++ b/html/js/noalyss_script.js @@ -579,7 +579,7 @@ function cat_doc_change(p_dt_id, p_dossier) { var queryString = "gDossier=" + p_dossier + "&op=mod_cat_doc" + "&dt_id=" + p_dt_id; var nTop = calcy(posY); var nLeft = "200px"; - var str_style = "top:" + nTop + "px;left:" + nLeft + ";width:50em;height:auto"; + var str_style = "top:" + nTop + "px;left:" + nLeft + ";width:50em;height:auto"+"; z-index:"+get_next_layer(); removeDiv('change_doc_div'); waiting_box(); @@ -1170,7 +1170,7 @@ function display_periode(p_dossier, p_id) { 'id': 'mod_periode', 'cssclass': 'inner_box', 'html': loading(), - 'style': 'width:30em', + 'style': 'width:30em'+"; z-index:"+get_next_layer(), 'drag': true }; if (!document.getElementById('mod_periode')) { @@ -1295,7 +1295,7 @@ function fill_box(req) { function mod_predf_op(dossier_id, od_id, p_ledger) { var target = "mod_predf_op"; removeDiv(target); - var str_style = "top:10%;left:2%;width:96%"; + var str_style = "top:10%;left:2%;width:96%;"+"; z-index:"+get_next_layer(); var div = {id: target, cssclass: 'inner_box', style: str_style, html: loading(), drag: 1}; @@ -1582,7 +1582,7 @@ function mod_menu(gdossier, pm_id) { waiting_box(); removeDiv('divdm' + pm_id); var qs = "op=det_menu&gDossier=" + gdossier + "&pm_id=" + pm_id + "&ctl=divdm" + pm_id; - var pos = fixed_position(50, 250); + var pos = fixed_position(50, 250)+"; z-index:"+get_next_layer(); var action = new Ajax.Request('ajax_misc.php', { method: 'get', @@ -1690,7 +1690,7 @@ function add_menu(obj) { waiting_box(); removeDiv('divdm' + p_id); - var pos = fixed_position(250, 150) + ";width:50%;"; + var pos = fixed_position(250, 150) + ";width:50%;"+"; z-index:"+get_next_layer(); var action = new Ajax.Request('ajax_misc.php', { method: 'get', @@ -1736,7 +1736,7 @@ function add_plugin(p_dossier) { onSuccess: function (req) { try { remove_waiting_box(); - var pos = fixed_position(250, 150) + ";width:30%"; + var pos = fixed_position(250, 150) + ";width:30%"+"; z-index:"+get_next_layer(); add_div({id: "divplugin", drag: 1, cssclass: "inner_box", style: pos}); id$('divplugin').innerHTML = req.responseText; } catch (e) { @@ -1766,7 +1766,7 @@ function mod_plugin(p_dossier, me_code) { onSuccess: function (req) { try { remove_waiting_box(); - var pos = fixed_position(250, 150) + ";width:30%"; + var pos = fixed_position(250, 150) + ";width:30%"+"; z-index:"+get_next_layer(); add_div({id: "divplugin", drag: 1, cssclass: "inner_box", style: pos}); id$('divplugin').innerHTML = req.responseText; @@ -1791,7 +1791,7 @@ function create_menu(p_dossier) { onSuccess: function (req) { try { remove_waiting_box(); - var pos = fixed_position(250, 150) + ";width:30%"; + var pos = fixed_position(250, 150) + ";width:30%"+"; z-index:"+get_next_layer(); add_div({ id: "divmenu", drag: 1, @@ -1820,7 +1820,7 @@ function modify_menu(p_dossier, me_code) { onSuccess: function (req) { try { remove_waiting_box(); - var pos = fixed_position(250, 150) + ";width:30%"; + var pos = fixed_position(250, 150) + ";width:30%"+"; z-index:"+get_next_layer(); add_div({ id: "divmenu", drag: 1, @@ -2603,7 +2603,7 @@ function show_tag(p_dossier, p_ac, p_tag_id, p_post) { code_html = unescape_xml(code_html); remove_waiting_box(); var posy = calcy(250); - add_div({id: 'tag_div', cssclass: 'inner_box', drag: 0, style: "position:fixed;top:15%;"}); + add_div({id: 'tag_div', cssclass: 'inner_box', drag: 0, style: "position:fixed;top:15%; z-index:"+get_next_layer()}); id$('tag_div').innerHTML = code_html; try { code_html.evalScripts(); @@ -2670,7 +2670,7 @@ function action_tag_select(p_dossier, ag_id) { } var code_html = getNodeText(html[0]); code_html = unescape_xml(code_html); - var pos = fixed_position(35, 229); + var pos = fixed_position(35, 229)+"; z-index:"+get_next_layer(); add_div({id: 'tag_div', style: pos, cssclass: 'inner_box tag', drag: 0}); remove_waiting_box(); @@ -2806,7 +2806,7 @@ function search_display_tag(p_dossier, p_prefix, p_object) { var code_html = getNodeText(html[0]); code_html = unescape_xml(code_html); remove_waiting_box(); - add_div({id: p_prefix + 'tag_div', style: 'left:10%;width:70%', cssclass: 'inner_box', drag: 1}); + add_div({id: p_prefix + 'tag_div', style: 'left:10%;width:70%;z-index:'+get_next_layer(), cssclass: 'inner_box', drag: 1}); id$(p_prefix + 'tag_div').style.top = calcy(200) + "px" id$(p_prefix + 'tag_div').style.left = 20 + "%"; remove_waiting_box(); @@ -2966,7 +2966,7 @@ function calendar_zoom(obj) { obj.outdiv = 'calendar_zoom_div'; } if (id$(obj.outdiv) == undefined) { - var str_style = 'top:10%;min-height:60rem'; + var str_style = 'top:10%;min-height:60rem'+"; z-index:"+get_next_layer(); // var str_style = fixed_position(0, 120); add_div({ id: obj.outdiv, @@ -3464,7 +3464,7 @@ var Periode = function (p_ledger) { var y = 100; add_div({ "id": "mod_periode", - "style": "position:fixed;top:" + y + "px;width:50%", + "style": "position:fixed;top:" + y + "px;width:50%"+"; z-index:"+get_next_layer(), "cssclass": "inner_box", 'html': "wait" }); @@ -4026,7 +4026,7 @@ var operation_tag = function (p_div) { } var code_html = getNodeText(html[0]); code_html = unescape_xml(code_html); - var pos = fixed_position(35, 229); + var pos = fixed_position(35, 229)+"; z-index:"+get_next_layer(); add_div({id: 'tag_div', style: pos, cssclass: 'inner_box tag', drag: 0}); remove_waiting_box(); From 359938ccd227f8d04b5826106980997f7229eca0 Mon Sep 17 00:00:00 2001 From: sparkyx Date: Wed, 21 Jan 2026 16:37:07 +0100 Subject: [PATCH 2/2] VAT id 0% --- include/XMLDocument/xmlinvoice_reader.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/XMLDocument/xmlinvoice_reader.class.php b/include/XMLDocument/xmlinvoice_reader.class.php index b8c3518b7..6379cf524 100644 --- a/include/XMLDocument/xmlinvoice_reader.class.php +++ b/include/XMLDocument/xmlinvoice_reader.class.php @@ -115,8 +115,8 @@ class XMLInvoice_Reader extends XML_Reader $row ['description'] = $node->item($e)->getElementsByTagName("Description")->item(0)?->textContent; $row ['name'] = $node->item($e)->getElementsByTagName("Name")->item(0)->textContent; $row ['unit_price'] = $node->item($e)->getElementsByTagName("PriceAmount")->item(0)->textContent; - $row ['tva_id'] = $node->item($e)->getElementsByTagName("ID")->item(0)->textContent; - $row ['tva_percent'] = $node->item($e)->getElementsByTagName("Percent")->item(0)->textContent; + $row ['tva_id'] = $node->item($e)->getElementsByTagName("ID")->item(0)?->textContent; + $row ['tva_percent'] = $node->item($e)->getElementsByTagName("Percent")->item(0)?->textContent; $result[] = $row; } return $result;