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

Merge branch 'stable' into pre-stable

Browse source 
* stable:
  Cosmetic : Button to confirm, duplicate, ... more visible and coherent
  Cosmetic : Order number and bank message in confirm operation (sale - purcharse)
  merge gitignore
This commit is contained in:
sparkyx 2025-12-27 12:43:17 +01:00
commit e7ce31b66a
12 changed files with 166 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitignore vendored
View file

@ -47,10 +47,6 @@ local/*
.idea/* .idea/*
include/tfpdf/font/unifont/* include/tfpdf/font/unifont/*
html/ads.html html/ads.html
<<<<<<< HEAD
/nbproject/private/
=======
doc/code/* doc/code/*
nbproject/private/ nbproject/private/
>>>>>>> unstable

44
html/css/style-classic7.css
View file

@ -1500,7 +1500,6 @@ div#jrn_name_div
div#jrn_name_div div#jrn_name_div
{ {
float: right; float: right;
margin-right:2%;
display:block; display:block;
} }
} }
@ -4238,4 +4237,45 @@ span.nb-round {
background-color: var(--bg-inner-box); background-color: var(--bg-inner-box);
margin-left: 2px; margin-left: 2px;
color:navy; color:navy;
} }
/*
* Tab : when show the operation to confirm
*/
#document_div_id {
height:185px;
height:10rem;
}
/**
* Button to confirm operation
*/
.bt-center {
margin-bottom: 2rem;
}
.bt-center .aligned-block {
margin-left: 10px;
}
.bt-center .aligned-block .button {
font-size:115%;
margin-left: 10px;
}
@media (min-width: 576px) {
.bt-center .aligned-block {
margin-left: min(40%,70rem);
font-size:120%;
}
}
/* LarGe */
@media (min-width: 992px) {
.bt-center .aligned-block {
font-size:120%;
margin-left: min(40%,70rem);
font-size:120%;
}
}

7
include/class/acc_ledger.class.php
View file

