Merge branch 'dev' into 6184-saveCmr

2023-10-11 12:23:39 +00:00 · 2023-10-11 12:23:39 +00:00 · c79f706cdc
parent 3e70cb07e0 393d1889f7
commit c79f706cdc
13 changed files with 146 additions and 38 deletions
--- a/modules/client/back/methods/client/incotermsAuthorizationEmail.js
+++ b/modules/client/back/methods/client/incotermsAuthorizationEmail.js
@ -33,6 +33,12 @@ module.exports = Self => {
                type: 'number',
                description: 'The company id',
                required: true
+            },
+            {
+                arg: 'addressId',
+                type: 'number',
+                description: 'The address id',
+                required: true
            }
        ],
        returns: {
--- a/modules/client/back/methods/client/incotermsAuthorizationHtml.js
+++ b/modules/client/back/methods/client/incotermsAuthorizationHtml.js
@ -21,6 +21,12 @@ module.exports = Self => {
                type: 'number',
                description: 'The company id',
                required: true
+            },
+            {
+                arg: 'addressId',
+                type: 'number',
+                description: 'The address id',
+                required: true
            }
        ],
        returns: [
--- a/modules/client/back/methods/client/incotermsAuthorizationPdf.js
+++ b/modules/client/back/methods/client/incotermsAuthorizationPdf.js
@ -21,6 +21,12 @@ module.exports = Self => {
                type: 'number',
                description: 'The company id',
                required: true
+            },
+            {
+                arg: 'addressId',
+                type: 'number',
+                description: 'The address id',
+                required: true
            }
        ],
        returns: [
--- a/modules/client/front/sample/create/index.html
+++ b/modules/client/front/sample/create/index.html
@ -8,11 +8,12 @@
    auto-load="true"
    url="Samples/visible"
    fields="[
-        'id', 
+        'id',
        'code',
-        'description', 
+        'description',
        'model',
        'hasCompany',
+        'hasAddress',
        'hasPreview',
        'datepickerEnabled'
    ]"
@ -65,10 +66,36 @@
                model="ClientSample.companyFk"
                data="companiesData"
                show-field="code"
-                label="Company" 
+                label="Company"
                ng-if="sampleType.selection.hasCompany"
                required="true">
            </vn-autocomplete>
+            <vn-autocomplete
+                ng-if="sampleType.selection.id == 20"
+                vn-one
+                required="true"
+                data="$ctrl.addresses"
+                label="Address"
+                show-field="nickname"
+                value-field="id"
+                ng-model="$ctrl.addressId"
+                model="ClientSample.addressFk"
+                order="isActive DESC">
+                <tpl-item class="address" ng-class="::{inactive: !isActive}">
+                    <span class="inactive" translate>{{::!isActive ? '(Inactive)' : ''}}</span>
+                    {{::nickname}}
+                    <span ng-show="city || province || street">
+                        , {{::street}}, {{::city}}, {{::province.name}} - {{::agencyMode.name}}
+                    </span>
+                </tpl-item>
+                <append>
+                    <vn-icon-button
+                        ui-sref="client.card.address.edit({id: $ctrl.clientId, addressId: $ctrl.addressId})"
+                        icon="edit"
+                        vn-tooltip="Edit address">
+                    </vn-icon-button>
+                </append>
+            </vn-autocomplete>
            <vn-date-picker
                vn-one
                label="From"
@ -85,7 +112,7 @@
        </vn-submit>
        <vn-button
            disabled="!sampleType.selection.hasPreview"
-            label="Preview" 
+            label="Preview"
            ng-click="$ctrl.preview()">
        </vn-button>
        <vn-button
--- a/modules/client/front/sample/create/index.js
+++ b/modules/client/front/sample/create/index.js
@ -15,8 +15,10 @@ class Controller extends Section {
    set client(value) {
        this._client = value;

-        if (value)
+        if (value) {
            this.setClientSample(value);
+            this.clientAddressesList(value.id);
+        }
    }

    get companyId() {
@ -29,6 +31,16 @@ class Controller extends Section {
        this.clientSample.companyFk = value;
    }

+    get addressId() {
+        if (!this.clientSample.addressId)
+            this.clientSample.addressId = this.client.defaultAddressFk;
+        return this.clientSample.addressId;
+    }
+
+    set addressId(value) {
+        this.clientSample.addressId = value;
+    }
+
    onSubmit() {
        this.$.watcher.check();

@ -65,6 +77,9 @@ class Controller extends Section {

        if (sampleType.datepickerEnabled)
            params.from = this.clientSample.from;
+
+        if (this.clientSample.addressId)
+            params.addressId = this.clientSample.addressId;
    }

    preview() {
@ -126,6 +141,40 @@ class Controller extends Section {
            };
        });
    }
+
+    clientAddressesList(value) {
+        let filter = {
+            include: [
+                {
+                    relation: 'province',
+                    scope: {
+                        fields: ['name']
+                    }
+                },
+                {
+                    relation: 'agencyMode',
+                    scope: {
+                        fields: ['name']
+                    }
+                }
+            ]
+        };
+        filter = encodeURIComponent(JSON.stringify(filter));
+
+        let query = `Clients/${value}/addresses?filter=${filter}`;
+        this.$http.get(query).then(res => {
+            if (res.data)
+                this.addresses = res.data;
+        });
+    }
+
+    getClientDefaultAddress(value) {
+        let query = `Clients/${value}`;
+        this.$http.get(query).then(res => {
+            if (res.data)
+                this.addressId = res.data.defaultAddressFk;
+        });
+    }
 }

 Controller.$inject = ['$element', '$scope', 'vnEmail'];
