Merge pull request #461 from siplan/461

#461 - Atualização validações no arquivo evtAltContratual.xsd
nfephp-org · Oct 14, 2022 · 17035be · 17035be
2 parents ea372c3 + d49f8b1
commit 17035be
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/schemes/v_S_01_00_00/evtAltContratual.xsd b/schemes/v_S_01_00_00/evtAltContratual.xsd
@@ -17,6 +17,7 @@
                         <xs:documentation>REGRA:REGRA_EMPREGADO_DOMESTICO</xs:documentation>
                         <xs:documentation>REGRA:REGRA_ENVIO_PROC_FECHAMENTO</xs:documentation>
                         <xs:documentation>REGRA:REGRA_EVENTOS_EXTEMP</xs:documentation>
+                        <xs:documentation>REGRA:REGRA_EVENTO_POSTERIOR_CAT_OBITO</xs:documentation>
                         <xs:documentation>REGRA:REGRA_EXISTE_INFO_EMPREGADOR</xs:documentation>
                         <xs:documentation>REGRA:REGRA_EXTEMP_DOMESTICO</xs:documentation>
                         <xs:documentation>REGRA:REGRA_EXTEMP_REINTEGRACAO</xs:documentation>
@@ -34,7 +35,7 @@
                             <xs:element name="altContratual">
                                 <xs:annotation>
                                     <xs:documentation>Alteração de dados contratuais.</xs:documentation>
-                                    <xs:documentation>CHAVE_GRUPO: {dtAlteracao}, {dtEf}</xs:documentation>
+                                    <xs:documentation>CHAVE_GRUPO: {dtAlteracao*}, {dtEf*}</xs:documentation>
                                 </xs:annotation>
                                 <xs:complexType>
                                     <xs:sequence>
@@ -66,9 +67,10 @@
                                             <xs:complexType>
                                                 <xs:sequence>
                                                     <xs:element name="tpRegPrev" type="TS_tpRegPrev" />
-                                                    <xs:element name="infoRegimeTrab">
+                                                    <xs:element name="infoRegimeTrab" minOccurs="0">
                                                         <xs:annotation>
                                                             <xs:documentation>Informações do regime trabalhista.</xs:documentation>
+                                                            <xs:documentation>CONDICAO_GRUPO: N (se {tpRegPrev}(2206_altContratual_vinculo_tpRegPrev) = [1] e {tpRegTrab}(2200_vinculo_tpRegTrab) em S-2200 = [2]); O (nos demais casos)</xs:documentation>
                                                         </xs:annotation>
                                                         <xs:complexType>
                                                             <xs:sequence>

diff --git a/src/Factories/Traits/TraitS2206.php b/src/Factories/Traits/TraitS2206.php
@@ -552,6 +552,9 @@ protected function toNodeS100()
                 $infoCeletista->appendChild($aprend);
             }
             $infoRegimeTrab->appendChild($infoCeletista);
+
+            $vinculo->appendChild($infoRegimeTrab);
+
         } elseif (!empty($this->std->infoestatutario)) {
             $ct = $this->std->infoestatutario;
             $infoEstatutario = $this->dom->createElement("infoEstatutario");
@@ -574,8 +577,9 @@ protected function toNodeS100()
                 false
             );
             $infoRegimeTrab->appendChild($infoEstatutario);
+
+            $vinculo->appendChild($infoRegimeTrab);
         }
-        $vinculo->appendChild($infoRegimeTrab);
 
         $infoContrato = $this->dom->createElement("infoContrato");
         $ct = $this->std->infocontrato;