@senior-gestao-empresarial/erpx-components 3.35.0 → 3.35.1

package/bundles/senior-gestao-empresarial-erpx-components.umd.js

@@ -10080,10 +10080,10 @@
                     return grupo.item.map(function (item) {
                         _this.tributosValue.map(function (it) {
                             if (item.name === it.tipoImposto) {
+                                item.formGroup.patchValue(it, { emitEvent: false });
                                 if (!isTaxFromTaxReform(it.tipoImposto)) {
                                     _this.setValidators(it.tipoImposto);
                                 }
-                                item.formGroup.patchValue(it, { emitEvent: false });
                             }
                         });
                     });
@@ -10127,16 +10127,14 @@
                     grupo.item
                         .filter(function (it) { return it.name == tributo; })
                         .map(function (it) {
-                        var hasValue = false;
-                        Object.keys(it.formGroup.value).forEach(function (item) {
-                            if (item !== 'impostoManual' && item !== exports.EnumCampoTributo.TipoCalculoImposto) {
-                                if (it.formGroup.get(item).touched &&
-                                    it.formGroup.value[item] != undefined &&
-                                    it.formGroup.value[item] !== '') {
-                                    hasValue = true;
-                                    return;
-                                }
-                            }
+                        var hasValue = Object.keys(it.formGroup.value)
+                            .filter(function (key) {
+                            return key !== 'impostoManual' &&
+                                key !== exports.EnumCampoTributo.TipoCalculoImposto;
+                        })
+                            .some(function (key) {
+                            return it.formGroup.get(key).value !== null &&
+                                it.formGroup.get(key).value !== undefined;
                         });
                         if (hasValue)
                             Object.keys(it.formGroup.value).forEach(function (item) {
@@ -10153,6 +10151,15 @@
                                     it.formGroup.controls[item].updateValueAndValidity({ emitEvent: false });
                                     _this.setRequired(tributo, true);
                                 }
+                                else if (item === 'situacaoTributaria') {
+                                    it.formGroup.controls[item].setValidators(forms.Validators.compose([
+                                        forms.Validators.required
+                                    ]));
+                                    it.formGroup.controls[item].updateValueAndValidity({
+                                        emitEvent: false
+                                    });
+                                    _this.setRequired(tributo, true);
+                                }
                                 else if (item === 'observacao') {
                                     it.formGroup.controls[item].setValidators(forms.Validators.compose([forms.Validators.maxLength(120)]));
                                     it.formGroup.controls[item].updateValueAndValidity({ emitEvent: false });