Merge pull request 'refs #5964 fix supply' (!1666) from 5964-supplyFixValidation into master
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1666 Reviewed-by: Alex Moreno <alexm@verdnatura.es>
This commit is contained in:
commit
575d7710a6
|
@ -68,9 +68,9 @@ module.exports = Self => {
|
|||
};
|
||||
const country = await Self.app.models.Country.findOne(filter);
|
||||
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();
|
||||
done();
|
||||
}
|
||||
|
@ -122,7 +122,7 @@ module.exports = Self => {
|
|||
});
|
||||
|
||||
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(
|
||||
{
|
||||
where: {
|
||||
|
|
Loading…
Reference in New Issue