Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

2023-08-02 13:58:40 +02:00 · 2023-08-02 13:58:40 +02:00 · fd9b842e6f
parent ae42e161cd 29fe1c0c84
commit fd9b842e6f
18 changed files with 136 additions and 30 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -24,7 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 ### Changed
 - (General -> Iconos) Añadidos nuevos iconos
- (Clientes -> Razón social) Nuevas restricciones por pais
+- (Clientes -> Razón social) Permite crear clientes con la misma razón social según el país


 ### Fixed
--- a/back/methods/vn-user/privileges.js
+++ b/back/methods/vn-user/privileges.js
@ -47,7 +47,7 @@ module.exports = Self => {
        const user = await Self.findById(userId, {fields: ['hasGrant']}, myOptions);

        const userToUpdate = await Self.findById(id, {
-            fields: ['id', 'name', 'hasGrant', 'roleFk', 'password'],
+            fields: ['id', 'name', 'hasGrant', 'roleFk', 'password', 'email'],
            include: {
                relation: 'role',
                scope: {
--- a/back/models/vn-user.js
+++ b/back/models/vn-user.js
@ -20,7 +20,7 @@ module.exports = function(Self) {
    Self.validatesFormatOf('email', {
        message: 'Invalid email',
        allowNull: true,
-        allowBlank: true,
+        allowBlank: false,
        with: /^[\w|.|-]+@[\w|-]+(\.[\w|-]+)*(,[\w|.|-]+@[\w|-]+(\.[\w|-]+)*)*$/
    });

@ -115,6 +115,14 @@ module.exports = function(Self) {
    Self.validateLogin = async function(user, password) {
        let loginInfo = Object.assign({password}, Self.userUses(user));
        token = await Self.login(loginInfo, 'user');
+
+        const userToken = await token.user.get();
+        try {
+            await Self.app.models.Account.sync(userToken.name, password);
+        } catch (err) {
+            console.warn(err);
+        }
+
        return {token: token.id, ttl: token.ttl};
    };

--- a/front/core/components/smart-table/index.js
+++ b/front/core/components/smart-table/index.js
@ -339,8 +339,9 @@ export default class SmartTable extends Component {
        if (!header) return;

        const tbody = this.element.querySelector('tbody');
-        const columns = header.querySelectorAll('th');
+        if (!tbody) return;

+        const columns = header.querySelectorAll('th');
        const hasSearchRow = tbody.querySelector('tr#searchRow');
        if (hasSearchRow) {
            if (this.$inputsScope)
--- a/modules/client/front/web-access/index.html
+++ b/modules/client/front/web-access/index.html
@ -39,7 +39,7 @@
                label="Recovery email"
                ng-model="$ctrl.account.email"
                info="This email is used for user to regain access their account."
-                rule="VnUser.name">
+                rule="VnUser.email">
            </vn-textfield>
        </vn-horizontal>
    </vn-card>
--- a/modules/invoiceIn/back/locale/invoiceIn/en.yml
+++ b/modules/invoiceIn/back/locale/invoiceIn/en.yml
@ -0,0 +1,20 @@
+name: invoice in
+columns:
+  id: id
+  serialNumber: serial number
+  serial: serial
+  supplierFk: supplier
+  issued: issued
+  supplierRef: supplierRef
+  isBooked: is booked
+  currencyFk: currency
+  created: created
+  companyFk: company
+  docFk: document
+  booked: booked
+  operated: operated
+  bookEntried: book entried
+  isVatDeductible: is VAT deductible
+  withholdingSageFk: withholding
+  expenceFkDeductible: expence deductible
+  editorFk: editor
--- a/modules/invoiceIn/back/locale/invoiceIn/es.yml
+++ b/modules/invoiceIn/back/locale/invoiceIn/es.yml
@ -0,0 +1,20 @@
+name: factura recibida
+columns:
+  id: id
+  serialNumber: número de serie
+  serial: serie
+  supplierFk: proveedor
+  issued: fecha emisión
+  supplierRef: referéncia proveedor
+  isBooked: facturado
+  currencyFk: moneda
+  created: creado
+  companyFk: empresa
+  docFk: documento
+  booked: fecha contabilización
+  operated: fecha entrega
+  bookEntried: fecha asiento
+  isVatDeductible: impuesto deducible
+  withholdingSageFk: código de retención
+  expenceFkDeductible: gasto deducible
+  editorFk: editor
--- a/modules/invoiceIn/back/locale/invoiceInDueDay/en.yml
+++ b/modules/invoiceIn/back/locale/invoiceInDueDay/en.yml
@ -0,0 +1,9 @@
+name: invoice in due day
+columns:
+  id: id
+  invoiceInFk: invoice in
+  dueDated: due date
+  bankFk: bank
+  amount: amount
+  foreignValue : foreign amount
+  created: created
--- a/modules/invoiceIn/back/locale/invoiceInDueDay/es.yml
+++ b/modules/invoiceIn/back/locale/invoiceInDueDay/es.yml
@ -0,0 +1,9 @@
+name: vencimientos factura recibida
+columns:
+  id: id
+  invoiceInFk: factura
+  dueDated: fecha vto.
+  bankFk: banco
+  amount: importe
+  foreignValue : importe divisa
+  created: creado
--- a/modules/invoiceIn/back/locale/invoiceInTax/en.yml
+++ b/modules/invoiceIn/back/locale/invoiceInTax/en.yml
@ -0,0 +1,12 @@
+name: invoice in tax
+columns:
+  id: id
+  invoiceInFk: invoice in
+  taxCodeFk: tax
+  taxableBase: taxable base 
+  expenceFk: expence
+  foreignValue: foreign amount
+  taxTypeSageFk: tax type
+  transactionTypeSageFk:  transaction type
+  created: created
+  editorFk: editor
--- a/modules/invoiceIn/back/locale/invoiceInTax/es.yml
+++ b/modules/invoiceIn/back/locale/invoiceInTax/es.yml
@ -0,0 +1,12 @@
+name: factura recibida impuesto
+columns:
+  id: id
+  invoiceInFk: factura recibida
+  taxCodeFk: código IVA
+  taxableBase: base imponible
+  expenceFk: código gasto
+  foreignValue: importe divisa
+  taxTypeSageFk: código impuesto 
+  transactionTypeSageFk: código transacción
+  created: creado
+  editorFk: editor
--- a/modules/ticket/back/methods/ticket/canBeInvoiced.js
+++ b/modules/ticket/back/methods/ticket/canBeInvoiced.js
@ -67,7 +67,7 @@ module.exports = function(Self) {
                throw new UserError(`This ticket is already invoiced`);

            const priceZero = ticket.totalWithVat == 0;
-            if (priceZero)
+            if (ticketsIds.length == 1 && priceZero)
                throw new UserError(`A ticket with an amount of zero can't be invoiced`);
        });

--- a/modules/worker/back/methods/worker-time-control/filter.js
+++ b/modules/worker/back/methods/worker-time-control/filter.js
@ -36,9 +36,9 @@ module.exports = Self => {
        if (isSubordinate === false)
            throw new UserError(`You don't have enough privileges`);

-        const subordinate = await Worker.findById(ctx.args.workerFk);
+        const subordinate = await Worker.findById(ctx.args.workerFk, {fields: ['id']});
        filter = mergeFilters(filter, {where: {
-            userFk: subordinate.userFk
+            userFk: subordinate.id
        }});

        return Self.find(filter);
--- a/modules/worker/back/models/worker.json
+++ b/modules/worker/back/models/worker.json
@ -25,8 +25,7 @@
            "type" : "string"
        },
        "userFk": {
-            "type" : "number",
-            "required": true
+            "type" : "number"
        },
        "bossFk": {
            "type" : "number"
--- a/modules/worker/front/department/descriptor/index.js
+++ b/modules/worker/front/department/descriptor/index.js
@ -32,6 +32,28 @@ class Controller extends Descriptor {
                this.vnApp.showSuccess(this.$t('Department deleted.'));
            });
    }
+
+    loadData() {
+        const filter = {
+            fields: ['id', 'name', 'code', 'workerFk', 'isProduction', 'chatName',
+                'isTeleworking', 'notificationEmail', 'hasToRefill', 'hasToSendMail', 'hasToMistake', 'clientFk'],
+            include: [
+                {relation: 'client',
+                    scope: {
+                        fields: ['id', 'name']
+                    }},
+                {
+                    relation: 'worker',
+                    scope: {
+                        fields: ['id', 'firstName', 'lastName']
+                    }
+                }
+            ]
+        };
+
+        return this.getData(`Departments/${this.id}`, {filter})
+            .then(res => this.entity = res.data);
+    }
 }

 Controller.$inject = ['$element', '$scope', '$rootScope'];
--- a/modules/worker/front/time-control/index.html
+++ b/modules/worker/front/time-control/index.html
@ -4,7 +4,7 @@
    filter="::$ctrl.filter"
    data="$ctrl.hours">
 </vn-crud-model>
-<div ng-if="$ctrl.card.hasWorkCenter">
+<div>
    <vn-card class="vn-pa-lg vn-w-lg">
        <vn-table model="model" auto-load="false">
            <vn-thead>
@ -106,12 +106,6 @@
        </vn-button>
    </vn-button-bar>
 </div>
-<div
-    ng-if="!$ctrl.card.hasWorkCenter"
-    class="bg-title"
-    translate>
-    Autonomous worker
-</div>

 <vn-side-menu side="right">
    <div class="vn-pa-md">
--- a/print/templates/email/printer-setup/assets/files/model.ezpx
+++ b/print/templates/email/printer-setup/assets/files/model.ezpx
@ -539,9 +539,9 @@
        <Stroke>2</Stroke>
        <Width>4</Width>
      </GraphicShape>
-      <GraphicShape xsi:type="WindowText" Style="Cross" IsPrint="true" PageAlignment="None" Locked="false" bStroke="true" bFill="true" Direction="Angle90" X="613" Y="24" Alignment="Left" AlignPointX="613" AlignPointY="24" FontScript="Default" FontCmd="Arial,118.2266,B&#xD;&#xA;" FontHeight="1" FontWidth="1" TextSpace="0" bSpaceCropping="false">
+      <GraphicShape xsi:type="WindowText" Style="Cross" IsPrint="true" PageAlignment="None" Locked="false" bStroke="true" bFill="true" Direction="Angle90" X="564" Y="32" Alignment="Left" AlignPointX="564" AlignPointY="32" FontScript="Default" FontCmd="Arial,118.2266,B&#xD;&#xA;" FontHeight="1" FontWidth="1" TextSpace="0" bSpaceCropping="false">
        <qHitOnCircumferance>false</qHitOnCircumferance>
-        <Selected>false</Selected>
+        <Selected>true</Selected>
        <iBackground_color>4294967295</iBackground_color>
        <Id>5</Id>
        <ItemLabel>W5</ItemLabel>
@ -571,15 +571,15 @@
        <BoundRectHeight>2896</BoundRectHeight>
        <BoundRect>
          <Location>
-            <X>187</X>
-            <Y>24</Y>
+            <X>138</X>
+            <Y>32</Y>
          </Location>
          <Size>
            <Width>426</Width>
            <Height>2896</Height>
          </Size>
-          <X>187</X>
-          <Y>24</Y>
+          <X>138</X>
+          <Y>32</Y>
          <Width>426</Width>
          <Height>2896</Height>
        </BoundRect>
@ -621,14 +621,14 @@
  <Setup bInfinityPrint="false" LabelLength="610" LabelWidth="100" LeftMargin="0" TopMargin="0" LabelType="1" GapLength="3" FeedLength="0" ZSign="43" BlackMark="3" Position="0" Speed="2" Copy="1" bCopyDataBase="false" CopyField="None" Stripper="0" LabelsPerCut="0" DoubleCut_Enable="false" DoubleCut_OffsetLen="0" DoubleCut_FirstCutMode="1" Rotate180="200" Stop="35" Darkness="5" Number="1" bCutDataBase="false" bBatchCut="false" bNumberDataBase="false" NumberField="None" PageDirection="Portrait" PrintMode="0" PowerRFID="10" LengthRFID="0" RetryRFID="3" DrawMode="0">
    <Layout Shape="0" AcrossType="Copied" PageDirection="Portrait" HorAcross="1" VerAcross="1" HorGap="0" VerGap="0" HorAcrossMode1="1" VerAcrossMode1="1" LabelMode="0" HorGapMode1="0" VerGapMode1="0" BottomMargin="0" RightMargin="0" />
    <Description>New label
-Lang:(es-ES) OS:Microsoft Windows NT 10.0.22000.0(Win32NT)</Description>
+Lang:(es-ES) OS:Microsoft Windows NT 10.0.19045.0(Win32NT)</Description>
    <UnitType>Mm</UnitType>
    <Dpi>203</Dpi>
  </Setup>
  <PrinterModel />
  <PrinterLanguage>EZPL</PrinterLanguage>
-  <USBName>GODEX G300#132207AB</USBName>
-  <COMName>None</COMName>
+  <USBName>00000000</USBName>
+  <COMName>COM1</COMName>
  <CommunicationType>USB</CommunicationType>
  <NetworkIPAddress>2886794855</NetworkIPAddress>
  <NetworkPort>9100</NetworkPort>
--- a/print/templates/email/printer-setup/attachments.json
+++ b/print/templates/email/printer-setup/attachments.json
@ -1,9 +1,9 @@
 [
    {
-        "filename": "model.ezp",
+        "filename": "model.ezpx",
        "component": "printer-setup",
-        "path": "/assets/files/model.ezp",
-        "cid": "model.ezp"
+        "path": "/assets/files/model.ezpx",
+        "cid": "model.ezpx"
    },
    {
        "filename": "port.png",