@senior-gestao-empresarial/erpx-components 1.20.1 → 1.20.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundles/senior-gestao-empresarial-erpx-components.umd.js +3 -1
- package/bundles/senior-gestao-empresarial-erpx-components.umd.js.map +1 -1
- package/bundles/senior-gestao-empresarial-erpx-components.umd.min.js +1 -1
- package/bundles/senior-gestao-empresarial-erpx-components.umd.min.js.map +1 -1
- package/esm2015/components/tributos/erp-tributos.component.js +4 -2
- package/esm5/components/tributos/erp-tributos.component.js +4 -2
- package/fesm2015/senior-gestao-empresarial-erpx-components.js +3 -1
- package/fesm2015/senior-gestao-empresarial-erpx-components.js.map +1 -1
- package/fesm5/senior-gestao-empresarial-erpx-components.js +3 -1
- package/fesm5/senior-gestao-empresarial-erpx-components.js.map +1 -1
- package/package.json +1 -1
|
@@ -2873,7 +2873,7 @@
|
|
|
2873
2873
|
if (valores.funBase > 0 && valores.funBase != funruralImposto.formGroup.value.baseCalculo) {
|
|
2874
2874
|
valores.baseDiferente = true;
|
|
2875
2875
|
}
|
|
2876
|
-
valores.funBase = funruralImposto.formGroup.value.baseCalculo;
|
|
2876
|
+
valores.funBase = funruralImposto.formGroup.value.baseCalculo > valores.funBase ? funruralImposto.formGroup.value.baseCalculo : valores.funBase;
|
|
2877
2877
|
}
|
|
2878
2878
|
if (funruralImposto.formGroup.value.valor != undefined) {
|
|
2879
2879
|
valores.funValor = Number(this_1.roundImposto(Number(valores.funValor) + Number(funruralImposto.formGroup.value.valor), 2));
|
|
@@ -3517,6 +3517,7 @@
|
|
|
3517
3517
|
id: tributo + 'IndicativoAquisicao',
|
|
3518
3518
|
name: 'indicativoAquisicao',
|
|
3519
3519
|
label: _this.translate.instant('erpx_tributos.fields.indicativo_aquisicao_label'),
|
|
3520
|
+
showClear: true,
|
|
3520
3521
|
type: angularComponents$1.FieldType.Enum,
|
|
3521
3522
|
options: [
|
|
3522
3523
|
{
|
|
@@ -3760,6 +3761,7 @@
|
|
|
3760
3761
|
|| (it.grupo == 'erpx_tributos.enum_grupo_tributo_' + exports.EnumGrupoTributo.PIS + '_label')
|
|
3761
3762
|
|| (it.grupo == 'erpx_tributos.enum_grupo_tributo_' + exports.EnumGrupoTributo.COFINS + '_label')
|
|
3762
3763
|
|| (it.grupo == 'erpx_tributos.enum_grupo_tributo_' + exports.EnumGrupoTributo.RETENCOES + '_label')
|
|
3764
|
+
|| (it.grupo == 'erpx_tributos.enum_grupo_tributo_' + exports.EnumGrupoTributo.FUNRURAL + '_label')
|
|
3763
3765
|
|| (it.grupo == 'erpx_tributos.enum_grupo_tributo_' + exports.EnumGrupoTributo.ISS + '_label')
|
|
3764
3766
|
|| (it.grupo == 'erpx_tributos.enum_grupo_tributo_' + exports.EnumGrupoTributo.CIDE_TECNOLOGIA + '_label')
|
|
3765
3767
|
|| (it.grupo == 'erpx_tributos.enum_grupo_tributo_' + exports.EnumGrupoTributo.IPI + '_label'); })
|