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:
Sirio Builder 2018-09-12 17:18:59 +02:00
commit 5035746922
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/Cg3.vcxproj.filters
View File

@ -174,9 +174,6 @@
<Filter>Headers</Filter> <Filter>Headers</Filter>
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup>
<RepCompiler Include="..\src\cg\cg3900a.rep" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="campo.rc" /> <ResourceCompile Include="campo.rc" />
</ItemGroup> </ItemGroup>
@ -188,4 +185,9 @@
<Filter>Forms</Filter> <Filter>Forms</Filter>
</FormCompiler> </FormCompiler>
</ItemGroup> </ItemGroup>
<ItemGroup>
<RepCompiler Include="..\src\cg\cg3900a.rep">
<Filter>Reports</Filter>
</RepCompiler>
</ItemGroup>
</Project> </Project>

2
src/cg/cg3600.cpp
View File

@ -1805,7 +1805,7 @@ void TMastrini_grid::cell_request(long rec, short id, TGrid_cell& cell)
descr = mov.get(MOV_DESCR); descr = mov.get(MOV_DESCR);
if (descr.blank()) if (descr.blank())
{ {
TBill uncle(rmov); TBill uncle(rmov, true);
descr = uncle.descrizione(); descr = uncle.descrizione();
} }
} }

2
src/cg/cg4304.cpp
View File

@ -2389,7 +2389,7 @@ void TLiquidazione_app::set_grand_2000(_DescrItem& d, int &rw)
if (_month < 13 && credito_compensabile && credito_autorizzato_F24 > ZERO) if (_month < 13 && credito_compensabile && credito_autorizzato_F24 > ZERO)
{ {
cred_prec -= credito_autorizzato_F24; cred_prec -= credito_autorizzato_F24;
cre_deb_per += credito_autorizzato_F24; // cre_deb_per += credito_autorizzato_F24;
set_row(rw++,FR("%s@11gCredito IVA autorizzato in F24%s@75g%r@100gil %s"), _is_visliq ? "$[r]" : "", _is_visliq ? "$[n]" : "", &credito_autorizzato_F24, (const char *) data_autorizzazione); set_row(rw++,FR("%s@11gCredito IVA autorizzato in F24%s@75g%r@100gil %s"), _is_visliq ? "$[r]" : "", _is_visliq ? "$[n]" : "", &credito_autorizzato_F24, (const char *) data_autorizzazione);
} }
cred_prec -= rimborso; cred_prec -= rimborso;