[IMP]:improved css for contract view

bzr revid: apa@tinyerp.com-20120530124535-d3it3v890juhjkof

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index c4c0491..aa9df91 100644 (file)
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -59,56 +59,58 @@
                 <xpath expr='//separator[@name="description"]' position='before'>
                    <separator colspan="4" string="Invoicing" name="invoicing"/>
                    <group col="1" colspan="4">
-                       <table border="1">
+                       <table border="0">
                            <tr>
-                               <th height="20px"></th>
-                               <th></th>
-                               <th>Est.Tot</th>
-                               <th>Invoiced</th>
-                               <th>Remaining</th>
-                               <th>Ready To Invoice</th>
-                               <th></th>
-                               <th></th>
+                               <th class="oe_th_150px" height="20px"></th>
+                               <th width="10px"></th>
+                               <th class="oe_th_110px">Est.Tot</th>
+                               <th class="oe_th_110px">Invoiced</th>
+                               <th class="oe_th_110px">Remaining</th>
+                               <th class="oe_th_110px">Ready To Invoice</th>
+                               <th width="10px"></th>
+                               <th class="oe_th_150px"></th>
+                               <th class="oe_th_150px"></th>
                            </tr>
                            <tr>
-                               <th>Fix Price Invoices</th>
+                               <th class="oe_border_right">Fix Price Invoices</th>
                                <td><field name="fix_price_invoices" nolabel="1"/></td>
-                               <td><field name="amount_max" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-                               <td><field name="ca_invoiced" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-                               <td><field name="remaining_ca" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-                               <td><field name="ca_to_invoice" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-                               <td><button name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-                               <td><button name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+                               <td class="oe_amount_center oe_th_110px"><field name="amount_max" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+                               <td class="oe_amount_center oe_th_110px"><field name="ca_invoiced" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+                               <td class="oe_amount_center oe_th_110px oe_border_right"><field name="remaining_ca" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+                               <td class="oe_amount_center oe_th_110px"><field name="ca_to_invoice" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+                               <td width="10px"></td>
+                               <td class="oe_th_150px"><button class= "oe_btn_width" name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+                               <td class="oe_th_150px"><button class= "oe_btn_width" name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
                            </tr>
                            <tr>
-                               <th>Invoice On Timesheets</th>
+                               <th class="oe_border_right">Invoice On Timesheets</th>
                                <td><field name="invoice_on_timesheets" nolabel="1"/></td>
-                               <td><field name="quantity_max" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-                               <td><field name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-                               <td><field name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-                               <td><field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-                               <td><button name="%(action_timesheet_lines_tree)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-                               <td><button name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+                               <td class="oe_amount_center oe_th_110px"><field name="quantity_max" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+                               <td class="oe_amount_center oe_th_110px"><field name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+                               <td class="oe_amount_center oe_th_110px oe_border_right"><field name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+                               <td class="oe_amount_center oe_th_110px"><field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+                               <td width="10px"></td>
+                               <td class="oe_th_150px"><button class= "oe_btn_width" name="%(action_timesheet_lines_tree)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+                               <td class="oe_th_150px"><button class= "oe_btn_width" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
                            </tr>
                            <tr>
-                               <th>Charge Expenses</th>
+                               <th class="oe_border_right">Charge Expenses</th>
                                <td><field name="charge_expenses" nolabel="1"/></td>
-                               <td>todo</td>
-                               <td>todo</td>
-                               <td>todo</td>
-                               <td>todo</td>
-                               <td>todo</td>
-                               <td>todo</td>
+                               <td class="oe_amount_center oe_th_110px">todo</td>
+                               <td class="oe_amount_center oe_th_110px">todo</td>
+                               <td class="oe_amount_center oe_th_110px oe_border_right">todo</td>
+                               <td class="oe_amount_center oe_th_110px">todo</td>
+                               <td width="10px"></td>
+                               <td class="oe_th_150px">todo</td>
+                               <td class="oe_th_150px">todo</td>
                            </tr>
                            <tr>
-                               <th>Total</th>
-                               <td></td>
-                               <td>todo</td>
-                               <td>todo</td>
-                               <td>todo</td>
-                               <td>todo</td>
-                               <td></td>
-                               <td></td>
+                               <th class="oe_border_right">Total</th>
+                               <td width="10px"></td>
+                               <td class="oe_amount_center oe_th_110px oe_border_top">todo</td>
+                               <td class="oe_amount_center oe_th_110px oe_border_top">todo</td>
+                               <td class="oe_amount_center oe_th_110px oe_border_right oe_border_top">todo</td>
+                               <td class="oe_amount_center oe_th_110px oe_border_top">todo</td>
                            </tr>
                        </table>
                    </group>

diff --git a/addons/account_analytic_analysis/static/src/css/account_analytic.css b/addons/account_analytic_analysis/static/src/css/account_analytic.css
index b9a043e..e627151 100644 (file)
--- a/addons/account_analytic_analysis/static/src/css/account_analytic.css
+++ b/addons/account_analytic_analysis/static/src/css/account_analytic.css
@@ -1,34 +1,26 @@
-.oe_field_view {
-    width: 80px;
-    text-align: center;
+.oe_th_80px{
+    width:80px;
+    text-align: center !important;
+    vertical-align: middle;
 }
-.oe_float_field_view {
-    width: 110px;
-    text-align: center;
+.oe_th_110px{
+    width:110px;
+    text-align: center !important;
+    vertical-align: middle;
 }
-.oe_title_button_left {
-    min-width: 140px;
-    text-align: left;
-    margin-left: 5px !important;
+.oe_th_150px{
+    width:150px;
+    text-align: right !important;
 }
-
-.oe_title_button_right {
-    min-width: 110px;
-    text-align: right;
-    margin-left: 55px !important;
+.oe_amount_center{
+    text-align: center !important;
 }
-
-.oe_field_label {
-    text-align: left;
+.oe_btn_width{
+    width: 150px;
 }
-
-.oe_totals {
-    width: 110px;
-    text-align: center;
-    border-top:  groove;
+.oe_border_right{
+    border-right: 1px solid #DDD;
 }
-.oe_totals_view {
-    width: 80px;
-    text-align: center;
-    border-top:  groove;
+.oe_border_top{
+    border-top: 1px solid #000000;
 }
\ No newline at end of file