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

Task #1493 Encodage VEN , ACH, Ordre des opérations

Browse source 
Déplacement du bouton modèle d'opérations
This commit is contained in:
Dany De Bontridder 2017-11-19 18:28:57 +01:00
parent 12ef663715
commit 7280f7982d
12 changed files with 69 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

8
html/style-classic.css
View file

@ -1159,10 +1159,6 @@ span.remain {
}
#predef_form {
margin-left:35%;
width:60%;
position:absolute;
z-index:2
}
@media only screen and (min-width: 1155px) {
div#jrn_name_div
@ -1171,10 +1167,6 @@ span.remain {
}
#predef_form {
margin-left:35%;
width:60%;
position:absolute;
z-index:2
}
}
@media only screen and (max-width: 1155px) {

8
html/style-light.css
View file

@ -1151,10 +1151,6 @@ span.remain {
}
#predef_form {
margin-left:35%;
width:60%;
position:absolute;
z-index:2
}
@media only screen and (min-width: 955px) {
div#jrn_name_div
@ -1165,10 +1161,6 @@ span.remain {
}
#predef_form {
margin-left:35%;
width:60%;
position:absolute;
z-index:2
}
}
@media only screen and (max-width: 955px) {

8
html/style-mobile.css
View file

@ -1184,10 +1184,6 @@ div#jrn_name_div {
margin-right: 150px;
}
#predef_form {
margin-left: 20%;
width: 60%;
position: absolute;
z-index: 2;
}
@media only screen and (min-width: 955px) {
div#jrn_name_div {
@ -1195,10 +1191,6 @@ div#jrn_name_div {
margin-right: 150px;
}
#predef_form {
margin-left: 20%;
width: 60%;
position: absolute;
z-index: 2;
}
}
@media only screen and (max-width: 955px) {

8
html/style-r692.css
View file

@ -972,10 +972,11 @@ span.remain {
}
#predef_form {
margin-left:35%;
/* margin-left:35%;
width:60%;
position:absolute;
z-index:2
*/
}
@media only screen and (min-width: 1155px) {
div#jrn_name_div
@ -984,10 +985,11 @@ span.remain {
}
#predef_form {
margin-left:35%;
/*margin-left:35%;
width:60%;
position:absolute;
z-index:2
*/
}
}
@media only screen and (max-width: 1155px) {
@ -1003,7 +1005,7 @@ span.remain {
}
@media only screen and (max-width: 900px) {
#predef_form {
display: none;
/* display: none;*/
}
}
#direct

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

@ -1620,8 +1620,27 @@ class Acc_Ledger extends jrn_def_sql
$ret.="<table>";
$ret.=tr(td($label ).td( $wLedger->input()));
//
// Button for template operation
//
ob_start();
echo '<div id="predef_form">';
echo HtmlInput::hidden('p_jrn_predef', $this->id);
$op = new Pre_op_ods($this->db);
$op->set('ledger', $this->id);
$op->set('ledger_type', "ODS");
$op->set('direct', 't');
$url=http_build_query(array('action'=>'use_opd','p_jrn_predef'=>$this->id,'ac'=>$_REQUEST['ac'],'gDossier'=>dossier::id()));
echo $op->form_get('do.php?'.$url);
echo '</div>';
$str_op_template=ob_get_contents();
ob_end_clean();
$ret.="<tr>";
$ret.="<td>"._("Modèle d'opération")."</td>";
$ret.="<td>".$str_op_template."</td>";
$ret.="</tr>";
// Load the javascript
//
//$ret.= '<tr ><td colspan="2" style="width:auto">';

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

@ -1281,7 +1281,22 @@ class Acc_Ledger_Purchase extends Acc_Ledger
}
$f_type=_('Fournisseur');
//
// Button for template operation
//
ob_start();
echo '<div id="predef_form">';
echo HtmlInput::hidden('p_jrn_predef', $this->id);
$op = new Pre_op_ach($this->db);
$op->set('ledger', $this->id);
$op->set('ledger_type', "ACH");
$op->set('direct', 'f');
$url=http_build_query(array('p_jrn_predef'=>$this->id,'ac'=>$_REQUEST['ac'],'gDossier'=>dossier::id()));
echo $op->form_get('do.php?'.$url);
echo '</div>';
$str_op_template=ob_get_contents();
ob_end_clean();
ob_start();
require_once NOALYSS_TEMPLATE.'/form_ledger_detail.php';
$r.=ob_get_contents();

