root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/R_10_00' into R_10_00

Browse Source
This commit is contained in:
Simone Palacino 2019-10-16 14:36:52 +02:00
commit 8f8f959dc8
20 changed files with 230 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/profiles.vcxproj
View File

@ -164,15 +164,9 @@
<SrcCompiler Include="..\src\ve\ordbon.src" />
<SrcCompiler Include="..\src\ve\ordinec.src" />
<SrcCompiler Include="..\src\ve\ordinef.src" />
<SrcSimpleCompiler Include="..\src\ve\ve0300a.src">
<FileType>Document</FileType>
</SrcSimpleCompiler>
</ItemGroup>
<ItemGroup>
<DatCompiler Include="..\src\ve\ve0300b.dat" />
</ItemGroup>
<ItemGroup>
<IniCompiler Include="..\src\ve\ve0300c.ini" />
<ClInclude Include="..\src\ve\ve0.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

14
build/profiles.vcxproj.filters
View File

@ -47,18 +47,8 @@
</SrcCompiler>
</ItemGroup>
<ItemGroup>
<DatCompiler Include="..\src\ve\ve0300b.dat">
<ClInclude Include="..\src\ve\ve0.h">
<Filter>Sources</Filter>
</DatCompiler>
</ItemGroup>
<ItemGroup>
<IniCompiler Include="..\src\ve\ve0300c.ini">
<Filter>Dat</Filter>
</IniCompiler>
</ItemGroup>
<ItemGroup>
<SrcSimpleCompiler Include="..\src\ve\ve0300a.src">
<Filter>Src</Filter>
</SrcSimpleCompiler>
</ClInclude>
</ItemGroup>
</Project>

19
build/srcini32.bat Normal file
View File

@ -0,0 +1,19 @@
rem @echo off
echo Generating %1 ini file
set oldinc=%include
set include=..\src\include;..\src\xvaga;..\src\ve;%~p1
type ..\src\include\uml.h >%TMP%\%~n1.tmp
type ..\src\ve\veuml.h >>%TMP%\%~n1.tmp
type %1 >>%TMP%\%~n1.tmp
cl /nologo /EP %TMP%\%~n1.tmp >%TMP%\%~n1.ini
fastrip %TMP%\%~n1.ini %2
set include=%oldinc
set oldinc=
del %TMP%\%~n1.ini
del %TMP%\%~n1.tmp
cd %~p2

21
build/ve0.vcxproj
View File

@ -69,7 +69,6 @@
<MinimalRebuild>
</MinimalRebuild>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -182,12 +181,7 @@
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\ve\ve0500.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\ve\ve0500.cpp" />
<ClCompile Include="..\src\ve\ve0600.cpp" />
</ItemGroup>
<ItemGroup>
@ -260,6 +254,7 @@
<MenCompiler Include="..\src\ve\vemenu.men" />
</ItemGroup>
<ItemGroup>
<TrrCompiler Include="..\src.old\ve\f180.trr" />
<TrrCompiler Include="..\src\ve\f115.trr" />
<TrrCompiler Include="..\src\ve\f126.trr" />
<TrrCompiler Include="..\src\ve\f33.trr" />
@ -274,6 +269,7 @@
<TrrCompiler Include="..\src\ve\f55.trr" />
</ItemGroup>
<ItemGroup>
<DirCompiler Include="..\src.old\ve\f180.dir" />
<DirCompiler Include="..\src\ve\f115.dir" />
<DirCompiler Include="..\src\ve\f126.dir" />
<DirCompiler Include="..\src\ve\f33.dir" />
@ -287,6 +283,17 @@
<DirCompiler Include="..\src\ve\f53.dir" />
<DirCompiler Include="..\src\ve\f55.dir" />
</ItemGroup>
<ItemGroup>
<SrcSimpleCompiler Include="..\src\ve\ve0300a.src">
<FileType>Document</FileType>
</SrcSimpleCompiler>
</ItemGroup>
<ItemGroup>
<DatCompiler Include="..\src\ve\ve0300b.dat" />
</ItemGroup>
<ItemGroup>
<IniCompiler Include="..\src\ve\ve0300c.ini" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="CampoRules.targets" />

25
build/ve0.vcxproj.filters
View File

@ -43,10 +43,10 @@
<ClCompile Include="..\src\ve\ve0400.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\ve\ve0500.cpp">
<ClCompile Include="..\src\ve\ve0600.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\ve\ve0600.cpp">
<ClCompile Include="..\src\ve\ve0500.cpp">
<Filter>Sources</Filter>
</ClCompile>
</ItemGroup>
@ -192,6 +192,9 @@
<TrrCompiler Include="..\src\ve\f126.trr">
<Filter>Trr</Filter>
</TrrCompiler>
<TrrCompiler Include="..\src.old\ve\f180.trr">
<Filter>Trr</Filter>
</TrrCompiler>
</ItemGroup>
<ItemGroup>
<DirCompiler Include="..\src\ve\f33.dir">
@ -230,5 +233,23 @@
<DirCompiler Include="..\src\ve\f126.dir">
<Filter>Dir</Filter>
</DirCompiler>
<DirCompiler Include="..\src.old\ve\f180.dir">
<Filter>Dir</Filter>
</DirCompiler>
</ItemGroup>
<ItemGroup>
<SrcSimpleCompiler Include="..\src\ve\ve0300a.src">
<Filter>Sources</Filter>
</SrcSimpleCompiler>
</ItemGroup>
<ItemGroup>
<DatCompiler Include="..\src\ve\ve0300b.dat">
<Filter>Sources</Filter>
</DatCompiler>
</ItemGroup>
<ItemGroup>
<IniCompiler Include="..\src\ve\ve0300c.ini">
<Filter>Sources</Filter>
</IniCompiler>
</ItemGroup>
</Project>

