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

Merge branch 'R_10_00' of http://10.65.20.17:7990/scm/campo/campo into R_10_00

Browse Source
This commit is contained in:
Mattia Tollari 2018-10-30 12:54:49 +01:00
commit ebd6dcdd1d
15 changed files with 82 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/770.vcxproj
View File

@ -89,6 +89,7 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
@ -307,6 +308,7 @@
<MenCompiler Include="..\src\m770\77menu.men" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\cg\cg2103.h" />
<ClInclude Include="..\src\m770\770.h" />
<ClInclude Include="..\src\m770\770100a.h" />
<ClInclude Include="..\src\m770\770101.h" />

1
build/771mod.vcxproj
View File

@ -134,6 +134,7 @@
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<Version>12.0</Version>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>

1
build/772mod.vcxproj
View File

@ -133,6 +133,7 @@
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<Version>12.0</Version>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>

1
build/773mod.vcxproj
View File

@ -91,6 +91,7 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>

1
build/774.vcxproj
View File

@ -91,6 +91,7 @@
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<Version>12.0</Version>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>

1
build/775.vcxproj
View File

@ -133,6 +133,7 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>

1
build/776mod.vcxproj
View File

@ -90,6 +90,7 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>

1
build/777.vcxproj
View File

@ -90,6 +90,7 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>

3
cd/test/770638.txt Normal file
View File

@ -0,0 +1,3 @@
770.exe
Aggiunti controlli per non generare pagamenti su registrazioni cancellate

29
cd/test/770638a.ini Normal file
View File

@ -0,0 +1,29 @@
[Main]
Demo=0
[770]
Edit_38 = 770 -2
Edit_4 = 770 -3
File(0) = 770.exe|X
Patch = 638
Versione = 21511200
[7799]
Kill(0) = batbcaf.msk|x
Kill(1) = batbca7.msk|x
Kill(2) = batbent.msk|x
[77]
Data = 06-06-2016
Descrizione = Percipienti (Mod.770)
Dischi = 1
Edit_4 = 770 -3
Moduli = ba
OEM =
Patch = 638
PostProcess =
PreProcess =
Prezzo(1) =
Prezzo(2) =
Versione = 21511200

BIN
cd/test/770638a1.zip Normal file
View File

Binary file not shown.

3
cd/test/bs0638.txt Normal file
View File

@ -0,0 +1,3 @@
bs0.exe
Aggiunti riferimenti fatturazione elettronica

21
cd/test/bs0638a.ini Normal file
View File

@ -0,0 +1,21 @@
[Main]
Demo=0
[bs1]
File(0) = bs0.exe|X
Patch = 0638
Versione = 21511200
[bs]
Data = 23-10-2018
Descrizione = Bee Store
Dischi = 1
Moduli = ve
OEM =
Patch = 638
PostProcess =
PreProcess =
Prezzo(1) =
Prezzo(2) =
Versione = 21511200

BIN
cd/test/bs0638a1.zip Normal file
View File

Binary file not shown.

23
src/m770/770100.cpp
View File

@ -362,10 +362,10 @@ bool TSchedaPercipienti::agg_pagamenti(const TRectype& sch, const TDate& pag_dal
if (numreg <= 0)
return false;
#ifdef DBG
if (numreg == 37788)
int cazzone = 1;
#endif
const TRectype & mov = cache().get(LF_MOV, numreg);
if (mov.empty())
return false;
TPartite_array partarr;
@ -426,9 +426,20 @@ bool TSchedaPercipienti::agg_pagamenti(const TRectype& sch, const TDate& pag_dal
for (int rowp = ratapart.last(); rowp > 0; rowp = ratapart.pred(rowp))
{
const TRectype& pag = ratapart.row(rowp); // Riga pagamento
const TRectype& pag = ratapart.row(rowp); // Riga pagamento
const TRectype& pagrow = p->riga(pag.get_long(PAGSCA_NRIGP));
const long numregpag = pagrow.get_long(PART_NREG);
if (numregpag > 0L)
{
const TRectype & movpag = cache().get(LF_MOV, numregpag);
if (movpag.empty())
return false;
}
const TRiga_partite& sum = p->riga(rowp); // Riga partite
if (sum.tipo() == tm_nota_credito)
if (sum.tipo() == tm_nota_credito)
continue;
if (pag_dal.ok()) // Filtro opzionale su data pagamento