BugID: 1360 Adeguato programma alla versione 1.1 della fatturazione e…

…lettronica con split Payment
consiglionazionaledellericerche · Feb 20, 2015 · 3e0138f · 3e0138f
1 parent a3b9fe7
commit 3e0138f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,6 +7,7 @@
 	<artifactId>sigla</artifactId>
 	<packaging>pom</packaging>
 	<modules>
+		<module>sigla-ws-client</module>
 		<module>sigla-ejb</module>
 		<module>sigla-web</module>
 		<module>sigla-ws</module>

diff --git a/...ejb/src/main/java/it/cnr/contab/docamm00/comp/DocAmmFatturazioneElettronicaComponent.java b/...ejb/src/main/java/it/cnr/contab/docamm00/comp/DocAmmFatturazioneElettronicaComponent.java
@@ -491,7 +491,11 @@ public JAXBElement<FatturaElettronicaType> creaFatturaElettronicaType(UserContex
 					RiepilogoPerAliquotaIVA riepilogo= (RiepilogoPerAliquotaIVA) i.next();
 					DatiRiepilogoType datiRiepilogo = factory.createDatiRiepilogoType();
 					datiRiepilogo.setAliquotaIVA(riepilogo.getAliquota());
-					datiRiepilogo.setEsigibilitaIVA(fattura.getFl_liquidazione_differita()? EsigibilitaIVAType.D :  EsigibilitaIVAType.I);
+					if (fattura.getFl_liquidazione_differita()){
+						datiRiepilogo.setEsigibilitaIVA(fattura.getEsercizio() > 2014 ? EsigibilitaIVAType.S :  EsigibilitaIVAType.D);
+					} else {
+						datiRiepilogo.setEsigibilitaIVA(EsigibilitaIVAType.I);
+					}
 					datiRiepilogo.setImponibileImporto(riepilogo.getImponibile().setScale(2));
 					datiRiepilogo.setImposta(riepilogo.getImposta().setScale(2));
 					impostaDatiNonImponibile(fattura, riepilogo, datiRiepilogo);

diff --git a/sigla-ws-client/src/main/resources/xsd/fatturapa_v1.1.xsd b/sigla-ws-client/src/main/resources/xsd/fatturapa_v1.1.xsd
@@ -166,13 +166,11 @@
   </xs:complexType>
   <xs:simpleType name="CausalePagamentoType">
     <xs:restriction base="xs:string">
-      <xs:length value="1" />
       <xs:enumeration value="A" />
       <xs:enumeration value="B" />
       <xs:enumeration value="C" />
       <xs:enumeration value="D" />
       <xs:enumeration value="E" />
-      <xs:enumeration value="F" />
       <xs:enumeration value="G" />
       <xs:enumeration value="H" />
       <xs:enumeration value="I" />
@@ -191,6 +189,10 @@
       <xs:enumeration value="X" />
       <xs:enumeration value="Y" />
       <xs:enumeration value="Z" />
+	  <xs:enumeration value="L1" />
+	  <xs:enumeration value="M1" />
+	  <xs:enumeration value="O1" />
+	  <xs:enumeration value="V1" />
       <!--I CODICI SEGUENTI FANNO RIFERIMENTO A QUELLI PREVISTI NEL MOD. 770S-->
     </xs:restriction>
   </xs:simpleType>
@@ -624,7 +626,12 @@
       </xs:enumeration>
       <xs:enumeration value="RF17">
         <xs:annotation>
-          <xs:documentation>IVA per cassa soggetti con volume d’affari inferiore ad euro 200.000 (art. 7, D.L. 185/2008)</xs:documentation>
+          <xs:documentation>IVA per cassa (art. 32-bis, D.L. 83/2012)</xs:documentation>
+        </xs:annotation>
+      </xs:enumeration>
+	  <xs:enumeration value="RF19">
+        <xs:annotation>
+          <xs:documentation>Regime forfettario</xs:documentation>
         </xs:annotation>
       </xs:enumeration>
       <xs:enumeration value="RF18">
@@ -1020,6 +1027,11 @@
           <xs:documentation>esigibilità immediata</xs:documentation>
         </xs:annotation>
       </xs:enumeration>
+      <xs:enumeration value="S">
+        <xs:annotation>
+          <xs:documentation>scissione dei pagamenti</xs:documentation>
+        </xs:annotation>
+      </xs:enumeration>
     </xs:restriction>
   </xs:simpleType>
   <xs:simpleType name="NaturaType">