2
build/ve2.vcxproj
View File

@ -68,7 +68,6 @@
<PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;__LONGDOUBLE__</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -281,6 +280,7 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</MskCompiler>
<MskCompiler Include="..\src\ve\ve2400f.uml" />
<MskCompiler Include="..\src\ve\ve2400k.uml" />
<MskCompiler Include="..\src\ve\ve2500ac.uml" />
<MskCompiler Include="..\src\ve\ve2500al.uml" />

3
build/ve2.vcxproj.filters
View File

@ -217,5 +217,8 @@
<MskCompiler Include="..\src\ve\ve2800b.uml">
<Filter>Masks</Filter>
</MskCompiler>
<MskCompiler Include="..\src\ve\ve2400f.uml">
<Filter>Masks</Filter>
</MskCompiler>
</ItemGroup>
</Project>

62
build/ve_maskrighe.vcxproj
View File

@ -139,56 +139,6 @@
</Bscmake>
</ItemDefinitionGroup>
<ItemGroup>
<MskCompiler Include="..\src\ve\ve0100a.uml">
<FileType>Document</FileType>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</ExcludedFromBuild>
</MskCompiler>
<MskCompiler Include="..\src\ve\ve0100b.uml">
<FileType>Document</FileType>
</MskCompiler>
<MskCompiler Include="..\src\ve\ve0100c.uml">
<FileType>Document</FileType>
</MskCompiler>
<MskCompiler Include="..\src\ve\ve0100d.uml">
<FileType>Document</FileType>
</MskCompiler>
<MskCompiler Include="..\src\ve\ve0100o.uml">
<FileType>Document</FileType>
</MskCompiler>
<MskCompiler Include="..\src\ve\ve0200a.uml">
<FileType>Document</FileType>
</MskCompiler>
<MskCompiler Include="..\src\ve\ve0200b.uml">
<FileType>Document</FileType>
</MskCompiler>
<MskCompiler Include="..\src\ve\ve0200c.uml">
<FileType>Document</FileType>
</MskCompiler>
<MskCompiler Include="..\src\ve\ve0200d.uml">
<FileType>Document</FileType>
</MskCompiler>
<MskCompiler Include="..\src\ve\ve0200e.uml">
<FileType>Document</FileType>
</MskCompiler>
<MskCompiler Include="..\src\ve\ve0200f.uml">
<FileType>Document</FileType>
</MskCompiler>
<MskCompiler Include="..\src\ve\ve0200g.uml">
<FileType>Document</FileType>
</MskCompiler>
<MskCompiler Include="..\src\ve\ve0200h.uml">
<FileType>Document</FileType>
</MskCompiler>
<MskCompiler Include="..\src\ve\ve0500a.uml">
<FileType>Document</FileType>
</MskCompiler>
<MskCompiler Include="..\src\ve\velib04d.uml">
<FileType>Document</FileType>
</MskCompiler>
<MskCompiler Include="..\src\ve\velib04e.uml">
<FileType>Document</FileType>
</MskCompiler>
<MskCompiler Include="..\src\ve\verig.uml" />
<CustomBuild Include="..\src\ve\verig00.uml">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Compiling line mask %(FullPath)...</Message>
@ -349,18 +299,6 @@
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)%(Filename).msk;%(Outputs)</Outputs>
</CustomBuild>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\src\ve\ve0300b.dat">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying dat %(Filename)...</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(TargetDir)%(Filename).dat
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)%(Filename).dat;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying dat %(Filename)...</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(TargetDir)%(Filename).dat
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)%(Filename).dat;%(Outputs)</Outputs>
</CustomBuild>
</ItemGroup>
<ItemGroup>
<IniCompiler Include="..\src\ve\verig01.ini" />
<IniCompiler Include="..\src\ve\verig02.ini" />

65
build/ve_maskrighe.vcxproj.filters
View File

