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

Synchro with stable

Browse source 
DO NOT INTEGRATE to pre-stable nor stable
This commit is contained in:
sparkyx 2024-09-23 11:32:47 +02:00
parent 333b36372a
commit 39e01d2a75
7 changed files with 15 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
html/install.php
View file

@ -168,7 +168,7 @@ content[203]="<?php echo _("Utilisateur de la base de donnée postgresql")?>";
content[204]="<?php echo _("Mot de passe de l'utilisateur de Postgresql")?>";
content[205]="<?php echo _("Port pour postgresql")?>";
content[206]="<?php echo _("En version mono dossier, le nom de la base de données doit être mentionné")?>";
content[207]="<?php echo _("Vous devez choisir si NOALYSS est installé sur un server mutualisé qui ne permet qu'une seule base de données")?>";
content[207]="<?php echo _("Vous devez choisir si NOALYSS est installé sur l'un de vos servers ou sur un server mutualisé qui ne donne qu'une seule base de données")?>";
content[208]="<?php echo _("Serveur postgresql")?>";
content[209]="<?php echo _("Mot de passe administrateur, il peut être changé ensuite dans les préférences")?>";
content[210]="<?php echo _("login administrateur")?>";

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

@ -402,8 +402,7 @@ class ICard extends HtmlInput
$this->callback=$p_name;
}
/**
* \brief set the javascript callback function
/**\brief set the javascript callback function
* by default it is update_value called AFTER an item has been selected
* \param $p_name callback function name
*/

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

@ -824,22 +824,11 @@ function check()
$ret=$this->table->seek($p_order, $p_array);
return $ret;
}
/**
* @brief echo the HTML to have a button add
* @return void
*/
protected function create_button_add() {
echo HtmlInput::button_action(" "._("Ajout"),
sprintf("%s.input('-1','%s')",
$this->object_name,
$this->object_name), "xx", "smallbutton", BUTTONADD);
}
/**
* @brief display the data of the table
* @param $p_order is the cond or order of the rows,
* if empty the primary key will be used
* @param $p_array array of the bind variables of the SQL ($p_order)
* @param $p_array array of the bind variables
* @note the function create_js_script MUST be called before this function
*/
function display_table($p_order="", $p_array=NULL)
@ -848,7 +837,10 @@ function check()
$nb=Database::num_row($ret);
if ($this->can_append_row()==TRUE && $this->button_add_top == true)
{
echo $this->create_button_add();
echo HtmlInput::button_action(" "._("Ajout"),
sprintf("%s.input('-1','%s')",
$this->object_name,
$this->object_name), "xx", "smallbutton", BUTTONADD);
}
$nb_order=count($this->a_order);
$virg=""; $result="";
@ -888,7 +880,10 @@ function check()
echo "</table>";
if ($this->can_append_row()==TRUE)
{
echo $this->create_button_add();
echo HtmlInput::button_action(" "._("Ajout"),
sprintf("%s.input('-1','%s')",
$this->object_name,
$this->object_name), "xx", "smallbutton", BUTTONADD);
}
printf('<script> alternate_row_color("tb%s");</script>',
$this->object_name);

4
include/sql/patch/upgrade201.sql
View file

@ -1,6 +1,6 @@
begin;
drop VIEW public.v_quant_detail;
drop VIEW if exists public.v_quant_detail;
CREATE OR REPLACE VIEW public.v_quant_detail
AS WITH quant AS (
@ -70,4 +70,4 @@ AS WITH quant AS (
;
insert into version (val,v_description) values (202,'Bug with reconcile, improve view');
commit;
commit;

1
include/tax_summary.inc.php
View file

@ -63,7 +63,6 @@ if ( $http->get("do","string","no") == "display")
echo '<span class="warning">';
echo $e->getMessage();
echo '</span>';
throw $e;
}
echo '<ul class="aligned-block">';

2
include/template/card_result.php
View file

@ -67,7 +67,7 @@ if ( $accvis == 1 ) :
<?php endfor; ?>
</table>
<span style="font-style: italic;">
<?php printf ( _("Nombre d'enregistrements trouvés:%s"),$total_card); ?>
<?php echo _("Nombre d'enregistrements trouvé:$total_card"); ?>
</span>
<br>
</div>

2
include/template/tax_summary_display.php
View file

@ -235,7 +235,7 @@ for ($i=0;$i < $nb_array;$i++):
// add a link to see the detail in ajax : ajax_ledger.php
$js_detail = $this->build_link_detail($dossier_id, $this->date_start, $this->date_end,$array[$i]['jrn_def_id'], $array[$i]['qp_vat_code']);
?>
<a href="javascript:void(0)" onclick="<?=$js_detail?>" class="super" >Détails</a>
<a href="javascript:void(0)" onclick="<?=$js_detail?>" class="super">Détails</a>
</td>
<td>
<?=$array[$i]['tva_rate']*100?>%