@ -3377,7 +3377,7 @@ class Acc_Ledger extends jrn_def_sql
$url=http_build_query(array('ac'=>$_REQUEST['ac'], 'gDossier'=>$_REQUEST['gDossier'], $url=http_build_query(array('ac'=>$_REQUEST['ac'], 'gDossier'=>$_REQUEST['gDossier'],
'p_jrn'=>$_REQUEST['p_jrn'])); 'p_jrn'=>$_REQUEST['p_jrn']));
$button=HtmlInput::button_anchor(_("Nouvelle opération"), $button=HtmlInput::button_anchor(_("Nouvelle opération"),
'do.php?'.$url, "", "", "smallbutton"); 'do.php?'.$url, "", "", "button");
return '<p>'.$button.'</p>'; return '<p>'.$button.'</p>';
} }
@ -3415,7 +3415,7 @@ class Acc_Ledger extends jrn_def_sql
"ck".$i "ck".$i
)); ));
} }
echo HtmlInput::submit("copy_operation", _("Opération identique")); echo HtmlInput::submit("copy_operation", _("Opération identique"),p_class:"button");
echo '</FORM>'; echo '</FORM>';
} }
@ -3685,10 +3685,8 @@ EOF;
$supplemental_doc->setAlertOnSize(true); $supplemental_doc->setAlertOnSize(true);
$supplemental_doc->set_multiple(true); $supplemental_doc->set_multiple(true);
$r=""; $r="";
$r.='<p class="decale">';
$r.= _("Ajoutez des documents additionnels"); $r.= _("Ajoutez des documents additionnels");
$r.=$supplemental_doc->input(); $r.=$supplemental_doc->input();
$r.='</p>';
return $r; return $r;
} }
/** /**
@ -3703,6 +3701,7 @@ EOF;
return; return;
} }
$nb=count($_FILES['document_supplemental']["name"]); $nb=count($_FILES['document_supplemental']["name"]);
$a=0;
if ( $this->db->status() !== PGSQL_TRANSACTION_INTRANS ) { if ( $this->db->status() !== PGSQL_TRANSACTION_INTRANS ) {
$a=1; $a=1;
$this->db->start(); $this->db->start();

5
include/class/acc_ledger_purchase.class.php
View file

@ -2119,7 +2119,7 @@ EOF;
public function extra_info() public function extra_info()
{ {
$r=""; $r="";
$r = '<div id="facturation_div_id" style="height:185px;height:10rem">'; $r = '<div id="facturation_div_id" class="conf_op_extra_info">';
$r.='<p class="decale">'; $r.='<p class="decale">';
// check for upload piece // check for upload piece
$file=new IFile(); $file=new IFile();
@ -2140,8 +2140,9 @@ EOF;
" from document_modele where md_affect='ACH' order by 2"); " from document_modele where md_affect='ACH' order by 2");
$r.=$doc_gen->input().'<br>'; $r.=$doc_gen->input().'<br>';
} }
$r.='</p>';
$r.=$this->input_supplemental_document(); $r.=$this->input_supplemental_document();
$r.='<br>'; $r.='<p>';
$obj=new IText(); $obj=new IText();
$r.=_('Numero de bon de commande : ').$obj->input('bon_comm').'<br>'; $r.=_('Numero de bon de commande : ').$obj->input('bon_comm').'<br>';
$r.=_('Autre information : ').$obj->input('other_info').'<br>'; $r.=_('Autre information : ').$obj->input('other_info').'<br>';

34
include/compta_ach.inc.php
View file

@ -74,9 +74,17 @@ if (isset($_POST['view_invoice']))
echo $Ledger->confirm($_POST); echo $Ledger->confirm($_POST);
echo HtmlInput::hidden('ac', $ac); echo HtmlInput::hidden('ac', $ac);
$Ledger->input_extra_info(); $Ledger->input_extra_info();
echo HtmlInput::submit("record", _("Enregistrement"), 'onClick="return verify_ca(\'\');"'); echo '<div class="bt-center">';
echo HtmlInput::submit('correct', _("Corriger")); echo '<ul class="aligned-block">';
echo '</form>'; echo '<li>';
echo HtmlInput::submit("record", _("Confirmer"), 'onClick="return verify_ca(\'\');"', p_class: "button");
echo '</li>';
echo '<li>';
echo HtmlInput::submit('correct', _("Corriger"), p_class: "button");
echo '</li>';
echo '</ul>';
echo '</div>';
echo '</form>';
echo '</div>'; echo '</div>';
if (DEBUGNOALYSS>1) { echo "<!-- confirm_div_id -->";} if (DEBUGNOALYSS>1) { echo "<!-- confirm_div_id -->";}
return; return;
@ -179,6 +187,7 @@ if (isset($_POST['record']))
echo '<span class="warning">'._('Date invalide, opération non extournée').'</span>'; echo '<span class="warning">'._('Date invalide, opération non extournée').'</span>';
} }
} }
echo '<div class="bt-center">';
echo '<ul class="aligned-block">'; echo '<ul class="aligned-block">';
echo "<li>"; echo "<li>";
echo $Ledger->button_new_operation(); echo $Ledger->button_new_operation();
@ -188,6 +197,7 @@ if (isset($_POST['record']))
echo "</li>"; echo "</li>";
echo "</ul>"; echo "</ul>";
echo '</div>'; echo '</div>';
echo '</div>';
return; return;
} }
} }
@ -285,10 +295,20 @@ try
echo '</script>'; echo '</script>';
} }
echo '<div class="content">'; echo '<div class="content">';
echo HtmlInput::button('act', _('Actualiser'), echo '<div class="bt-center">';
'onClick="compute_all_ledger();"'); echo '<ul class="aligned-block">';
echo HtmlInput::submit("view_invoice", _("Enregistrer")); echo '<li>';
echo HtmlInput::reset(_('Effacer ')); echo HtmlInput::button('act', _('Actualiser'), 'onClick="compute_all_ledger();"', p_class: "button");
echo '</li>';
echo '<li>';
echo HtmlInput::submit("view_invoice", _("Enregistrer"), p_class: "button");
echo '</li>';
echo '<li>';
echo HtmlInput::reset(_('Effacer '), p_class: "button");
echo '</li>';
echo '</ul>';
echo '</div>';
echo '</div>'; echo '</div>';
echo "</FORM>"; echo "</FORM>";
} }

34
include/compta_fin.inc.php
View file

@ -85,9 +85,16 @@ if ( isset($_POST['save']))
echo '<form name="form_detail" class="print" enctype="multipart/form-data" class="print" METHOD="POST">'; echo '<form name="form_detail" class="print" enctype="multipart/form-data" class="print" METHOD="POST">';
echo HtmlInput::hidden('ac',$_REQUEST['ac']); echo HtmlInput::hidden('ac',$_REQUEST['ac']);
echo $Ledger->confirm($_POST); echo $Ledger->confirm($_POST);
echo HtmlInput::submit('confirm',_('Confirmer')); echo '<div class="bt-center">';
echo HtmlInput::submit('correct',_('Corriger')); echo '<ul class="aligned-block">';
echo '<li>';
echo HtmlInput::submit("confirm", _("Confirmer"), 'onClick="return verify_ca(\'\');"', p_class: "button");
echo '</li>';
echo '<li>';
echo HtmlInput::submit('correct', _("Corriger"), p_class: "button");
echo '</li>';
echo '</ul>';
echo '</div>';
echo '</form>'; echo '</form>';
echo '</div>'; echo '</div>';
return; return;
@ -132,7 +139,13 @@ if ( isset($_POST['confirm']))
echo '</div>'; echo '</div>';
echo '</div>'; echo '</div>';
echo '<div class="bt-center">';
echo '<ul class="aligned-block">';
echo '<li>';
echo $Ledger->button_new_operation(); echo $Ledger->button_new_operation();
echo '</li>';
echo '</ul>';
echo '</div>';
return; return;
} }
} }
@ -159,8 +172,19 @@ try
echo $Ledger->input($array); echo $Ledger->input($array);
echo Html_Input_Noalyss::ledger_add_item("F"); echo Html_Input_Noalyss::ledger_add_item("F");
echo HtmlInput::submit('save',_('Sauve')); echo '<div class="bt-center">';
echo HtmlInput::reset(_('Effacer')); echo '<ul class="aligned-block">';
/* echo '<li>';
echo HtmlInput::button('act', _('Actualiser'), 'onClick="checkTotalDirect()();"', p_class: "button");
echo '</li>';*/
echo '<li>';
echo HtmlInput::submit("save", _("Enregistrer"), p_class: "button");
echo '</li>';
echo '<li>';
echo HtmlInput::reset(_('Effacer '), p_class: "button");
echo '</li>';
echo '</ul>';
echo '</div>';
$script="update_name();"; $script="update_name();";
$e_date=$http->request("e_date","string",""); $e_date=$http->request("e_date","string","");

