[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 208/219: Fix search for reconcile
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 208/219: Fix search for reconcile |
Date: |
Mon, 18 Dec 2017 13:23:04 -0500 (EST) |
sparkyx pushed a commit to branch master
in repository noalyss.
commit 9fd316ccd493f6e20ef812fed93f8255f3e22d21
Author: Dany De Bontridder <address@hidden>
Date: Sat Dec 16 00:05:34 2017 +0100
Fix search for reconcile
---
html/js/scripts.js | 50 ++++++++++++++++++++-----------
include/ajax/ajax_ledger.php | 2 +-
include/ajax/ajax_search_operation.php | 27 +++++++++--------
include/lib/iconcerned.class.php | 4 ++-
include/template/ledger_detail_bottom.php | 1 +
5 files changed, 52 insertions(+), 32 deletions(-)
diff --git a/html/js/scripts.js b/html/js/scripts.js
index 284ae72..e34c053 100644
--- a/html/js/scripts.js
+++ b/html/js/scripts.js
@@ -1247,10 +1247,11 @@ function save_predf_op(obj)
* @param {type} ctl_concern
* @param {type} amount_id
* @param {type} ledger
- * @param {type} p_id_target
+ * @param {type} p_id_targetDom Element (div) where to display the search
result
+ * @param p_tiers id of the Tiers
* @returns {undefined}
*/
-function search_reconcile(dossier, ctl_concern, amount_id, ledger, p_id_target)
+function search_reconcile(dossier, ctl_concern, amount_id, ledger,
p_id_target,p_tiers)
{
var dossier = g('gDossier').value;
if (amount_id === undefined)
@@ -1268,24 +1269,31 @@ function search_reconcile(dossier, ctl_concern,
amount_id, ledger, p_id_target)
amount_id = $(amount_id).innerHTML;
}
}
-
- var target = "search_op";
- removeDiv(target);
+ var tiers=""
+ if ( p_tiers ) tiers=p_tiers;
+ var target = "";
+ if ( p_id_target !="") {
+ target=p_id_target;
+ }else {
+ target = "search"+layer;
+ removeDiv(target);
+ }
var str_style = fixed_position(77, 99);
str_style += ";width:92%;overflow:auto;";
waiting_box();
- var target = {gDossier: dossier,
+ var param_send = {gDossier: dossier,
ctlc: ctl_concern,
op: 'search_op',
- ctl: target,
ac: 'JSSEARCH',
amount_id: amount_id,
ledger: ledger,
- target: p_id_target};
+ target: target,
+ tiers:tiers
+ };
- var qs = encodeJSON(target);
+ var qs = encodeJSON(param_send);
var action = new Ajax.Request('ajax_misc.php',
{
@@ -1294,9 +1302,9 @@ function search_reconcile(dossier, ctl_concern,
amount_id, ledger, p_id_target)
onFailure: null,
onSuccess: function (req) {
remove_waiting_box();
- var div = {id: 'search_op', cssclass: 'inner_box', style:
str_style, drag: 1};
+ var div = {id: target, cssclass: 'inner_box', style:
str_style, drag: 1};
add_div(div);
- $('search_op').innerHTML = req.responseText;
+ $(target).innerHTML = req.responseText;
req.responseText.evalScripts();
}
}
@@ -1310,8 +1318,11 @@ function search_operation(obj)
try {
var dossier = g('gDossier').value;
waiting_box();
- var target = "search_op";
- var qs = Form.serialize('search_form_ajx') +
"&op=search_op&ctl=search_op";
+ var target = "search"+layer;
+ if ( $(obj)["target"] ) {
+ target=$(obj)["target"].value;
+ }
+ var qs = Form.serialize('search_form_ajx') + "&op=search_op";
var action = new Ajax.Request('ajax_misc.php',
{
method: 'get',
@@ -1319,7 +1330,7 @@ function search_operation(obj)
onFailure: null,
onSuccess: function (req) {
remove_waiting_box();
- $('search_op').innerHTML = req.responseText;
+ $(target).innerHTML = req.responseText;
req.responseText.evalScripts();
}
}
@@ -1342,12 +1353,14 @@ function set_reconcile(obj)
try
{
+ console.log(obj.elements);
var ctlc = obj.elements['ctlc'];
+ var tiers=obj.elements['tiers'];
if ( ! obj.elements['target']) return;
var target = obj.elements['target'].value;
for (var e = 0; e < obj.elements.length; e++)
{
-
+
var elmt = obj.elements[e];
if (elmt.type === "checkbox")
{
@@ -1359,15 +1372,16 @@ function set_reconcile(obj)
$(ctlc.value).value += ',';
} else {
- if (target != "" && $(target).value == "") {
- $(target).value = elmt.value;
+
+ if (tiers && tiers.value != "") {
+ $(tiers.value).value = elmt.value;
}
}
$(ctlc.value).value += nValue;
}
}
}
- removeDiv('search_op');
+ removeDiv(obj.elements['target'].value);
}
catch (e)
{
diff --git a/include/ajax/ajax_ledger.php b/include/ajax/ajax_ledger.php
index ed2de19..ca13c49 100644
--- a/include/ajax/ajax_ledger.php
+++ b/include/ajax/ajax_ledger.php
@@ -184,7 +184,7 @@ case 'de':
$op->get();
/* return an obj. ACH / FIN or VEN or null if nothing is found*/
$obj=$op->get_quant();
-
+
$oLedger=new Acc_Ledger($cn,$ledger);
if ( $obj==null || $obj->signature == 'ODS' )
{
diff --git a/include/ajax/ajax_search_operation.php
b/include/ajax/ajax_search_operation.php
index 0cacac1..109f4e4 100644
--- a/include/ajax/ajax_search_operation.php
+++ b/include/ajax/ajax_search_operation.php
@@ -38,6 +38,8 @@ require_once NOALYSS_INCLUDE.'/class/user.class.php';
$base=basename($_SERVER['SCRIPT_NAME']);
$inside=false;
+$tiers=$http->get("tiers","string","");
+// With the amount id, we find the amount in a html elt
if (isset($_GET['amount_id']))
{
put_global(array(
@@ -45,8 +47,8 @@ if (isset($_GET['amount_id']))
array("key"=>'amount_max','value'=>$_GET['amount_id'])
));
}
-
-$ledger=new Acc_Ledger_Search('ALL',1,'search_op');
+$target=$http->get("target","string","");
+$ledger=new Acc_Ledger_Search('ALL',1,$target);
if ($base == 'recherche.php' || $base == 'do.php')
{
@@ -55,18 +57,18 @@ if ($base == 'recherche.php' || $base == 'do.php')
}
else
{
- $div='search_op';
$action="";
$callback="";
- echo HtmlInput::title_box(_('Recherche'), $div);
+ echo HtmlInput::title_box(_('Recherche'), $target);
echo '<form name="search_form_ajx" id="search_form_ajx"
onsubmit="search_operation(this);return false">';
- echo HtmlInput::get_to_hidden(array('ctlc','ledger','target'));
+ echo HtmlInput::get_to_hidden(array('ctlc','ledger'));
+ echo HtmlInput::hidden("target",$target);
$inside=true;
}
-
+echo HtmlInput::hidden("tiers",$tiers);
echo $ledger->search_form();
echo HtmlInput::submit("viewsearch",_("Recherche"));
-echo HtmlInput::button_close('search_op');
+echo HtmlInput::button_close($target);
echo '</form>';
if ( isset ($_GET['amount_min'])&& isset($_GET['amount_max'])&&
($_GET['amount_max']!=0 ||$_GET['amount_min']!=0 ))
@@ -96,11 +98,11 @@ if ( isset ($_GET['viewsearch']) )
else
$array=$_GET;
$array['p_action']='ALL';
- if ( ! isset ($array['date_start']) || ! isset ($array['date_end']))
- {
- // get first date of current exercice
-
list($array['date_start'],$array['date_end'])=$g_user->get_limit_current_exercice();
- }
+ if ( ! isset ($array['date_start']) || ! isset ($array['date_end']))
+ {
+ // get first date of current exercice
+
list($array['date_start'],$array['date_end'])=$g_user->get_limit_current_exercice();
+ }
list($sql,$where)=$ledger->build_search_sql($array);
// Count nb of line
@@ -117,6 +119,7 @@ if ( isset ($_GET['viewsearch']) )
if ($step<$max_line ) echo '<h2 class="notice">'._('Liste limitée à
').$step._(' enregistrements. Le nombre d\'enregistrements trouvés est de ')
.$max_line.'</h2>';
}
echo '<form method="get" onsubmit="set_reconcile(this);return false">';
+ echo HtmlInput::hidden("tiers",$tiers);
echo HtmlInput::submit("upd_rec",_("Mettre à jour"));
echo HtmlInput::get_to_hidden(array('ctlc','amount_id','ledger'));
echo
HtmlInput::get_to_hidden(array('l','date_start','date_end','desc','amount_min','amount_max','qcodesearch_op','accounting','unpaid','gDossier','ledger_type'));
diff --git a/include/lib/iconcerned.class.php b/include/lib/iconcerned.class.php
index 7282be0..ef8fbf9 100644
--- a/include/lib/iconcerned.class.php
+++ b/include/lib/iconcerned.class.php
@@ -37,6 +37,7 @@ class IConcerned extends HtmlInput
$this->paid='';
$this->id=$p_id;
$this->tiers=""; // id of the field for the tiers to be updated
+ $this->div=""; // Dom Element to show the search result
}
/*!\brief show the html input of the widget*/
public function input($p_name=null,$p_value=null)
@@ -49,7 +50,7 @@ class IConcerned extends HtmlInput
$r=sprintf("
- <image
onclick=\"search_reconcile(".dossier::id().",'%s','%s','%s','%s')\"
class=\"image_search\" src=\"image/magnifier13.png\" />
+ <image
onclick=\"search_reconcile(".dossier::id().",'%s','%s','%s','%s','%s')\"
class=\"image_search\" src=\"image/magnifier13.png\" />
<INPUT TYPE=\"text\"
style=\"color:black;background:lightyellow;border:solid 1px grey;\"
NAME=\"%s\" ID=\"%s\" VALUE=\"%s\" SIZE=\"8\" readonly>
<INPUT class=\"smallbutton\"
TYPE=\"button\" onClick=\"$('%s').value=''\" value=\"X\">
@@ -58,6 +59,7 @@ class IConcerned extends HtmlInput
$this->name,
$this->amount_id,
$this->paid,
+ $this->div,
$this->tiers,
$this->name,
$this->id,
diff --git a/include/template/ledger_detail_bottom.php
b/include/template/ledger_detail_bottom.php
index c8c4061..b83000a 100644
--- a/include/template/ledger_detail_bottom.php
+++ b/include/template/ledger_detail_bottom.php
@@ -207,6 +207,7 @@ if ($aRap != null ) {
if ( $access=='W') {
$wConcerned=new IConcerned("rapt".$div);
$wConcerned->amount_id=$obj->det->jr_montant;
+ $wConcerned->div="search_reconcile";
echo $wConcerned->input();
}
- [Noalyss-commit] [noalyss] 14/219: Infobulle : warning : esthetic, (continued)
- [Noalyss-commit] [noalyss] 14/219: Infobulle : warning : esthetic, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 44/219: fix minor bug + doc, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 46/219: Manage_Table : Improve Javascript for adding / removing row of table, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 27/219: Task #0001443: opérations rapprochées : bug quand on utilise des tva avec autoliquidation Check with the view v_quant_detail and take into account the negative VAT, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 33/219: Task #0001324: Afficher la date (période) dans FSALDO, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 198/219: Task #001381 : reinitialize the search_form, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 154/219: Task #1440 CA - opération diverses inaccessibles Task #1370 les OD en comptabilité analytique - problème., Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 209/219: Merge branch 'master' of ns3:/srv/git/noalyss, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 186/219: Protect queryString with encodeURI, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 207/219: Task #1381 Change esthetic Search Filter, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 208/219: Fix search for reconcile,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 157/219: Fix issue with open_basedir, sometime set in the server config, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 196/219: Task #001381 : favori de filtre , table pour sauvegarder, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 109/219: Add button to pin the box, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 134/219: #0001414: LETTRAGE - montants différents non indiqués Apparation d'une bulle d'info avec la différence, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 147/219: ANC : ANC_TABLE replace PGPLSQL procedure by Php functions : Anc_Table:create_temp_account Anc_Table:create_temp_card, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 20/219: Add new theme and modify tmp_pcmn, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 180/219: Fix ID problem, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 89/219: Cosmetic : cache certaines colonnes pour petit écran, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 22/219: Esthetic change icon edit, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 165/219: Task #1476 : add an new column to TMP_PCMN Adapt the add and update for CFGPCMN Code cleaning : rewrite of Acc_Account + PhpUnit test, Dany De Bontridder, 2017/12/18