17
include/class/acc_ledger_sold.class.php
View file

@ -1311,7 +1311,22 @@ EOF;
$array[$i]['quantity'] = $Quantity->input("e_quant" . $i, $quant);
}// foreach article
$f_type = _('Client');
//
// Button for template operation
//
ob_start();
echo '<div id="predef_form">';
echo HtmlInput::hidden('p_jrn_predef', $this->id);
$op=new Pre_op_ven($this->db);
$op->set('ledger', $this->id);
$op->set('ledger_type', "VEN");
$op->set('direct', 'f');
$url=http_build_query(array('p_jrn_predef'=>$this->id, 'ac'=>$_REQUEST['ac'],
'gDossier'=>dossier::id()));
echo $op->form_get('do.php?'.$url);
echo '</div>';
$str_op_template=ob_get_contents();
ob_end_clean();
ob_start();
require_once NOALYSS_TEMPLATE.'/form_ledger_detail.php';

10
include/compta_ach.inc.php
View file

@ -242,15 +242,7 @@ if (isset ($_REQUEST['p_jrn_predef'])){
}
// pre defined operation
//
echo '<div id="predef_form">';
echo HtmlInput::hidden('p_jrn_predef', $Ledger->id);
$op = new Pre_op_ach($cn);
$op->set('ledger', $Ledger->id);
$op->set('ledger_type', "ACH");
$op->set('direct', 'f');
$url=http_build_query(array('p_jrn_predef'=>$Ledger->id,'ac'=>$ac,'gDossier'=>dossier::id()));
echo $op->form_get('do.php?'.$url);
echo '</div>';
echo '</div>';
echo '<div class="content">';

4
include/compta_ven.inc.php
View file

@ -256,7 +256,7 @@ if (isset($_REQUEST['p_jrn_predef']))
$Ledger->id=$_REQUEST['p_jrn_predef'];
}
echo '<div id="predef_form">';
/* echo '<div id="predef_form">';
echo HtmlInput::hidden('p_jrn_predef', $Ledger->id);
$op=new Pre_op_ven($cn);
$op->set('ledger',$Ledger->id);
@ -265,7 +265,7 @@ $op->set('direct','f');
$url=http_build_query(array('p_jrn_predef'=>$Ledger->id,'ac'=>$_REQUEST['ac'],'gDossier'=>dossier::id()));
echo $op->form_get('do.php?'.$url);
echo '</div>';
*/
echo '<div class="content">';
echo '<p class="notice">'.$p_msg.'</p>';
try

14
include/operation_ods_new.inc.php
View file

@ -40,20 +40,12 @@ $ledger->id = ($ledger->id == -1) ? $first_ledger['jrn_def_id'] : $id_ledger;
// check if we can write in the ledger
if ( $g_user->check_jrn($ledger->id)=='X')
{
alert(_("Vous ne pouvez pas écrire dans ce journal, contacter votre administrateur"));
alert(_("Vous ne pouvez pas écrire dans ce journal, contactez votre administrateur"));
return;
}
}
echo '<div class="content">';
echo '<div id="predef_form">';
echo HtmlInput::hidden('p_jrn_predef', $ledger->id);
$op = new Pre_op_ods($cn);
$op->set('ledger', $ledger->id);
$op->set('ledger_type', "ODS");
$op->set('direct', 't');
$url=http_build_query(array('action'=>'use_opd','p_jrn_predef'=>$ledger->id,'ac'=>$_REQUEST['ac'],'gDossier'=>dossier::id()));
echo $op->form_get('do.php?'.$url);
echo '</div>';
echo '<div id="jrn_name_div">';
echo '<h2 id="jrn_name" style="display:inline">' . $ledger->get_name() . '</h2>';
echo '</div>';

6
include/template/form_ledger_detail.php
View file

@ -11,6 +11,12 @@
<?php echo _('Journal')?> <?php echo $f_jrn?>
</td>
</tr>
<tr>
<td> <?php echo _('Modèle opération') ?></td>
<td>
<?php echo $str_op_template;?>
</td>
</tr>
<tr>
<td>
<?php echo _('Date')?>

1
scenario/ajax_acc_plan_mtable.php
View file

@ -36,7 +36,6 @@ $action=$http->request('action');
$p_id=$http->request('p_id', "number");
$ctl_id=$http->request('ctl');
} catch(Exception $e) {
echo $e->getMessage();
}
require_once NOALYSS_INCLUDE."/lib/manage_table_sql.class.php";