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

Merge branch 'unstable' of gitlab.com:noalyss/noalyss into unstable

Browse source 
* 'unstable' of gitlab.com:noalyss/noalyss:
  bug : followup order
  Ajax call check_vatnumber must no block
  Documentation
This commit is contained in:
sparkyx 2024-07-27 17:54:36 +02:00
commit a026155f19
4 changed files with 15 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

22
html/ajax_misc.php
View file

@ -36,13 +36,19 @@
*
*/
if ( ! defined('ALLOWED')) define ('ALLOWED',1);
require_once '../include/constant.php';
require_once NOALYSS_INCLUDE."/lib/ac_common.php";
global $http;
$http=new HttpInput();
try {
$op= $http->request("op");
if ($op =='check_vatnumber') session_write_close();
} catch (\Exception $e) {
exit();
}
/* we ask a dg box for disconnecting */
if ($http->request('op',"string","") == 'disconnect') {
@ -60,24 +66,12 @@ if ( ! isset($_SESSION[SESSION_KEY."g_user"])) {
mb_internal_encoding("UTF-8");
$var = array( 'op');
$cont = 0;
/* check if mandatory parameters are given */
foreach ($var as $v)
{
if (!isset($_REQUEST [$v]))
{
echo "$v is not set ";
$cont = 1;
}
}
// If not connected to a folder
if ( ! isset($_REQUEST['gDossier'])) {
$gDossier=0;
}
if ($cont != 0) exit();
extract($_REQUEST, EXTR_SKIP );

1
include/ajax/ajax_check_vatnumber.php
View file

@ -91,6 +91,7 @@ EOF;
} else {
$obj->status = 'NOK';
$obj->html=_('non valide');
}
echo json_response($obj);

3
include/class/follow_up.class.php
View file

@ -696,6 +696,7 @@ class Follow_Up
{
// for the sort
$arg=HtmlInput::get_to_string(array("closed_action", "remind_date_end", "remind_date", "sag_ref", "only_internal", "state", "qcode", "ag_dest_query", "action_query", "tdoc", "date_start", "date_end", "hsstate", "searchtag"),"");
$arg=($arg!="")?"&$arg":"";
$url=$p_base.$arg;
$table=new Sort_Table();
@ -717,7 +718,7 @@ class Follow_Up
//7
$table->add(_('Etat'), $url, 'order by s_value asc', 'order by s_value desc', 'ea', 'ed');
// 8
$table->add(_('Dernier comm.'), $url, 'order by last_comment_date nulls last', 'order by last_comment_date desc nulls last', 'dca', 'dcd');
$table->add(_('Dernier comm.'), $url, 'order by coalesce(last_comment_date, ag.ag_timestamp) asc', 'order by coalesce(last_comment_date, ag.ag_timestamp) desc', 'dca', 'dcd');
// 9
$table->add(_('Priorité'), $url, 'order by ag_priority ', 'order by ag_priority desc ', 'pra', 'prd');
$http=new HttpInput();

6
include/lib/itva_popup.class.php
View file

@ -110,7 +110,9 @@ class ITva_Popup extends HtmlInput
return $r;
}
/*!\brief show the html input of the widget*/
/*!
\brief show the html input of the widget
*/
public function input($p_name = null, $p_value = null)
{
$this->name = ($p_name == null) ? $this->name : $p_name;
@ -160,7 +162,7 @@ list="dl_tva_%s" autocomplete="off">';
}
/**
* Set a filter to limit the choice of VAT ;
*@brief Set a filter to limit the choice of VAT ;
* possible values are :
* - sale if there is an accounting for sale
* - purchase if there is an accounting for purchase