--- a/modules/ticket/front/descriptor/locale/es.yml
+++ b/modules/ticket/front/descriptor/locale/es.yml
@ -3,7 +3,7 @@ Are you sure you want to send it?: ¿Seguro que quieres enviarlo?
 Show pallet report: Ver hoja de pallet
 Change shipped hour: Cambiar hora de envío
 Shipped hour: Hora de envío
-Make a payment: "Verdnatura le comunica:\rSu pedido está pendiente de pago.\rPor favor, entre en la página web y efectue el pago con tarjeta.\rMuchas gracias."
+Make a payment: "Verdnatura le comunica:\rSu pedido está pendiente de pago.\rPor favor, entre en la página web y efectúe el pago con tarjeta.\rMuchas gracias."
 Minimum is needed: "Verdnatura le recuerda:\rEs necesario un importe mínimo de 50€ (Sin IVA) en su pedido {{ticketId}} del día {{created | date: 'dd/MM/yyyy'}} para recibirlo sin portes adicionales."
 Ticket invoiced: Ticket facturado
 Make invoice: Crear factura
--- a/print/templates/email/incoterms-authorization/incoterms-authorization.js
+++ b/print/templates/email/incoterms-authorization/incoterms-authorization.js
@ -28,6 +28,10 @@ module.exports = {
        companyId: {
            type: Number,
            required: true
+        },
+        addressId: {
+            type: Number,
+            required: true
        }
    }
 };
--- a/print/templates/reports/incoterms-authorization/incoterms-authorization.html
+++ b/print/templates/reports/incoterms-authorization/incoterms-authorization.html
@ -3,16 +3,16 @@
        <div class="grid-block">
            <p
                v-html="$t('description', {
-                socialName: client.socialName,
+                socialName: address.nickname,
                name: client.name,
-                address: client.street,
+                address: address.street,
                country: client.country,
                fiscalID: client.fi
            })"
            ></p>
            <p
                v-html="$t('declaration', {
-                socialName: client.socialName
+                socialName: address.nickname
            })"
            ></p>
            <p
@ -20,7 +20,7 @@
                v-html="$t('declarations[' + $index + ']', {
                    companyName: company.name,
                    companyCity: company.city,
-                    socialName: client.socialName,
+                    socialName: address.nickname,
                    destinationCountry: client.country
                })"
            ></p>
