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

Merge branch 'dev-6919.8'

Browse source 
Conflicts:
	html/index.php
	html/js/card.js
	html/js/infobulle.js
	include/ajax/ajax_get_profile.php
	include/lib/class_html_input.php
	include/lib/icard.class.php
	include/lib/manage_table_sql.class.php
This commit is contained in:
Dany De Bontridder 2018-01-26 23:20:40 +01:00
commit 4d1117823c
5 changed files with 33 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
html/index.php
View file

@ -175,7 +175,7 @@ if (isset ($_REQUEST['reconnect']) && isset ($_REQUEST['backurl'])) {
}
echo '
<span style="background-color:#879ed4;color:white;padding-left:4px;padding-right:4px;">
Noalyss NOALYSS_VERSION - '.$my_domain.'
version NOALYSS_VERSION - '.$my_domain.'
</span>
<BR>
<BR>

7
html/js/card.js
View file

@ -722,14 +722,17 @@ function form_blank_card(obj)
*/
function save_card(obj)
{
var content=$(obj).ipopup;
if ($(obj)['av_text5']) {
var accounting= $(obj)['av_text5'];
if ( accounting && accounting.value.length > 40 ) {
smoke.alert('Poste comptable trop grand');
return false;
}
}
}
// Data must be taken here
data=$('save_card').serialize(false);
var data=$('save_card').serialize(false);
waiting_box();
var dossier=$('gDossier').value;
var queryString='gDossier='+dossier;

4
include/constant.php
View file

@ -88,7 +88,7 @@ define ('SMALLX','&#x2D5D;');
define ('BUTTONADD',"&#10010;");
define ('SVNINFO',NOALYSS_VERSION);
define ('SVNINFO',6919+8);
if ( ! defined ('DEBUG')) {
define ("DEBUG",false);
}
@ -313,4 +313,4 @@ define ('ICONON','icon-on.png');
define ('ICONOFF','icon-off.png');
define ("PINDG","&#xf047;");
define ("UNPINDG","&#xf192;");
//define ("UNPINDG","&#8778;");
//define ("UNPINDG","&#8778;");

12
include/lib/icard.class.php
View file

@ -136,6 +136,18 @@ class ICard extends HtmlInput
$this->style=' ';
$this->accvis=1; //!< account_visible =1 otherwise 0
}
/**
* @brief in the search box, the accounting will be hidden
*/
function hide_accounting() {
$this->accvis=0;
}
/**
* @brief in the search box, the accounting will be shown it is the default
*/
function show_accounting() {
$this->accvis=1;
}
/**
* @brief in the search box, the accounting will be hidden

17
include/lib/manage_table_sql.class.php
View file

@ -583,8 +583,9 @@ function check()
if ($this->can_append_row()==TRUE)
{
echo HtmlInput::button_action(" "._("Ajout"),
sprintf("%s.input('-1','%s')", $this->object_name,
sprintf("%s.input('-1','%s')",
$this->object_name), "xx", "smallbutton", BUTTONADD);
$this->object_name),"xx","smallbutton",BUTTONADD);
}
$nb_order=count($this->a_order);
$virg=""; $result="";
@ -614,8 +615,9 @@ function check()
if ($this->can_append_row()==TRUE)
{
echo HtmlInput::button_action(" "._("Ajout"),
sprintf("%s.input('-1','%s')", $this->object_name,
sprintf("%s.input('-1','%s')",
$this->object_name), "xx", "smallbutton", BUTTONADD);
$this->object_name),"xx","smallbutton",BUTTONADD);
}
printf('<script> alternate_row_color("tb%s");</script>',
$this->object_name);
@ -939,7 +941,7 @@ function check()
'</li>',
'</ul>';
echo "</form>";
$html=ob_get_contents();
ob_end_clean();
@ -1036,7 +1038,14 @@ function check()
*/
function save()
{
$this->table->save();
if ($this->table->exist()==0)
{
$this->table->insert();
}
else
{
$this->table->update();
}
}
/**