From f6ba5224e608ef83c66421c15cbf51a69c2559e3 Mon Sep 17 00:00:00 2001 From: jcasado Date: Fri, 22 Mar 2024 15:00:30 +0100 Subject: [PATCH 1/2] refs #7123 first edit pdf --- .../templates/reports/credit-request/assets/css/style.css | 6 +++++- .../templates/reports/credit-request/credit-request.html | 8 ++++++++ print/templates/reports/credit-request/locale/es.yml | 5 +++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/print/templates/reports/credit-request/assets/css/style.css b/print/templates/reports/credit-request/assets/css/style.css index 90bbfd103..a46a33484 100644 --- a/print/templates/reports/credit-request/assets/css/style.css +++ b/print/templates/reports/credit-request/assets/css/style.css @@ -49,4 +49,8 @@ td { .field { float: none -} \ No newline at end of file +} + +.wide-rectangle { + background-color: rgb(64 64 68); +} diff --git a/print/templates/reports/credit-request/credit-request.html b/print/templates/reports/credit-request/credit-request.html index c8e3f8c34..6b167e95b 100644 --- a/print/templates/reports/credit-request/credit-request.html +++ b/print/templates/reports/credit-request/credit-request.html @@ -14,6 +14,14 @@ + + {{$t('fields.importCredit')}}: + +
+ +
+ +
diff --git a/print/templates/reports/credit-request/locale/es.yml b/print/templates/reports/credit-request/locale/es.yml index cd6f92dc5..bc0e09528 100644 --- a/print/templates/reports/credit-request/locale/es.yml +++ b/print/templates/reports/credit-request/locale/es.yml @@ -3,10 +3,11 @@ fields: title: Solicitud de crédito date: Fecha companyName: Nombre de la empresa + importCredit: Importe del crédito solicitado businessType: Tipo de negocio antiquity: Antigüedad surface: Superficie (m²) - numberOfEmployees: Número de empleados + numberOfEmployees: Nº empleados owner: Contacto propietario o Administrador phone: Teléfono payer: Contacto responsable de pagos @@ -15,4 +16,4 @@ fields: forecastedPurchases: Previsión de compras a Verdnatura personFilling: Persona que rellena el formulario companyInfo: Información general sobre la empresa - economicInfo: Información económica \ No newline at end of file + economicInfo: Información económica -- 2.40.1 From 09e1e4de19e5829c8993a6a93356049e8bd17af0 Mon Sep 17 00:00:00 2001 From: jcasado Date: Wed, 3 Apr 2024 07:23:36 +0200 Subject: [PATCH 2/2] refactor: #7123 change credit document --- front/core/components/searchbar/style.scss | 4 +- print/common/css/layout.css | 6 +- .../credit-request/assets/css/style.css | 27 ++++--- .../credit-request/credit-request.html | 72 +++++-------------- .../reports/credit-request/locale/es.yml | 1 + 5 files changed, 40 insertions(+), 70 deletions(-) diff --git a/front/core/components/searchbar/style.scss b/front/core/components/searchbar/style.scss index eab9c126b..b8dff9474 100644 --- a/front/core/components/searchbar/style.scss +++ b/front/core/components/searchbar/style.scss @@ -61,10 +61,10 @@ vn-searchbar { } vn-icon[icon="info"] { - position: absolute; + position: absolute; top: 2px; right: 2px } } } -} \ No newline at end of file +} diff --git a/print/common/css/layout.css b/print/common/css/layout.css index c1af4807d..8f4d1fc9e 100644 --- a/print/common/css/layout.css +++ b/print/common/css/layout.css @@ -178,7 +178,7 @@ table { margin-bottom: 15px } -.column-oriented td, +.column-oriented td, .column-oriented th { padding: 10px } @@ -252,10 +252,10 @@ table { position: absolute; text-align: center; width: 100%; - + } .line span { background-color: #FFF; padding: 5px -} \ No newline at end of file +} diff --git a/print/templates/reports/credit-request/assets/css/style.css b/print/templates/reports/credit-request/assets/css/style.css index a46a33484..ac58e81cf 100644 --- a/print/templates/reports/credit-request/assets/css/style.css +++ b/print/templates/reports/credit-request/assets/css/style.css @@ -16,7 +16,6 @@ p { td > span { width: 100%; - margin-bottom: 15px } .green-background { @@ -28,7 +27,7 @@ td > span { } .info-panel td, .info-panel th { - padding: 1em 1em; + padding: 1%; } .info-panel { @@ -37,20 +36,28 @@ td > span { table { width: 100%; + text-align: end; } th { - width: 30%; -} - -td { width: 20%; } -.field { - float: none +td { + width: 10%; } -.wide-rectangle { - background-color: rgb(64 64 68); +.field { + width: 100%; + float: none; } + +th > input { + float: none; + border: 0; + background-color: rgb(236, 236, 236); + width: 100%; + height: 3em; +} + + diff --git a/print/templates/reports/credit-request/credit-request.html b/print/templates/reports/credit-request/credit-request.html index 6b167e95b..2623de577 100644 --- a/print/templates/reports/credit-request/credit-request.html +++ b/print/templates/reports/credit-request/credit-request.html @@ -9,17 +9,13 @@ {{$t('fields.date')}}: -
- -
+ - {{$t('fields.importCredit')}}: + {{$t('fields.importCredit')}}: -
- -
+ @@ -36,65 +32,47 @@ {{$t('fields.companyName')}}: -
- -
+ {{$t('fields.businessType')}}: -
- -
+ {{$t('fields.antiquity')}}: -
- -
+ {{$t('fields.surface')}}: -
- -
+ {{$t('fields.numberOfEmployees')}}: -
- -
+ {{$t('fields.owner')}}: -
- -
+ {{$t('fields.phone')}}: -
- -
+ {{$t('fields.payer')}}: -
- -
+ {{$t('fields.phone')}}: -
- -
+ @@ -113,27 +91,15 @@ - + - - - - @@ -150,15 +116,11 @@ diff --git a/print/templates/reports/credit-request/locale/es.yml b/print/templates/reports/credit-request/locale/es.yml index bc0e09528..5a48cfa50 100644 --- a/print/templates/reports/credit-request/locale/es.yml +++ b/print/templates/reports/credit-request/locale/es.yml @@ -17,3 +17,4 @@ fields: personFilling: Persona que rellena el formulario companyInfo: Información general sobre la empresa economicInfo: Información económica + previousSellsVolume: Volumen de ventas del año anterior -- 2.40.1
{{$t('fields.previousSalesVolume')}}:{{$t('fields.previousSellsVolume')}}: -
- -
+
{{$t('fields.forecastedSalesVolume')}}: -
- -
-
{{$t('fields.forecastedPurchases')}}: -
- -
+
{{$t('fields.personFilling')}}: -
- -
+ 		{{$t('fields.phone')}}: -
- -
+