--- a/print/templates/reports/incoterms-authorization/incoterms-authorization.js
+++ b/print/templates/reports/incoterms-authorization/incoterms-authorization.js
@ -7,6 +7,7 @@ module.exports = {
        this.client = await this.findOneFromDef('client', [this.id]);
        this.checkMainEntity(this.client);
        this.company = await this.findOneFromDef('company', [this.companyId]);
+        this.address = await this.findOneFromDef('address', [this.addressId]);
    },
    props: {
        id: {
@ -17,6 +18,10 @@ module.exports = {
        companyId: {
            type: Number,
            required: true
+        },
+        addressId: {
+            type: Number,
+            required: true
        }
    }
 };
--- a/print/templates/reports/incoterms-authorization/locale/es.yml
+++ b/print/templates/reports/incoterms-authorization/locale/es.yml
@ -1,28 +1,25 @@
 reportName: autorizacion-incoterms
 description: '<em>{socialName}</em> una sociedad debidamente constituida con responsabilidad <em>limitada</em>
-y registrada conforme al derecho de sociedades de {country} y aquí representada por 
-<span>___________________</span>. {socialName}, con domicilio en {address}, 
+y registrada conforme al derecho de sociedades de {country} y aquí representada por {socialName}, con domicilio en {address},
 CIF <em>{fiscalID}</em>. En adelante denominada {name}.'
 issued: 'En {0}, a {1} de {2} de {3}'
 client: 'Cliente {0}'
 declaration: '<em>{socialName}</em> declara por la presente que:'
 declarations:
-  - 'Todas las compras realizadas por {socialName} con {companyName} se 
-entregan, Ex Works (Incoterms), en el almacén de {companyName} situado en 
-{companyCity}.'
-  - '{socialName} reconoce que es importante para {companyName} tener 
-comprobante de la entrega intracomunitaria de la mercancía a {destinationCountry} para 
+  - 'Todas las compras realizadas por {socialName} con {companyName} se entregan según las condiciones definidas en el incoterm.'
+  - '{socialName} reconoce que es importante para {companyName} tener
+comprobante de la entrega intracomunitaria de la mercancía a {destinationCountry} para
 poder facturar con 0% de IVA.'
-  - 'Por tanto, al firmar este acuerdo, {socialName} declara que todos los bienes que 
+  - 'Por tanto, al firmar este acuerdo, {socialName} declara que todos los bienes que
 se compren a {companyName} serán entregados a {destinationCountry}.'
-  - 'Además, {socialName} deberá, a primera solicitud de {companyName}, 
-proporcionar una prueba de que todos los productos comprados a {companyName} han 
+  - 'Además, {socialName} deberá, a primera solicitud de {companyName},
+proporcionar una prueba de que todos los productos comprados a {companyName} han
 sido entregados en {destinationCountry}.'
-  - 'Además de lo anterior, {companyName} proporcionará a {socialName} 
-un resumen mensual en el que se incluyen todas las facturas (y las entregas correspondientes). 
-{socialName} firmará y devolverá el resumen mensual a {companyName}, 
+  - 'Además de lo anterior, {companyName} proporcionará a {socialName}
+un resumen mensual en el que se incluyen todas las facturas (y las entregas correspondientes).
+{socialName} firmará y devolverá el resumen mensual a {companyName},
 S.L. dentro de los 5 días posteriores a la recepción del resumen.'
-signer: 
+signer:
  representative: Representante
  representativeRole: Cargo del representante
  signed: Fecha de firma
@ -39,4 +36,4 @@ months:
  - 'Septiembre'
  - 'Octubre'
  - 'Noviembre'
-  - 'Diciembre'
+  - 'Diciembre'
--- a/print/templates/reports/incoterms-authorization/locale/pt.yml
+++ b/print/templates/reports/incoterms-authorization/locale/pt.yml
@ -1,28 +1,27 @@
 reportName: autorizacion-incoterms
 description: '<em>{socialName}</em> uma sociedade devidamente constituída com responsabilidade <em>limitada e registada</em>
-conforme ao direito de sociedades da {country} e aqui representada por
-<span>___________________</span>. {socialName}, com domicílio em {address},
+conforme ao direito de sociedades da {country} e aqui representada por {socialName}, com domicílio em {address},
 CIF <em>{fiscalID}</em>. Em adiante denominada {name}.'
 issued: 'Em {0}, em {1} de {2} de {3}'
 client: 'Cliente {0}'
 declaration: '<em>{socialName}</em> declara através da presente que:'
 declarations:
-  - 'Todas as compras realizadas por {socialName} a {companyName} se entregam, 
+  - 'Todas as compras realizadas por {socialName} a {companyName} se entregam,
  Ex Works (Incoterms), no armazém da {companyName} situado em
 {companyCity}.'
-  - '{socialName} reconhece ser importante para {companyName} 
-  ter o comprovante da entrega intracomunitária da mercadoria a {destinationCountry} 
+  - '{socialName} reconhece ser importante para {companyName}
+  ter o comprovante da entrega intracomunitária da mercadoria em {destinationCountry}
  para poder faturar com 0% de IVA.'
-  - 'Portanto, ao assinar este acordo, {socialName} declara que todos os bens 
+  - 'Portanto, ao assinar este acordo, {socialName} declara que todos os bens
  que se comprem na {companyName} serão entregues na {destinationCountry}.'
  - 'Além disto, {socialName} deverá, na primeira solicitude da {companyName},
-  proporcionar uma prova de que todos os produtos comprados na {companyName} 
-  foram entregues na {destinationCountry}.'
-  - 'Além do anterio, {companyName} proporcionará a {socialName}
+  proporcionar uma prova de que todos os produtos comprados em {companyName}
+  foram entregues em {destinationCountry}.'
+  - 'Além do anterior, {companyName} proporcionará a {socialName}
 um resumo mensal onde se incluem todas as faturas (e as entregas correspondentes).
 {socialName} assinará e devolverá o resumo mensal à {companyName},
 dentro dos 5 dias posteriores à receção do resumo.'
-signer: 
+signer:
  representative: Representante
  representativeRole: Cargo de representante
  signed: Data da assinatura
@ -39,4 +38,4 @@ months:
  - 'Setembro'
  - 'Outubro'
  - 'Novembro'
-  - 'Dezembro'
+  - 'Dezembro'
--- a/print/templates/reports/incoterms-authorization/sql/address.sql
+++ b/print/templates/reports/incoterms-authorization/sql/address.sql
@ -0,0 +1,9 @@
+SELECT
+    a.nickname,
+    a.street,
+    a.postalCode,
+    a.city,
+    p.name province
+FROM address a
+    LEFT JOIN province p ON p.id = a.provinceFk
+WHERE a.id = ?
--- a/print/templates/reports/incoterms-authorization/sql/company.sql
+++ b/print/templates/reports/incoterms-authorization/sql/company.sql
@ -1,8 +1,8 @@
-SELECT 
+SELECT
    s.name,
    s.city,
    cl.name AS manager
 FROM company c
    JOIN supplier s ON s.id = c.id
    JOIN client cl ON cl.id = c.workerManagerFk
-WHERE c.id = ?
+WHERE c.id = ?