2
include/compta_ods.inc.php
View file

@ -124,6 +124,7 @@ if (!isset($_POST['summary']) && !isset($_POST['save'])) {
echo '<span class="warning">' . _('Date invalide, opération non extournée') . '</span>'; echo '<span class="warning">' . _('Date invalide, opération non extournée') . '</span>';
} }
} }
echo '<div class="bt-center">';
echo '<ul class="aligned-block">'; echo '<ul class="aligned-block">';
echo "<li>"; echo "<li>";
echo $ledger->button_new_operation(); echo $ledger->button_new_operation();
@ -132,6 +133,7 @@ if (!isset($_POST['summary']) && !isset($_POST['save'])) {
echo $ledger->button_copy_operation(); echo $ledger->button_copy_operation();
echo "</li>"; echo "</li>";
echo "</ul>"; echo "</ul>";
echo '</div>';
} catch (Exception $e) { } catch (Exception $e) {
require NOALYSS_INCLUDE . '/operation_ods_new.inc.php'; require NOALYSS_INCLUDE . '/operation_ods_new.inc.php';
alert($e->getMessage()); alert($e->getMessage());

35
include/compta_ven.inc.php
View file

@ -108,8 +108,15 @@ if ( isset ($_POST['view_invoice'] ) )
echo HtmlInput::hidden('ac',$strac); echo HtmlInput::hidden('ac',$strac);
$Ledger->input_extra_info(); $Ledger->input_extra_info();
echo HtmlInput::submit("record", _("Enregistrement"), 'onClick="return verify_ca(\'\');"'); echo '<div class="bt-center">';
echo HtmlInput::submit('correct', _("Corriger")); echo '<ul class="aligned-block">';
echo '<li>';
echo HtmlInput::submit("record", _("Confirmer"), 'onClick="return verify_ca(\'\');"',p_class:"button");
echo '</li>';
echo '<li>';
echo HtmlInput::submit('correct', _("Corriger"),p_class:"button");
echo '</li>';
echo '</div>';
echo '</form>'; echo '</form>';
echo '</div>'; echo '</div>';
if (DEBUGNOALYSS>1) { echo "<!-- confirm_div_id -->";} if (DEBUGNOALYSS>1) { echo "<!-- confirm_div_id -->";}
@ -320,6 +327,7 @@ if ( isset($_POST['record']) )
echo '<span class="warning">'._('Date invalide, opération non extournée').'</span>'; echo '<span class="warning">'._('Date invalide, opération non extournée').'</span>';
} }
} }
echo '<div class="bt-center">';
echo '<ul class="aligned-block">'; echo '<ul class="aligned-block">';
echo "<li>"; echo "<li>";
echo $Ledger->button_new_operation(); echo $Ledger->button_new_operation();
@ -329,6 +337,7 @@ if ( isset($_POST['record']) )
echo "</li>"; echo "</li>";
echo "</ul>"; echo "</ul>";
echo '</div>'; echo '</div>';
echo '</div>';
return; return;
} }
} }
@ -433,14 +442,24 @@ catch (Exception $e)
} }
echo '<div class="content">'; echo '<div class="content">';
echo '<div class="bt-center">';
echo '<ul class="aligned-block">';
echo '<li>';
echo HtmlInput::button('act', _('Actualiser'), 'onClick="compute_all_ledger();"', p_class: "button");
echo '</li>';
echo '<li>';
echo HtmlInput::submit("view_invoice", _("Enregistrer"), p_class: "button");
echo '</li>';
echo '<li>';
echo HtmlInput::reset(_('Effacer '), p_class: "button");
echo '</li>';
echo '</ul>';
echo '</div>';
echo HtmlInput::button('act',_('Actualiser'),'onClick="compute_all_ledger();"'); echo '</div>';
echo HtmlInput::submit("view_invoice",_("Enregistrer")); echo "</FORM>";
echo HtmlInput::reset(_('Effacer '));
echo '</div>';
echo "</FORM>";
/* if we suggest the pj n# the run the script */ /* if we suggest the pj n# the run the script */
if ( $g_parameter->MY_PJ_SUGGEST=='Y') if ( $g_parameter->MY_PJ_SUGGEST=='Y')
{ {
echo '<script> update_receipt()</script>'; echo '<script> update_receipt()</script>';

4
include/lib/html_input.class.php
View file

@ -240,9 +240,9 @@ class HtmlInput
return '<INPUT TYPE="button" class="'.$p_class.'" NAME="'.$p_name.'" ID="'.$p_name.'" VALUE="'.$p_value.'" '.$p_javascript.'>'; return '<INPUT TYPE="button" class="'.$p_class.'" NAME="'.$p_name.'" ID="'.$p_name.'" VALUE="'.$p_value.'" '.$p_javascript.'>';
} }
static function reset($p_value) static function reset($p_value,$p_class="smallbutton")
{ {
return '<INPUT TYPE="RESET" class="smallbutton" VALUE="'.$p_value.'">'; return '<INPUT TYPE="RESET" class="'.$p_class.'" VALUE="'.$p_value.'">';
} }
static function hidden($p_name, $p_value, $p_id="") static function hidden($p_name, $p_value, $p_id="")