@ -12,59 +12,6 @@
<UniqueIdentifier>{14bb585e-0c0d-42da-a077-cb102cf4ebfa}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<MskCompiler Include="..\src\ve\ve0100a.uml">
<Filter>Mask</Filter>
</MskCompiler>
<MskCompiler Include="..\src\ve\ve0100b.uml">
<Filter>Mask</Filter>
</MskCompiler>
<MskCompiler Include="..\src\ve\ve0100c.uml">
<Filter>Mask</Filter>
</MskCompiler>
<MskCompiler Include="..\src\ve\ve0100d.uml">
<Filter>Mask</Filter>
</MskCompiler>
<MskCompiler Include="..\src\ve\ve0100o.uml">
<Filter>Mask</Filter>
</MskCompiler>
<MskCompiler Include="..\src\ve\ve0200a.uml">
<Filter>Mask</Filter>
</MskCompiler>
<MskCompiler Include="..\src\ve\ve0200b.uml">
<Filter>Mask</Filter>
</MskCompiler>
<MskCompiler Include="..\src\ve\ve0200c.uml">
<Filter>Mask</Filter>
</MskCompiler>
<MskCompiler Include="..\src\ve\ve0200d.uml">
<Filter>Mask</Filter>
</MskCompiler>
<MskCompiler Include="..\src\ve\ve0200e.uml">
<Filter>Mask</Filter>
</MskCompiler>
<MskCompiler Include="..\src\ve\ve0200f.uml">
<Filter>Mask</Filter>
</MskCompiler>
<MskCompiler Include="..\src\ve\ve0200g.uml">
<Filter>Mask</Filter>
</MskCompiler>
<MskCompiler Include="..\src\ve\ve0200h.uml">
<Filter>Mask</Filter>
</MskCompiler>
<MskCompiler Include="..\src\ve\ve0500a.uml">
<Filter>Mask</Filter>
</MskCompiler>
<MskCompiler Include="..\src\ve\velib04d.uml">
<Filter>Mask</Filter>
</MskCompiler>
<MskCompiler Include="..\src\ve\velib04e.uml">
<Filter>Mask</Filter>
</MskCompiler>
<MskCompiler Include="..\src\ve\verig.uml">
<Filter>Mask</Filter>
</MskCompiler>
</ItemGroup>
<ItemGroup>
<IniCompiler Include="..\src\ve\verig23.ini">
<Filter>Ini</Filter>
@ -105,10 +52,10 @@
<IniCompiler Include="..\src\ve\verig03.ini">
<Filter>Ini</Filter>
</IniCompiler>
<IniCompiler Include="..\src\ve\verig02.ini">
<IniCompiler Include="..\src\ve\verig01.ini">
<Filter>Ini</Filter>
</IniCompiler>
<IniCompiler Include="..\src\ve\verig01.ini">
<IniCompiler Include="..\src\ve\verig02.ini">
<Filter>Ini</Filter>
</IniCompiler>
</ItemGroup>
@ -161,8 +108,10 @@
<CustomBuild Include="..\src\ve\verig23.uml">
<Filter>Mask</Filter>
</CustomBuild>
<CustomBuild Include="..\src\ve\ve0300b.dat">
<Filter>Ini</Filter>
</CustomBuild>
</ItemGroup>
<ItemGroup>
<MskCompiler Include="..\src\ve\verig.uml">
<Filter>Mask</Filter>
</MskCompiler>
</ItemGroup>
</Project>

BIN
cd/test/fp0888a1.zip
View File

Binary file not shown.

80
src/cg/cg0800a.rep
View File

