diff --git a/html/index.php b/html/index.php index 558e95876..d4d23b35e 100644 --- a/html/index.php +++ b/html/index.php @@ -175,7 +175,7 @@ if (isset ($_REQUEST['reconnect']) && isset ($_REQUEST['backurl'])) { } echo ' -Noalyss NOALYSS_VERSION - '.$my_domain.' +version NOALYSS_VERSION - '.$my_domain.'

diff --git a/html/js/card.js b/html/js/card.js index b744126ba..396a7a09f 100644 --- a/html/js/card.js +++ b/html/js/card.js @@ -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; diff --git a/include/constant.php b/include/constant.php index 86229d1ab..51a8f0d8e 100644 --- a/include/constant.php +++ b/include/constant.php @@ -88,7 +88,7 @@ define ('SMALLX','ⵝ'); define ('BUTTONADD',"✚"); -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",""); define ("UNPINDG",""); -//define ("UNPINDG","≊"); \ No newline at end of file +//define ("UNPINDG","≊"); diff --git a/include/lib/icard.class.php b/include/lib/icard.class.php index b228295fa..b020d6c59 100644 --- a/include/lib/icard.class.php +++ b/include/lib/icard.class.php @@ -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 diff --git a/include/lib/manage_table_sql.class.php b/include/lib/manage_table_sql.class.php index c18ce3137..9061fb737 100644 --- a/include/lib/manage_table_sql.class.php +++ b/include/lib/manage_table_sql.class.php @@ -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('', $this->object_name); @@ -939,7 +941,7 @@ function check() '', ''; echo ""; - + $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(); + } } /**