ソースを参照

[FIX] Mejora en el modal de adelanto /comisiones

adrielso 6 年 前
コミット
ac5ac3d4e7

+ 28 - 5
static/src/css/style.css

@@ -123,29 +123,38 @@
 }
 /* Tipo de Operacion  */
 .expired-account-modal .payslip-table-advancement table tbody tr td:nth-child(3){
-    width: 120px ;
+    width: 200px;
     padding-left: 20px;
+    font-size: 12pt;
+    padding-top: 8px;
 }
 .expired-account-modal .payslip-table-advancement table thead tr th:nth-child(3){
-    width: 120px;
+    width: 200px;
+    font-size: 14pt;
 }
 /* Descriptcion */
 .expired-account-modal .payslip-table-advancement table tbody tr td:nth-child(4){
-    width: 538px ;
+    width: 458px;
     padding-left: 20px;
+    font-size: 12pt;
+    padding-top: 8px;
 }
 .expired-account-modal .payslip-table-advancement table thead tr th:nth-child(4){
-    width: 538px;
+    width: 458px;
+    font-size: 14pt;
 }
 /* Importe */
 .expired-account-modal .payslip-table-advancement table tbody tr td:nth-child(5){
     width: 160px ;
     padding-right: 30px;
     text-align: right;
+    font-size: 12pt;
+    padding-top: 8px;
 }
 .expired-account-modal .payslip-table-advancement table thead tr th:nth-child(5){
     width: 160px;
     text-align: center;
+    font-size: 14pt;
 }
 /* Eliminar */
 .expired-account-modal .payslip-table-advancement table tbody tr td:nth-child(6){
@@ -154,7 +163,21 @@
 .expired-account-modal .payslip-table-advancement table thead tr th:nth-child(6){
     width: 20px;
 }
-/*export */
+
+.expired-account-modal .payslip-table-advancement table thead tr {
+    height: 40px !important;
+}
+.expired-account-modal .payslip-table-advancement table tbody tr {
+    height: 35px;
+}
+/*
+  _____                       _    ____          _
+ | ____|_  ___ __   ___  _ __| |_ / ___|__ _ ___| |__
+ |  _| \ \/ / '_ \ / _ \| '__| __| |   / _` / __| '_ \
+ | |___ >  <| |_) | (_) | |  | |_| |__| (_| \__ \ | | |
+ |_____/_/\_\ .__/ \___/|_|   \__|\____\__,_|___/_| |_|
+            |_|
+ */
 .expired-account-modal .payslip-table-advancement-export table thead tr {
     height: 40px !important;
 }

+ 2 - 2
static/src/xml/modal/modal_payslip_add_advancement.xml

@@ -86,8 +86,8 @@
                     </div>
                     <!-- Pie de Pagina -->
                     <div class="modal-footer payslip-footer">
-                        <button type="button" class="oe_button oe_form_button oe_highlight add-advancement">Guardar</button>
-                        <button type="button" class="oe_button oe_form_button oe_link dismmis-modal" data-dismiss="modal">Salir</button>
+                        <button type="button" class="oe_button oe_form_button oe_highlight advancement-bottom add-advancement">Guardar</button>
+                        <button type="button" class="oe_button oe_form_button oe_link advancement-bottom dismmis-modal" data-dismiss="modal">Salir</button>
                     </div>
                 </div>
             </div>

+ 30 - 22
static/src/xml/modal/modal_payslip_modify_advancement.xml

@@ -13,39 +13,46 @@
                     </div>
                     <!-- Body -->
                     <div class="modal-body">
+
                         <div class="row" t-foreach="employeData" t-as="employee">
                             <div class="col-xs-6">
-                                <label class="detallis-employee-label">Funcionario</label>
-                                <input class="detallis-employee-input" readonly="readonly" t-attf-value="{{ employee.employe_name }}"></input>
+                                <label class="advancement-employee-label">Funcionario</label>
+                                <div class="advancement-employee-input">
+                                    <input class="advancement-input input-disabled" readonly="readonly" t-attf-value="{{ employee.employe_name }}"></input>
+                                </div>
                             </div>
                             <div class="col-xs-6">
-                                <label class="detallis-employee-label">Sueldo neto</label>
-                                <input class="detallis-employee-input number" readonly="readonly" t-attf-value="{{ employee.salari }}"></input>
+                                <label class="advancement-employee-label">Sueldo neto</label>
+                                <div class="advancement-employee-input">
+                                    <input class="advancement-input input-number number input-disabled" readonly="readonly" t-attf-value="{{ employee.salari }}"></input>
+                                </div>
                             </div>
                         </div>
-                        <hr class="detallis-employee-separator"/>
 
-                        <div>
-                            <div class="row">
-                                <div class="col-xs-8">
-                                    <label class="detallis-employee-label">Descripción</label>
-                                </div>
-                                <div class="col-xs-2">
-                                    <label class="detallis-employee-label">Importe</label>
-                                </div>
+                        <hr class="advancement-separator-hr"/>
 
-                                <div class="col-xs-8 payslip-faults">
-                                    <input class="faults-input advancement-details-modify"></input>
-                                </div>
-                                <div class="col-xs-2 payslip-faults">
-                                    <input class="faults-input advancement-amount-modify" type="text"></input>
+                        <div class="row">
+                            <div class="col-xs-6">
+                                <label class="advancement-employee-label">Importe</label>
+                                <div class="advancement-employee-input">
+                                    <input class="advancement-input input-number advancement-amount-modify" type="text"></input>
                                 </div>
-                                <div class="col-xs-2 payslip-faults">
-                                    <button type="button" class="oe_button oe_form_button oe_highlight modify-advancement">Modificar</button>
+                            </div>
+                        </div>
+
+                        <hr class="advancement-separator-hr"/>
+
+                        <div class="row">
+                            <div class="col-xs-12">
+                                <label class="advancement-employee-label">Descripción</label>
+                                <div class="advancement-employee-input">
+                                    <input class="advancement-input advancement-details-modify"></input>
                                 </div>
                             </div>
                         </div>
-                        <hr class="detallis-employee-separator"/>
+
+                        <hr class="advancement-separator-hr"/>
+
                         <!-- Table -->
                         <div class=" oe_view_manager_body payslip-table-advancement">
                             <div class="modal-head-wrapper-payslip">
@@ -80,7 +87,8 @@
                     </div>
                     <!-- Pie de Pagina -->
                     <div class="modal-footer payslip-footer">
-                        <button type="button" class="oe_button oe_form_button oe_link dismmis-modal" data-dismiss="modal">Salir</button>
+                        <button type="button" class="oe_button oe_form_button oe_highlight advancement-bottom  modify-advancement">Guardar</button>
+                        <button type="button" class="oe_button oe_form_button oe_link advancement-bottom  dismmis-modal" data-dismiss="modal">Salir</button>
                     </div>
                 </div>
             </div>

+ 1 - 1
static/src/xml/modal/modal_payslip_print_advancement.xml

@@ -23,7 +23,7 @@
                                 </div>
                             </div>
                         </div>
-                        <hr class="detallis-employee-separator"/>
+                        <!-- <hr class="detallis-employee-separator"/> -->
                         <!-- Table -->
                         <div class=" oe_view_manager_body payslip-table-advancement">
                             <div class="modal-head-wrapper-payslip">