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

Change the layout for confirmation + recording

Browse source
This commit is contained in:
Dany De Bontridder 2016-02-29 22:07:28 +01:00
parent bdfb364b7e
commit 8f129a2d16
5 changed files with 37 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
html/style-classic.css
View file

@ -2196,3 +2196,13 @@ td.selectedmenu {
text-decoration: none;
color:blue;
}
/*
* Summary of operation , contains miscelleneous informations
* before confirming sale , purchase
*/
#summary_op1,#summary_op2
{
position:float;
float:left;
padding-left: 150px;
}

9
html/style-light.css
View file

@ -2123,4 +2123,13 @@ td.selectedmenu {
background-image: none;
text-decoration: none;
color:blue;
}
/*
* Summary of operation , contains miscelleneous informations
* before confirming sale , purchase
*/
#summary_op1,#summary_op2
{
position:float;
float:left;
}

8
include/class/class_acc_ledger_purchase.php
View file

@ -1338,6 +1338,7 @@ class Acc_Ledger_Purchase extends Acc_Ledger
}
$date_limit=$lPeriode->get_date_limit();
$r="";
$r .= '<div id="summary_op1">';
$r.='<TABLE>';
if ( $p_summary ) {
$jr_id=$this->db->get_value('select jr_id from jrn where jr_internal=$1',array($this->internal));
@ -1375,6 +1376,10 @@ class Acc_Ledger_Purchase extends Acc_Ledger
$r.='<tr>';
$r.='<td> ' . _('Période Comptable') . '</td><td> ' .hb( $date_limit['p_start'] . '-' . $date_limit['p_end']) . '</td>';
$r.='</tr>';
$r.='</table>';
$r.='</div>';
$r .= '<div id="summary_op2">';
$r.='<table>';
$r.='<tr>';
$r.='<td> ' . _('Journal') . '</td><td> ' . hb($this->get_name()) . '</td>';
$r.='</tr>';
@ -1387,6 +1392,9 @@ class Acc_Ledger_Purchase extends Acc_Ledger
$r.='<td> ' . _('Fournisseur') . '</td><td> ' . hb($e_client . ':' . $client_name) . '</td>';
$r.='</tr>';
$r.='</table>';
$r.='</div>';
$r.='<div style="position:float;clear:both">';
$r.='</div>';
$r.='<h2>' . _('Détail articles achetés') . '</h2>';
$r.='<p class="decale">';
$r.='<table class="result" >';

10
include/class/class_acc_ledger_sold.php
View file

@ -632,7 +632,7 @@ class Acc_Ledger_Sold extends Acc_Ledger {
}
$date_limit = $lPeriode->get_date_limit();
$r = "";
$r .= '<div id="summary_op1" >';
$r.='<TABLE>';
if ( $p_summary ) {
$jr_id=$this->db->get_value('select jr_id from jrn where jr_internal=$1',array($this->internal));
@ -669,6 +669,10 @@ class Acc_Ledger_Sold extends Acc_Ledger {
$r.='<tr>';
$r.='<td> ' . _('Période Comptable') . '</td><td> ' .hb( $date_limit['p_start'] . '-' . $date_limit['p_end']) . '</td>';
$r.='</tr>';
$r.='</table>';
$r.='</div>';
$r .= '<div id="summary_op2">';
$r.='<table>';
$r.='<tr>';
$r.='<td> ' . _('Journal') . '</td><td> ' . hb($this->get_name()) . '</td>';
$r.='</tr>';
@ -680,6 +684,10 @@ class Acc_Ledger_Sold extends Acc_Ledger {
$r.='<td> ' . _('Client') . '</td><td> ' . hb($e_client . ':' . $client_name) . '</td>';
$r.='</tr>';
$r.='</table>';
$r.='</div>';
$r.='<div style="position:float;clear:both">';
$r.='</div>';
$r.='<h2>' . _('Détail articles vendus') . '</h2>';
$r.='<p class="decale">';
$r.='<table class="result" >';

2
include/compta_ven.inc.php
View file

@ -172,7 +172,7 @@ show_tab(a_tab,'facturation_div_id');
}
/* Show button */
echo '<h1 style="float:right;margin-right:20%"> Enregistrement </h1>';
echo '<h1> Enregistrement </h1>';
echo $Ledger->confirm($_POST,true);
/* Show link for Invoice */