12
include/operation_ods_confirm.inc.php
View file

@ -41,8 +41,14 @@ echo '<FORM METHOD="POST" enctype="multipart/form-data" class="print">';
echo HtmlInput::request_to_hidden(array('ac','p_currency_code','p_currency_rate')); echo HtmlInput::request_to_hidden(array('ac','p_currency_code','p_currency_rate'));
echo $ledger->confirm($_POST,false); echo $ledger->confirm($_POST,false);
echo $ledger->input_extra_info(); echo $ledger->input_extra_info();
echo HtmlInput::submit("save",_("Confirmer")); echo '<div class="bt-center">';
echo HtmlInput::submit("correct",_("Corriger")); echo '<ul class="aligned-block">';
echo '<li>';
echo HtmlInput::submit("save", _("Confirmer"), 'onClick="return verify_ca(\'\');"', p_class: "button");
echo '</li>';
echo '<li>';
echo HtmlInput::submit('correct', _("Corriger"), p_class: "button");
echo '</li>';
echo '</div>';
?> ?>
</FORM> </FORM>

17
include/operation_ods_new.inc.php
View file

@ -128,9 +128,24 @@ printf (_("Opération rapprochée : %s"),$iconcerned->input());
echo '<p>'; echo '<p>';
echo Html_Input_Noalyss::ledger_add_item("M"); echo Html_Input_Noalyss::ledger_add_item("M");
echo HtmlInput::submit('summary', _('Sauvez'));
echo '</p>'; echo '</p>';
echo '<div class="bt-center">';
echo '<ul class="aligned-block">';
echo '<li>';
echo HtmlInput::button('act', _('Actualiser'), 'onClick="checkTotalDirect()();"', p_class: "button");
echo '</li>';
echo '<li>';
echo HtmlInput::submit("summary", _("Enregistrer"), p_class: "button");
echo '</li>';
echo '<li>';
echo HtmlInput::reset(_('Effacer '), p_class: "button");
echo '</li>';
echo '</ul>';
echo '</div>';
echo '</form>'; echo '</form>';
echo "<script>checkTotalDirect();</script>"; echo "<script>checkTotalDirect();</script>";

11
include/template/acc_ledger-input_extra_info.php
View file

@ -100,7 +100,8 @@ if ( in_array("document",$a_show)) {
throw new Exception("ACC_LEDGER_INPUT100 : document and invoice available in same time"); throw new Exception("ACC_LEDGER_INPUT100 : document and invoice available in same time");
} }
?> ?>
<div id="document_div_id" style="display:none;height:185px;height:10rem"> <div id="document_div_id" >
<div>
<?php <?php
/** /**
* receipt * receipt
@ -108,16 +109,16 @@ if ( in_array("document",$a_show)) {
$file = new IFile(); $file = new IFile();
$file->setAlertOnSize(true); $file->setAlertOnSize(true);
$file->table = 0; $file->table = 0;
echo '<p class="decale">';
echo _("Ajoutez une pièce justificative "); echo _("Ajoutez une pièce justificative ");
echo $file->input("pj", ""); echo $file->input("pj", "");
echo '</p>';
?> ?>
<p class="decale"> </div>
<div>
<?php <?php
echo $this->input_supplemental_document(); echo $this->input_supplemental_document();
?> ?>
</p> </div>
</div> </div>
<?php <?php