[Noalyss-commit] [noalyss] 04/06: Change the layout for confirmation + recording

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit 8f129a2d16210ec99e13c57708bd596bfbf3f6e8
Author: Dany De Bontridder <address@hidden>
Date:   Mon Feb 29 22:07:28 2016 +0100

    Change the layout for confirmation + recording
---
 html/style-classic.css                      |   10 ++++++++++
 html/style-light.css                        |    9 +++++++++
 include/class/class_acc_ledger_purchase.php |    8 ++++++++
 include/class/class_acc_ledger_sold.php     |   10 +++++++++-
 include/compta_ven.inc.php                  |    2 +-
 5 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/html/style-classic.css b/html/style-classic.css
index 09b3399..10ef594 100644
--- a/html/style-classic.css
+++ b/html/style-classic.css
@@ -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;
+}
\ No newline at end of file
diff --git a/html/style-light.css b/html/style-light.css
index 0a962ad..e9ea5c0 100644
--- a/html/style-light.css
+++ b/html/style-light.css
@@ -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;
 }
\ No newline at end of file
diff --git a/include/class/class_acc_ledger_purchase.php 
b/include/class/class_acc_ledger_purchase.php
index 738f8b9..24e16ca 100644
--- a/include/class/class_acc_ledger_purchase.php
+++ b/include/class/class_acc_ledger_purchase.php
@@ -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" >';
diff --git a/include/class/class_acc_ledger_sold.php 
b/include/class/class_acc_ledger_sold.php
index cfc81d1..0fea043 100644
--- a/include/class/class_acc_ledger_sold.php
+++ b/include/class/class_acc_ledger_sold.php
@@ -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" >';
diff --git a/include/compta_ven.inc.php b/include/compta_ven.inc.php
index 0935ea5..4fe073a 100644
--- a/include/compta_ven.inc.php
+++ b/include/compta_ven.inc.php
@@ -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 */