@ -1,31 +1,31 @@
<?xml version="1.0" encoding="UTF-8" ?>
<report name="cg0800a" lpi="6" class="cg0800">
<report name="cg0800a" orientation="2" lpi="6" command="cg0 -7" class="cg0800">
<description>Riepilogo progressivi IVA</description>
<font face="Arial" size="7" />
<section type="Head" pattern="1">
<field x="4" type="Data" width="10" pattern="1">
<source>#SYSTEM.DATE</source>
</field>
<field x="39" type="Testo" align="center" width="4" pattern="1" text="Ditta">
<field x="48.5" type="Testo" align="center" width="4" pattern="1" text="Ditta">
<source>#SYSTEM.RAGSOC</source>
</field>
<field x="45" type="Stringa" align="center" width="50" pattern="1">
<field x="54.5" type="Stringa" align="center" width="50" pattern="1">
<source>#SYSTEM.RAGSOC</source>
</field>
<field x="127" type="Testo" width="4" pattern="1" text="Pag.">
<field x="154" type="Testo" width="4" pattern="1" text="Pag.">
<source>#PAGE</source>
</field>
<field x="131.5" type="Numero" align="right" width="5" pattern="1">
<field x="158.5" type="Numero" align="right" width="5" pattern="1">
<source>#PAGE</source>
</field>
<field x="38" y="1" type="Testo" width="25" pattern="1" text="Progressivi IVA">
<field x="47.5" y="1" type="Testo" width="25" pattern="1" text="Progressivi IVA">
<font face="Courier New" bold="1" size="10" />
</field>
<field x="64" y="1" type="Numero" align="right" width="6" pattern="1">
<field x="73.5" y="1" type="Numero" align="right" width="6" pattern="1">
<font face="Courier New" bold="1" size="10" />
<source>#ANNO</source>
</field>
<field x="74" y="1" type="Array" width="16" pattern="1">
<field x="83.5" y="1" type="Array" width="16" pattern="1">
<font face="Courier New" bold="1" size="10" />
<source>#DAMESE</source>
<list>
@ -44,7 +44,7 @@
<li Value="annuale" Code="13" />
</list>
</field>
<field x="91" y="1" type="Array" width="16" pattern="1">
<field x="100.5" y="1" type="Array" width="16" pattern="1">
<font face="Courier New" bold="1" size="10" />
<source>#AMESE</source>
<list>
@ -63,25 +63,31 @@
<li Code="13" />
</list>
</field>
<field x="60" y="2.25" type="Testo" width="10" pattern="1" text="Vendite">
<field x="63.5" y="2.25" type="Testo" align="center" width="10" pattern="1" text="Vendite">
<font face="Arial" size="10" />
</field>
<field x="87.5" y="2.25" type="Testo" align="center" width="18" pattern="1" text="Corrispettivi">
<font face="Arial" size="10" />
</field>
<field x="119.5" y="2.25" type="Testo" align="center" width="12" pattern="1" text="Acquisti">
<font face="Courier New" size="10" />
</field>
<field x="85.5" y="2.25" type="Testo" width="18" pattern="1" text="Corrispettivi">
<font face="Courier New" size="10" />
<field x="141.5" y="2.25" type="Testo" align="center" width="20" pattern="1" text="Acquisti indetraibili">
<font face="Arial" size="10" />
</field>
<field x="114" y="2.25" type="Testo" width="12" pattern="1" text="Acquisti">
<font face="Courier New" size="10" />
<field x="53.5" y="3" type="Testo" align="center" width="30" pattern="1" text=" Imponibile Imposta">
<font face="Arial" size="10" />
</field>
<field x="53" y="3.25" type="Testo" width="30" pattern="1" text=" Imponibile Imposta">
<font face="Courier New" size="10" />
<field x="81.5" y="3" type="Testo" align="center" width="30" pattern="1" text=" Imponibile Imposta">
<font face="Arial" size="10" />
</field>
<field x="81" y="3.25" type="Testo" width="30" pattern="1" text=" Imponibile Imposta">
<font face="Courier New" size="10" />
<field x="110" y="3" type="Testo" align="center" width="30" pattern="1" text=" Imponibile Imposta">
<font face="Arial" size="10" />
</field>
<field x="108" y="3.25" type="Testo" width="30" pattern="1" text=" Imponibile Imposta">
<font face="Courier New" size="10" />
<field x="138.5" y="3" type="Testo" align="center" width="25" pattern="1" text=" Imponibile Imposta">
<font face="Arial" size="10" />
</field>
<field border="2" x="4" y="4.75" type="Linea" width="134" height="0" pattern="1" />
<field border="2" x="4" y="4.75" type="Linea" width="160" height="0" pattern="1" />
</section>
<section type="Head" level="1" pattern="1" />
<section type="Body" pattern="1" />
@ -97,22 +103,22 @@
<postscript description="B1.0 POSTSCRIPT">#THIS @
#F1.102 +!</postscript>
</field>
<field x="69.5" type="Valuta" align="right" width="13" pattern="1" hide_zero="1" text="###.###.###,@@">
<field x="68.5" type="Valuta" align="right" width="13" pattern="1" hide_zero="1" text="###.###.###,@@">
<source>IVAVEN</source>
<postscript description="B1.0 POSTSCRIPT">#THIS @
#F1.103 +!</postscript>
</field>
<field x="82.5" type="Valuta" align="right" width="13" pattern="1" hide_zero="1" text="###.###.###,@@">
<field x="82" type="Valuta" align="right" width="13" pattern="1" hide_zero="1" text="###.###.###,@@">
<source>IMPCORR</source>
<postscript description="B1.0 POSTSCRIPT">#THIS @
#F1.104 +!</postscript>
</field>
<field x="96.5" type="Valuta" align="right" width="13" pattern="1" hide_zero="1" text="###.###.###,@@">
<field x="95.5" type="Valuta" align="right" width="13" pattern="1" hide_zero="1" text="###.###.###,@@">
<source>IVACORR</source>
<postscript description="B1.0 POSTSCRIPT">#THIS @
#F1.105 +!</postscript>
</field>
<field x="110" type="Valuta" align="right" width="13" pattern="1" hide_zero="1" text="###.###.###,@@">
<field x="109.5" type="Valuta" align="right" width="13" pattern="1" hide_zero="1" text="###.###.###,@@">
<source>IMPACQ</source>
<postscript description="B1.0 POSTSCRIPT">#THIS @
#F1.106 +!</postscript>
@ -122,19 +128,31 @@
<postscript description="B1.0 POSTSCRIPT">#THIS @
#F1.107 +!</postscript>
</field>
<field x="137" type="Valuta" align="right" width="13" pattern="1" hide_zero="1" text="###.###.###,@@">
<source>IMPACQIND</source>
<postscript description="B1.0 POSTSCRIPT">#THIS @
#F1.108 +!</postscript>
</field>
<field x="150.5" type="Valuta" align="right" width="13" pattern="1" hide_zero="1" text="###.###.###,@@">
<source>IVAACQIND</source>
<postscript description="B1.0 POSTSCRIPT">#THIS @
#F1.109 +!</postscript>
</field>
</section>
<section type="Foot" pattern="1" />
<section type="Foot" level="1" pattern="1">
<field border="2" x="4" y="0.5" type="Linea" width="134" height="0" pattern="1" />
<field border="2" x="4" y="0.5" type="Linea" width="160" height="0" pattern="1" />
<field x="9" y="1" type="Testo" width="20" height="2" id="101" pattern="1" text="Totale">
<source>DESC</source>
</field>
<field x="55" y="1" type="Valuta" align="right" width="13" id="102" pattern="1" hide_zero="1" text="###.###.###,@@" />
<field x="69.5" y="1" type="Valuta" align="right" width="13" id="103" pattern="1" hide_zero="1" text="###.###.###,@@" />
<field x="82.5" y="1" type="Valuta" align="right" width="13" id="104" pattern="1" hide_zero="1" text="###.###.###,@@" />
<field x="96.5" y="1" type="Valuta" align="right" width="13" id="105" pattern="1" hide_zero="1" text="###.###.###,@@" />
<field x="110" y="1" type="Valuta" align="right" width="13" id="106" pattern="1" hide_zero="1" text="###.###.###,@@" />
<field x="54.5" y="1" type="Valuta" align="right" width="13" id="102" pattern="1" hide_zero="1" text="###.###.###,@@" />
<field x="68" y="1" type="Valuta" align="right" width="13" id="103" pattern="1" hide_zero="1" text="###.###.###,@@" />
<field x="82" y="1" type="Valuta" align="right" width="13" id="104" pattern="1" hide_zero="1" text="###.###.###,@@" />
<field x="95.5" y="1" type="Valuta" align="right" width="13" id="105" pattern="1" hide_zero="1" text="###.###.###,@@" />
<field x="109.5" y="1" type="Valuta" align="right" width="13" id="106" pattern="1" hide_zero="1" text="###.###.###,@@" />
<field x="123" y="1" type="Valuta" align="right" width="13" id="107" pattern="1" hide_zero="1" text="###.###.###,@@" />
<field x="137.5" y="1" type="Valuta" align="right" width="13" id="108" pattern="1" hide_zero="1" text="###.###.###,@@" />
<field x="151" y="1" type="Valuta" align="right" width="13" id="109" pattern="1" hide_zero="1" text="###.###.###,@@" />
</section>
<sql>USE 25 KEY 1 SELECT BETWEEN(23.DATAREG;#FROMDATE;#TODATE) \nJOIN 23 INTO NUMREG==NUMREG";</sql>
</report>

8
src/cg/cg2100.cpp
View File

@ -683,9 +683,9 @@ void TPrimanota_application::init_mask(TMask& m)
}
TEdit_field& rc = m.efield(F_REVCHARGE);
rc.show(cc.iva() == iva_acquisti && cc.reverse_charge());
rc.show(cc.iva() == iva_acquisti && cc.reverse_charge_pubb());
m.efield(F_MOVCOLL).show((cc.iva() == iva_acquisti && cc.reverse_charge()) ||
m.efield(F_MOVCOLL).show((cc.iva() == iva_acquisti && cc.reverse_charge_pubb()) ||
(cc.iva() == iva_vendite && cc.causale_reg_iva()));
// m.efield(F_GOCOLL).show((c.iva() == iva_acquisti && c.reverse_charge()) ||
// (c.iva() == iva_vendite && c.causale_reg_iva()));
@ -858,7 +858,7 @@ bool TPrimanota_application::get_next_key(TToken_string& tmp)
else
tmp.add(m.get(F_DATACOMP));
if (_iva != nessuna_iva)
if (m.find_by_id(F_DATACOMPCR) && _iva != nessuna_iva)
{
tmp.add(F_DATACOMPCR); // Ricopia data competenza
if (m.field(F_DATACOMPCR).empty())
@ -1689,7 +1689,7 @@ int TPrimanota_application::write(const TMask& m)
int TPrimanota_application::rewrite(const TMask& m)
{
if (cached_causale(_rel->file().get(MOV_CODCAUS), _rel->file().get_int(MOV_ANNOES)).reverse_charge())
if (cached_causale(_rel->file().get(MOV_CODCAUS), _rel->file().get_int(MOV_ANNOES)).reverse_charge_pubb())
{
const long movcoll = m.get_long(F_MOVCOLL);

10
src/cg/cg2102.cpp
View File

@ -2332,8 +2332,8 @@ bool TPrimanota_application::caus_modify_handler(TMask_field& f, KEY key)
}
if (c.iva() != nessuna_iva && mask_ok)
{
m.efield(F_REVCHARGE).show(c.iva() == iva_acquisti && c.reverse_charge());
m.efield(F_MOVCOLL).show((c.iva() == iva_acquisti && c.reverse_charge()) ||
m.efield(F_REVCHARGE).show(c.iva() == iva_acquisti && c.reverse_charge_pubb());
m.efield(F_MOVCOLL).show((c.iva() == iva_acquisti && c.reverse_charge_pubb()) ||
(c.iva() == iva_vendite && c.causale_reg_iva()));
// m.efield(F_GOCOLL).show((c.iva() == iva_acquisti && c.reverse_charge()) ||
// (c.iva() == iva_vendite && c.causale_reg_iva()));
@ -3084,7 +3084,7 @@ bool TPrimanota_application::main_codiva_handler(TMask_field& f, KEY key)
mm.set(F_RITFIS, imposta, true);
}
} else
if (a.causale().reverse_charge())
if (a.causale().reverse_charge_pubb())
{
const real totale = mm.get_real(F_TOTALE) + mm.get_real(F_RITFIS);
const real imposta = codiva.imposta(totale);
@ -3177,7 +3177,7 @@ bool TPrimanota_application::activate_split_payment(TMask& m)
TMask_field* sp = m.find_by_id(F_SPLITPAY);
if (sp != NULL)
{
if (clifo() == "C" && m.get_int(F_ANNOIVA) >= 2015 && !causale().reverse_charge())
if (clifo() == "C" && m.get_int(F_ANNOIVA) >= 2015 && !causale().reverse_charge_pubb())
{
const TRectype& cliente = cache().get_rec(LF_CLIFO, "C", m.get(F_CODCLIFOR));
yes = cliente.get_bool(CLI_SPLITPAY);
@ -3228,7 +3228,7 @@ bool TPrimanota_application::is_split_payment() const
s = 'N';
if (iva() == nessuna_iva)
return false;
if (clifo() == "C" && m.get_int(F_ANNOIVA) >= 2015 && !causale().reverse_charge())
if (clifo() == "C" && m.get_int(F_ANNOIVA) >= 2015 && !causale().reverse_charge_pubb())
{
const TRectype& cliente = cache().get_rec(LF_CLIFO, "C", m.get(F_CODCLIFOR));
if (cliente.get_bool(CLI_SPLITPAY))

6
src/cg/cg2103.cpp
View File

@ -174,6 +174,12 @@ bool TCausale::reverse_charge() const
return rsi == 13 || rsi == 50 || rsi == 51; // Reverse charge!
}
bool TCausale::reverse_charge_pubb() const
{
const int rsi = regime_speciale();
return rsi == 13 || rsi == 19 || rsi == 50 || rsi == 51; // Reverse charge!
}
bool TCausale::esclusione_allegati() const
{ return _rec.get_bool(CAU_ALLEG); }

3
src/cg/cg2103.h
View File

@ -40,7 +40,8 @@ public:
bool intra() const;
bool valintra() const;
bool soloiva() const;
bool reverse_charge() const;
bool reverse_charge() const;
bool reverse_charge_pubb() const;
bool regolarizzazione() const;
bool ril_fat_em_ric() const;
bool datareg_prec() const;

80
src/cg/cg4b00a.rep
View File

@ -1,31 +1,31 @@
<?xml version="1.0" encoding="UTF-8" ?>
<report name="cg4b00a" lpi="6" class="cg4b00">
<report name="cg4b00a" orientation="2" lpi="6" command="cg4 -10" class="cg4b00">
<description>Riepilogo progressivi IVA per competenza</description>
<font face="Arial" size="7" />
<section type="Head" pattern="1">
<field x="4" type="Data" width="10" pattern="1">
<source>#SYSTEM.DATE</source>
</field>
<field x="39" type="Testo" align="center" width="4" pattern="1" text="Ditta">
<field x="45.5" type="Testo" align="center" width="4" pattern="1" text="Ditta">
<source>#SYSTEM.RAGSOC</source>
</field>
<field x="45" type="Stringa" align="center" width="50" pattern="1">
<field x="51.5" type="Stringa" align="center" width="50" pattern="1">
<source>#SYSTEM.RAGSOC</source>
</field>
<field x="127" type="Testo" width="4" pattern="1" text="Pag.">
<field x="154" type="Testo" width="4" pattern="1" text="Pag.">
<source>#PAGE</source>
</field>
<field x="131.5" type="Numero" align="right" width="5" pattern="1">
<field x="158.5" type="Numero" align="right" width="5" pattern="1">
<source>#PAGE</source>
</field>
<field x="21.5" y="1" type="Testo" width="45" pattern="1" text="Progressivi IVA per competenza">
<field x="42.5" y="1.25" type="Testo" width="45" pattern="1" text="Progressivi IVA per competenza">
<font face="Courier New" bold="1" size="10" />
</field>
<field x="67.5" y="1" type="Numero" align="right" width="6" pattern="1">
<field x="86.5" y="1.25" type="Numero" align="right" width="6" pattern="1">
<font face="Courier New" bold="1" size="10" />
<source>#ANNO</source>
</field>
<field x="77.5" y="1" type="Array" width="16" pattern="1">
<field x="94.5" y="1.25" type="Array" width="16" pattern="1">
<font face="Courier New" bold="1" size="10" />
<source>#DAMESE</source>
<list>
@ -44,7 +44,7 @@
<li Value="annuale" Code="13" />
</list>
</field>
<field x="94.5" y="1" type="Array" width="16" pattern="1">
<field x="112.5" y="1.25" type="Array" width="16" pattern="1">
<font face="Courier New" bold="1" size="10" />
<source>#AMESE</source>
<list>
@ -63,39 +63,45 @@
<li Code="13" />
</list>
</field>
<field x="28.5" y="2" type="Testo" width="35" pattern="1" text="Da data di registrazione">
<field x="42.5" y="2.25" type="Testo" width="35" pattern="1" text="Da data di registrazione">
<font face="Courier New" bold="1" size="10" />
</field>
<field x="63.5" y="2" type="Data" width="14" pattern="1">
<field x="78" y="2.25" type="Data" width="14" pattern="1">
<font face="Courier New" bold="1" size="10" />
<source>#FROMDATE</source>
</field>
<field x="78" y="2" type="Testo" width="2" pattern="1" text="a">
<field x="94" y="2.25" type="Testo" width="2" pattern="1" text="a">
<font face="Courier New" bold="1" size="10" />
</field>
<field x="81" y="2" type="Data" width="14" pattern="1">
<field x="97.5" y="2.25" type="Data" width="14" pattern="1">
<font face="Courier New" bold="1" size="10" />
<source>#TODATE</source>
</field>
<field x="63" y="3" type="Testo" width="10" pattern="1" text="Vendite">
<field x="64" y="3.25" type="Testo" align="center" width="10" pattern="1" text="Vendite">
<font face="Arial" size="10" />
</field>
<field x="90" y="3.25" type="Testo" align="center" width="15" pattern="1" text="Corrispettivi">
<font face="Arial" size="10" />
</field>
<field x="120.5" y="3.25" type="Testo" width="12" pattern="1" text="Acquisti">
<font face="Courier New" size="10" />
</field>
<field x="88" y="3" type="Testo" width="18" pattern="1" text="Corrispettivi">
<font face="Courier New" size="10" />
<field x="143" y="3.25" type="Testo" align="center" width="20" pattern="1" text="Acquisti indetraibili">
<font face="Arial" size="10" />
</field>
<field x="117.5" y="3" type="Testo" width="12" pattern="1" text="Acquisti">
<font face="Courier New" size="10" />
<field x="54.5" y="4.25" type="Testo" align="center" width="30" pattern="1" text=" Imponibile Imposta">
<font face="Arial" size="10" />
</field>
<field x="53" y="4" type="Testo" width="30" pattern="1" text=" Imponibile Imposta">
<font face="Courier New" size="10" />
<field x="82" y="4.25" type="Testo" align="center" width="30" pattern="1" text=" Imponibile Imposta">
<font face="Arial" size="10" />
</field>
<field x="81" y="4" type="Testo" width="30" pattern="1" text=" Imponibile Imposta">
<font face="Courier New" size="10" />
<field x="109.5" y="4.25" type="Testo" align="center" width="30" pattern="1" text=" Imponibile Imposta">
<font face="Arial" size="10" />
</field>
<field x="108" y="4" type="Testo" width="30" pattern="1" text=" Imponibile Imposta">
<font face="Courier New" size="10" />
<field x="137" y="4.25" type="Testo" align="center" width="30" pattern="1" text=" Imponibile Imposta">
<font face="Arial" size="10" />
</field>
<field border="2" x="4" y="5.5" type="Linea" width="134" height="0" pattern="1" />
<field border="2" x="4" y="5.5" type="Linea" width="160" height="0" pattern="1" />
</section>
<section type="Head" level="1" pattern="1" />
<section type="Body" pattern="1" />
@ -111,7 +117,7 @@
<postscript description="B1.0 POSTSCRIPT">#THIS @
#F1.102 +!</postscript>
</field>
<field x="69.5" type="Valuta" align="right" width="13" pattern="1" hide_zero="1" text="###.###.###,@@">
<field x="68.5" type="Valuta" align="right" width="13" pattern="1" hide_zero="1" text="###.###.###,@@">
<source>IVAVEN</source>
<postscript description="B1.0 POSTSCRIPT">#THIS @
#F1.103 +!</postscript>
@ -121,7 +127,7 @@
<postscript description="B1.0 POSTSCRIPT">#THIS @
#F1.104 +!</postscript>
</field>
<field x="96.5" type="Valuta" align="right" width="13" pattern="1" hide_zero="1" text="###.###.###,@@">
<field x="96" type="Valuta" align="right" width="13" pattern="1" hide_zero="1" text="###.###.###,@@">
<source>IVACORR</source>
<postscript description="B1.0 POSTSCRIPT">#THIS @
#F1.105 +!</postscript>
@ -131,24 +137,36 @@
<postscript description="B1.0 POSTSCRIPT">#THIS @
#F1.106 +!</postscript>
</field>
<field x="123" type="Valuta" align="right" width="13" pattern="1" hide_zero="1" text="###.###.###,@@">
<field x="123.5" type="Valuta" align="right" width="13" pattern="1" hide_zero="1" text="###.###.###,@@">
<source>IVAACQ</source>
<postscript description="B1.0 POSTSCRIPT">#THIS @
#F1.107 +!</postscript>
</field>
<field x="137.5" type="Valuta" align="right" width="13" pattern="1" hide_zero="1" text="###.###.###,@@">
<source>IMPACQIND</source>
<postscript description="B1.0 POSTSCRIPT">#THIS @
#F1.108 +!</postscript>
</field>
<field x="151" type="Valuta" align="right" width="13" pattern="1" hide_zero="1" text="###.###.###,@@">
<source>IVAACQIND</source>
<postscript description="B1.0 POSTSCRIPT">#THIS @
#F1.109 +!</postscript>
</field>
</section>
<section type="Foot" pattern="1" />
<section type="Foot" level="1" pattern="1">
<field border="2" x="4" y="0.5" type="Linea" width="134" height="0" pattern="1" />
<field border="2" x="4" y="0.5" type="Linea" width="160" height="0" pattern="1" />
<field x="9" y="1" type="Testo" width="20" height="2" id="101" pattern="1" text="Totale">
<source>DESC</source>
</field>
<field x="55" y="1" type="Valuta" align="right" width="13" id="102" pattern="1" hide_zero="1" text="###.###.###,@@" />
<field x="69.5" y="1" type="Valuta" align="right" width="13" id="103" pattern="1" hide_zero="1" text="###.###.###,@@" />
<field x="69" y="1" type="Valuta" align="right" width="13" id="103" pattern="1" hide_zero="1" text="###.###.###,@@" />
<field x="82.5" y="1" type="Valuta" align="right" width="13" id="104" pattern="1" hide_zero="1" text="###.###.###,@@" />
<field x="96.5" y="1" type="Valuta" align="right" width="13" id="105" pattern="1" hide_zero="1" text="###.###.###,@@" />
<field x="110" y="1" type="Valuta" align="right" width="13" id="106" pattern="1" hide_zero="1" text="###.###.###,@@" />
<field x="123" y="1" type="Valuta" align="right" width="13" id="107" pattern="1" hide_zero="1" text="###.###.###,@@" />
<field x="123.5" y="1" type="Valuta" align="right" width="13" id="107" pattern="1" hide_zero="1" text="###.###.###,@@" />
<field x="137" y="1" type="Valuta" align="right" width="13" id="108" pattern="1" hide_zero="1" text="###.###.###,@@" />
<field x="150.5" y="1" type="Valuta" align="right" width="13" id="109" pattern="1" hide_zero="1" text="###.###.###,@@" />
</section>
<sql>USE 25 KEY 1 SELECT BETWEEN(23.DATAREG;#FROMDATE;#TODATE) \nJOIN 23 INTO NUMREG==NUMREG";</sql>
</report>

10
src/cg/cglib01.cpp
View File

@ -717,8 +717,14 @@ real TCodiceIVA::lordo(const real& imponibile, int ndec, const char* codval) con
bool TCodiceIVA::reverse_charge() const
{
const int rsi = regime_speciale();
return rsi == 13 || rsi == 50 || rsi == 51; // Reverse charge!
const int rsi = regime_speciale();
return rsi == 13 || rsi == 50 || rsi == 51; // Reverse charge!
}
bool TCodiceIVA::reverse_charge_pubb() const
{
const int rsi = regime_speciale();
return rsi == 13 || rsi == 19 || rsi == 50 || rsi == 51; // Reverse charge! con aggiunta dienti pubblici
}
///////////////////////////////////////////////////////////

5
src/cg/cglib01.h
View File

@ -161,12 +161,15 @@ public: // TObject
bool has_plafond() const { return get_int("S3") > 0; }
bool sospeso() const { return get_bool("B2"); }
bool escluso_esenti() const { return get_bool("B5"); }
bool numeratore_pro_rata() const { return get_bool("B6"); }
bool denominatore_pro_rata() const { return get_bool("B7"); }
real imposta(const real& imponibile, int ndec = AUTO_DECIMALS, const char * codval = "") const; // Calcola l'imposta sull'imponibile l'imposta e la ritorna
real scorpora(real& imponibile, int ndec = AUTO_DECIMALS, const char * codval = "") const; // Scorpora dall'imponibile l'imposta e la ritorna
real lordo(const real& imponibile, int ndec = AUTO_DECIMALS, const char * codval = "") const; // Calcola il lordo dell'imponibile l'imposta e la ritorna
bool reverse_charge() const;
bool reverse_charge() const;
bool reverse_charge_pubb() const;
int regime_speciale() const { return get_int("I5");}
const TString& natura() const { return get("S12"); }

35
src/cg/cglib05.cpp
View File

@ -32,6 +32,8 @@ public:
real & ivacorr() { return get_val(3); }
real & impven() { return get_val(4); }
real & ivaven() { return get_val(5); }
real & impacqind() { return get_val(6); }
real & ivaacqind() { return get_val(7); }
TRiepilogoIVA_record& operator= (const TRiepilogoIVA_record & rec) { return copy(rec);}
TRiepilogoIVA_record(const TRiepilogoIVA_record & rec) { copy(rec); }
@ -85,6 +87,7 @@ void TRiepilogoIVA_recordset::requery()
long gruppo = recset.get(RMI_GRUPPO).as_int();
long conto = recset.get(RMI_CONTO).as_int();
long sottoconto = recset.get(RMI_SOTTOCONTO).as_int();
int indetr = recset.get(RMI_TIPODET).as_int();
TRegistro reg(recset.get(reg_fieldname).as_string());
TipoIVA t = reg.iva();
@ -119,10 +122,20 @@ void TRiepilogoIVA_recordset::requery()
work_array.add(cod, rec = new TRiepilogoIVA_record(cod));
if (t == iva_acquisti)
{
real & r = rec->impacq();
r += recset.get(RMI_IMPONIBILE).as_real();
real & r1 = rec->ivaacq();
r1 += recset.get(RMI_IMPOSTA).as_real();
if (indetr == 0)
{
real & r = rec->impacq();
r += recset.get(RMI_IMPONIBILE).as_real();
real & r1 = rec->ivaacq();
r1 += recset.get(RMI_IMPOSTA).as_real();
}
else
{
real & r = rec->impacqind();
r += recset.get(RMI_IMPONIBILE).as_real();
real & r1 = rec->ivaacqind();
r1 += recset.get(RMI_IMPOSTA).as_real();
}
}
else
if (t == iva_vendite)
@ -237,6 +250,18 @@ const TVariant& TRiepilogoIVA_recordset::get_field(int num, const char* field) c
val = row.ivaven();
return val;
}
else
if (xvt_str_compare_ignoring_case(field, IMPACQIND) == 0)
{
val = row.impacqind();
return val;
}
else
if (xvt_str_compare_ignoring_case(field, IVAACQIND) == 0)
{
val = row.ivaacqind();
return val;
}
}
return NULL_VARIANT;
}
@ -281,5 +306,7 @@ TRiepilogoIVA_recordset::TRiepilogoIVA_recordset() : TRecordset(), _pos(0), _fro
add_field(_realfld, 106, 18, IVACORR);
add_field(_realfld, 107, 18, IMPVEN);
add_field(_realfld, 108, 18, IVAVEN);
add_field(_realfld, 109, 18, IMPACQIND);
add_field(_realfld, 110, 18, IVAACQIND);
}

2
src/cg/cglib05.h
View File

@ -17,6 +17,8 @@
#define IVACORR "IVACORR"
#define IMPVEN "IMPVEN"
#define IVAVEN "IVAVEN"
#define IMPACQIND "IMPACQIND"
#define IVAACQIND "IVAACQIND"
class TRiepilogoIVA_recordset : public TRecordset
{