verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 67 Releases Wiki Activity

Merge pull request 'refs #5964 fix supply' (!1666) from 5964-supplyFixValidation into master
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #1666
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
This commit is contained in:
Carlos Satorres 2023-07-14 07:29:22 +00:00
parent 6fbadf7e4e 29a4c51518
commit 575d7710a6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/supplier/back/models/supplier.js
View File

@ -68,9 +68,9 @@ module.exports = Self => {
}; };
const country = await Self.app.models.Country.findOne(filter); const country = await Self.app.models.Country.findOne(filter);
const code = country ? country.code.toLowerCase() : null; const code = country ? country.code.toLowerCase() : null;
const countryCode = this.nif.toLowerCase().substring(0, 2); const countryCode = this.nif?.toLowerCase().substring(0, 2);
if (!this.nif || !validateTin(this.nif, code) || (this.isVies && countryCode == code)) if (!validateTin(this.nif, code) || (this.isVies && countryCode == code))
err(); err();
done(); done();
} }
@ -122,7 +122,7 @@ module.exports = Self => {
}); });
async function hasSupplierSameName(err, done) { async function hasSupplierSameName(err, done) {
if (!this.name || !this.countryFk) done(); if (!this.name || !this.countryFk) return done();
const supplier = await Self.app.models.Supplier.findOne( const supplier = await Self.app.models.Supplier.findOne(
{ {
where: { where: {