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

Patch level : 12.0 1048

Browse Source 
Files correlati     : bs0.EXE correzioni spaziature e riporti su  velib04
Commento        :

Inserimento primi riporti su soluzione BS
This commit is contained in:
Francesco_Fucarino 2021-04-06 15:10:36 +02:00
parent 33056952ae
commit 19f3713235
16 changed files with 610 additions and 564 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
build/bs.sln
View File

@ -1,12 +1,18 @@
 
Microsoft Visual Studio Solution File, Format Version 11.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2010 # Visual Studio 15
VisualStudioVersion = 15.0.28307.1340
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bs0", "bs0.vcxproj", "{9C91BACF-9A70-4973-B8CC-FA3D2AF9867C}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bs0", "bs0.vcxproj", "{9C91BACF-9A70-4973-B8CC-FA3D2AF9867C}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AgaLib", "AgaLib.vcxproj", "{2D38A763-3D74-4338-9362-B891784EC90E}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AgaLib", "AgaLib.vcxproj", "{2D38A763-3D74-4338-9362-B891784EC90E}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedoc", "vedoc.vcxproj", "{A1CE9743-A597-4F92-B55A-345A366C9E55}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedoc", "vedoc.vcxproj", "{A1CE9743-A597-4F92-B55A-345A366C9E55}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cglib", "cglib.vcxproj", "{7B80F974-CE2E-4BD9-855A-44FF139FF288}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedocext", "vedocext.vcxproj", "{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32 Debug|Win32 = Debug|Win32
@ -25,8 +31,19 @@ Global
{A1CE9743-A597-4F92-B55A-345A366C9E55}.Debug|Win32.Build.0 = Debug|Win32 {A1CE9743-A597-4F92-B55A-345A366C9E55}.Debug|Win32.Build.0 = Debug|Win32
{A1CE9743-A597-4F92-B55A-345A366C9E55}.Release|Win32.ActiveCfg = Release|Win32 {A1CE9743-A597-4F92-B55A-345A366C9E55}.Release|Win32.ActiveCfg = Release|Win32
{A1CE9743-A597-4F92-B55A-345A366C9E55}.Release|Win32.Build.0 = Release|Win32 {A1CE9743-A597-4F92-B55A-345A366C9E55}.Release|Win32.Build.0 = Release|Win32
{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Debug|Win32.ActiveCfg = Debug|Win32
{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Debug|Win32.Build.0 = Debug|Win32
{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Release|Win32.ActiveCfg = Release|Win32
{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Release|Win32.Build.0 = Release|Win32
{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Debug|Win32.ActiveCfg = Debug|Win32
{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Debug|Win32.Build.0 = Debug|Win32
{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Release|Win32.ActiveCfg = Release|Win32
{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {9378D194-8834-42B8-AF00-8CFF5D4B42E8}
EndGlobalSection
EndGlobal EndGlobal

6
build/bs0.vcxproj
View File

@ -212,9 +212,15 @@
<ProjectReference Include="AgaLib.vcxproj"> <ProjectReference Include="AgaLib.vcxproj">
<Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project> <Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="cglib.vcxproj">
<Project>{7b80f974-ce2e-4bd9-855a-44ff139ff288}</Project>
</ProjectReference>
<ProjectReference Include="vedoc.vcxproj"> <ProjectReference Include="vedoc.vcxproj">
<Project>{a1ce9743-a597-4f92-b55a-345a366c9e55}</Project> <Project>{a1ce9743-a597-4f92-b55a-345a366c9e55}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="vedocext.vcxproj">
<Project>{0042619a-6b7c-4d3d-9cd9-9bdd8d200c15}</Project>
</ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

30
build/fp0.vcxproj
View File

@ -229,55 +229,45 @@
<ItemGroup> <ItemGroup>
<SqlCompiler Include="..\src\fp\sql\fp0100.sql"> <SqlCompiler Include="..\src\fp\sql\fp0100.sql">
<FileType>Document</FileType> <FileType>Document</FileType>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</SqlCompiler> </SqlCompiler>
<SqlCompiler Include="..\src\fp\sql\fp0104.sql"> <SqlCompiler Include="..\src\fp\sql\fp0104.sql">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</SqlCompiler> </SqlCompiler>
<SqlCompiler Include="..\src\fp\sql\fp0106.sql"> <SqlCompiler Include="..\src\fp\sql\fp0106.sql">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</SqlCompiler> </SqlCompiler>
<SqlCompiler Include="..\src\fp\sql\fp0108.sql"> <SqlCompiler Include="..\src\fp\sql\fp0108.sql">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</SqlCompiler> </SqlCompiler>
<SqlCompiler Include="..\src\fp\sql\fp0110.sql"> <SqlCompiler Include="..\src\fp\sql\fp0110.sql">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</SqlCompiler> </SqlCompiler>
<SqlCompiler Include="..\src\fp\sql\fp0112.sql"> <SqlCompiler Include="..\src\fp\sql\fp0112.sql">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</SqlCompiler> </SqlCompiler>
<SqlCompiler Include="..\src\fp\sql\fp0114.sql"> <SqlCompiler Include="..\src\fp\sql\fp0114.sql">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</ExcludedFromBuild>
</SqlCompiler> </SqlCompiler>
<SqlCompiler Include="..\src\fp\sql\fp0116.sql"> <SqlCompiler Include="..\src\fp\sql\fp0116.sql">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</SqlCompiler> </SqlCompiler>
<SqlCompiler Include="..\src\fp\sql\fp0118.sql"> <SqlCompiler Include="..\src\fp\sql\fp0118.sql">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</SqlCompiler> </SqlCompiler>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<SqlCompiler Include="..\src\fp\sql\fp0102.sql"> <SqlCompiler Include="..\src\fp\sql\fp0102.sql">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</ExcludedFromBuild>
<FileType>Document</FileType> <FileType>Document</FileType>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</SqlCompiler> </SqlCompiler>

6
src/bs/bs0.cpp
View File

@ -6,10 +6,10 @@ int main(int argc, char** argv)
const int p = argc > 1 ? argv[1][1]-'0' : 0; const int p = argc > 1 ? argv[1][1]-'0' : 0;
switch(p) switch(p)
{ {
case 1: bs0200(argc, argv); break; // Impostazioni Beestore case 1: bs0200(argc, argv); break; // Importazioni Beestore
case 2: bs0300(argc, argv); break; // Importazione da SKNET case 2: bs0300(argc, argv); break; // Importazione da SKNET
case 3: bs0400(argc, argv); break; // Tabelle di transazione case 3: bs0400(argc, argv); break; // Tabelle di transazione
default: bs0100(argc, argv); break; // Beestore Synchronizer default: bs0100(argc, argv); break; // Trasferimento Beestore Impostazione
} }
return 0; return 0;
} }

10
src/bs/bs0100a.h
View File

@ -1,5 +1,5 @@
#define F_DATASOURCE 101 #define F_DATASOURCE 101
#define F_USER 102 #define F_USER 102
#define F_PASSWORD 103 #define F_PASSWORD 103
#define F_ORIGINE 104 #define F_ORIGINE 104
#define F_LOG 105 #define F_LOG 105

31
src/bs/bs0200.cpp
View File

@ -150,8 +150,8 @@ typedef bool TFieldEvaluator(const TISAM_recordset& rec, const char* fldname, co
class TBeeStore_sync : public TSkeleton_application class TBeeStore_sync : public TSkeleton_application
{ {
TString _dsn; TString _dsn;
TString _usr; TString _usr;
TString _psw; TString _psw;
TFilename _sqlog; TFilename _sqlog;
TLog_report* _log; TLog_report* _log;
@ -184,11 +184,11 @@ protected:
void sync_anamag (const TDate& dal, const TDate& al); void sync_anamag (const TDate& dal, const TDate& al);
void sync_barcode (const TDate& dal, const TDate& al); void sync_barcode (const TDate& dal, const TDate& al);
void sync_corrisp (const TDate& dal, const TDate& al); void sync_corrisp (const TDate& dal, const TDate& al);
void sync_mov(int tipotestata, const TDate& dal, const TDate& al); void sync_mov(int tipotestata, const TDate& dal, const TDate& al);
void sync_scontrini(const TDate& dal, const TDate& al) { sync_mov(3, dal, al);} void sync_scontrini(const TDate& dal, const TDate& al) { sync_mov(3, dal, al);}
void sync_doc (const TDate& dal , const TDate& al); void sync_doc (const TDate& dal , const TDate& al);
void sync_carscar (const TDate& dal, const TDate& al) { sync_mov(1, dal, al);} void sync_carscar (const TDate& dal, const TDate& al) { sync_mov(1, dal, al);}
void sync_generici (const TDate& dal , const TDate& al) { sync_mov(4, dal, al);} void sync_generici (const TDate& dal , const TDate& al) { sync_mov(4, dal, al);}
void sync_clifo (int cfmask, const TDate& dal, const TDate& al); void sync_clifo (int cfmask, const TDate& dal, const TDate& al);
void sync_listino (const TString& listino); void sync_listino (const TString& listino);
@ -208,7 +208,7 @@ void TBeeStore_sync::load_origine_1(TISAM_recordset& out_set, const char* in_tab
str << "\nFROM " << in_table << " WHERE (Origine=1);"; str << "\nFROM " << in_table << " WHERE (Origine=1);";
TODBC_recordset odbc(str); TODBC_recordset odbc(str);
odbc.connect(_dsn, _usr, _psw); odbc.connect(_dsn, _usr, _psw);
const TRecnotype n = odbc.items(); const TRecnotype n = odbc.items();
if (n > 0) if (n > 0)
{ {
@ -340,7 +340,7 @@ void TBeeStore_sync::save_origine_2(TISAM_recordset& in_set, const char* out_tab
const TRecnotype n = in_set.items(); const TRecnotype n = in_set.items();
TString str(255); TString str(255);
TODBC_recordset odbc(str); TODBC_recordset odbc(str);
odbc.connect(_dsn, _usr, _psw); odbc.connect(_dsn, _usr, _psw);
str.cut(0) << "DELETE FROM " << out_table << " WHERE Origine=2;"; str.cut(0) << "DELETE FROM " << out_table << " WHERE Origine=2;";
odbc.exec(str); odbc.exec(str);
@ -448,7 +448,7 @@ static TString& build_query(const char* table, const TDate& dal, const TDate& al
TString& q = get_tmp_string(); TString& q = get_tmp_string();
q << "USE " << table; q << "USE " << table;
if (dal.ok() || al.ok()) if (dal.ok() || al.ok())
q << "SELECT BETWEEN(DATAAGG," << dal.date2ansi() << ',' << al.date2ansi() << ")"; q << " SELECT BETWEEN(DATAAGG," << dal.date2ansi() << ',' << al.date2ansi() << ")";
return q; return q;
} }
@ -515,7 +515,7 @@ void TBeeStore_sync::sync_lines(const TDate& dal, const TDate& al)
fields.add("DSLinea|S0"); fields.add("DSLinea|S0");
TString query = build_query("GMC", dal, al); TString query = build_query("GMC", dal, al);
if (query.find("SELECT") < 0) if (query.find(" SELECT") < 0)
query << " SELECT "; query << " SELECT ";
else else
query << "&&"; query << "&&";
@ -930,7 +930,7 @@ void TBeeStore_sync::sync_clifo(int cfmask, const TDate& dal, const TDate& al)
TString str(255); TString str(255);
TODBC_recordset clifo(str); TODBC_recordset clifo(str);
clifo.connect(_dsn, _usr, _psw); clifo.connect(_dsn, _usr, _psw);
str << "DELETE FROM tieAnagCFP WHERE Origine=1;"; str << "DELETE FROM tieAnagCFP WHERE Origine=1;";
clifo.exec(str); // Elimina tutte le anagrafiche importate da BeeStore clifo.exec(str); // Elimina tutte le anagrafiche importate da BeeStore
@ -966,7 +966,7 @@ bool TBeeStore_sync::save_and_delete_movmag(TMov_mag*& doc) const
bool TBeeStore_sync::save_and_delete_doc(TDocumento*& doc) const bool TBeeStore_sync::save_and_delete_doc(TDocumento*& doc) const
{ {
int err = 0; int err = 0;
if (doc != NULL) if (doc != nullptr)
{ {
if (doc->rows() > 0) if (doc->rows() > 0)
{ {
@ -983,8 +983,7 @@ bool TBeeStore_sync::save_and_delete_doc(TDocumento*& doc) const
err = 0; err = 0;
} }
} }
delete doc; safe_delete(doc);
doc = NULL;
} }
return err == 0; return err == 0;
} }
@ -1002,7 +1001,7 @@ void TBeeStore_sync::sync_listino(const TString& listino)
{ {
TString str(255); TString str(255);
TODBC_recordset prz(str); TODBC_recordset prz(str);
prz.connect(_dsn, _usr, _psw); prz.connect(_dsn, _usr, _psw);
str = "DELETE FROM tiePrzVendita WHERE Origine=1"; str = "DELETE FROM tiePrzVendita WHERE Origine=1";
prz.exec(str); // Ignora tutti i listini di BeeStore prz.exec(str); // Ignora tutti i listini di BeeStore

4
src/bs/bs0200a.h
View File

@ -17,6 +17,10 @@
#define F_FORNITORI 116 #define F_FORNITORI 116
#define F_BARCODE 117 #define F_BARCODE 117
#define F_BBDAL 121
#define F_BBAL 122
#define F_FATBOL 123
#define F_C_CARSCAR 201 #define F_C_CARSCAR 201
#define F_D_CARSCAR 202 #define F_D_CARSCAR 202
#define F_C_DOCUMENTI 203 #define F_C_DOCUMENTI 203

37
src/bs/bs0200a.uml
View File

@ -132,6 +132,43 @@ END
ENDPAGE ENDPAGE
PAGE "newpage_Boll_Fatt_Scontrini" 0 2 0 0
GROUPBOX DLG_NULL 78 5
BEGIN
PROMPT 1 1 "@bBolle"
END
DATE F_BBDAL
BEGIN
PROMPT 2 4 "Dalla data di modifica "
FIELD SyncDateFrom
END
DATE F_BBAL
BEGIN
PROMPT 42 4 " al "
FIELD SyncDateTo
END
BOOLEAN F_FATBOL
BEGIN
PROMPT 2 9 "FATT/BOLL"
FIELD SyncFatBol
END
GROUPBOX DLG_NULL 78 5
BEGIN
PROMPT 1 6 "@bFatture"
END
GROUPBOX DLG_NULL 78 5
BEGIN
PROMPT 1 11 "@bOrdini"
END
ENDPAGE
PAGE "Parametri" 0 2 0 0 PAGE "Parametri" 0 2 0 0
GROUPBOX DLG_NULL 78 7 GROUPBOX DLG_NULL 78 7

6
src/bs/bs0300.cpp
View File

@ -37,12 +37,6 @@
// Utility // Utility
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
const TString my_origin()
{
static const TString my_orig = ini_get_string(CONFIG_DITTA, "BS", "Origine", "2");
return my_orig;
}
const TString their_origin() const TString their_origin()
{ {
static const TString their_orig(1, (ini_get_int(CONFIG_DITTA, "BS", "Origine", 1) == 1 ? 2 : 1) + '0'); static const TString their_orig(1, (ini_get_int(CONFIG_DITTA, "BS", "Origine", 1) == 1 ? 2 : 1) + '0');

24
src/bs/bs0300a.h
View File

@ -1,13 +1,13 @@
#define F_DAL 101 #define F_DAL 101
#define F_AL 102 #define F_AL 102
#define F_UMS 103 #define F_UMS 103
#define F_IVA 104 #define F_IVA 104
#define F_ART 105 #define F_ART 105
#define F_DOCUMENTI 106 #define F_DOCUMENTI 106
#define F_VALUTE 107 #define F_VALUTE 107
#define F_CLIENTI 108 #define F_CLIENTI 108
#define F_FORNITORI 109 #define F_FORNITORI 109
#define F_CODNUMBOL 201 #define F_CODNUMBOL 201
#define F_TIPODOCBOL 202 #define F_TIPODOCBOL 202
@ -19,7 +19,7 @@
#define F_TIPODOCTAM 208 #define F_TIPODOCTAM 208
#define F_CODNUMORC 209 #define F_CODNUMORC 209
#define F_TIPODOCORC 210 #define F_TIPODOCORC 210
#define F_OVERRIG 211 #define F_OVERRIG 211
#define F_NUMCUSTRIG 212 #define F_NUMCUSTRIG 212
#define F_IMPORTUSER 213 #define F_IMPORTUSER 213
#define F_EMPTYONIMP 214 #define F_EMPTYONIMP 214
@ -27,5 +27,5 @@
#define F_CODIVADEF 216 #define F_CODIVADEF 216
#define F_CODUMSDEF 217 #define F_CODUMSDEF 217
#define F_C_CORRISPETTIVI 301 #define F_C_CORRISPETTIVI 301
#define F_D_CORRISPETTIVI 302 #define F_D_CORRISPETTIVI 302

1
src/bs/bs0300b.h
View File

@ -15,7 +15,6 @@
// Utility // Utility
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
const TString my_origin();
const TString their_origin(); const TString their_origin();
const TString clifo_add_note(TLocalisamfile& cfv, TString& note); const TString clifo_add_note(TLocalisamfile& cfv, TString& note);

1
src/bs/bsmenu.men
View File

@ -5,6 +5,7 @@ Module = bs
Flags = "F" Flags = "F"
Item_01 = "Configurazione", "bs0 -0", "F", 9015 Item_01 = "Configurazione", "bs0 -0", "F", 9015
Item_02 = "Sincronizzazione", "bs0 -1", "F", 9015 Item_02 = "Sincronizzazione", "bs0 -1", "F", 9015
Item_02 = "newpage", "bs0 -1", "F", 9015
Item_02 = "SKNET Importer", "bs0 -2", "F", 9015 Item_02 = "SKNET Importer", "bs0 -2", "F", 9015
Item_03 = "Tabelle di conversione", [BSMENU_002] Item_03 = "Tabelle di conversione", [BSMENU_002]

25
src/include/doc.h
View File

@ -1,7 +1,6 @@
#ifndef __DOC_H #ifndef __DOC_H
#define __DOC_H #define __DOC_H
#define DOC_CODNUM "CODNUM" #define DOC_CODNUM "CODNUM"
#define DOC_ANNO "ANNO" #define DOC_ANNO "ANNO"
#define DOC_PROVV "PROVV" #define DOC_PROVV "PROVV"
@ -26,7 +25,7 @@
#define DOC_IBAN "IBAN" #define DOC_IBAN "IBAN"
#define DOC_CODABIP "CODABIP" #define DOC_CODABIP "CODABIP"
#define DOC_CODCABP "CODCABP" #define DOC_CODCABP "CODCABP"
#define DOC_PROGBNP "PROGBNP" #define DOC_PROGBNP "PROGBNP"
#define DOC_CATVEN "CATVEN" #define DOC_CATVEN "CATVEN"
#define DOC_CODLIST "CODLIST" #define DOC_CODLIST "CODLIST"
#define DOC_CODCONT "CODCONT" #define DOC_CODCONT "CODCONT"
@ -75,7 +74,7 @@
#define DOC_G1 "G1" #define DOC_G1 "G1"
#define DOC_DATAAGG "DATAAGG" #define DOC_DATAAGG "DATAAGG"
#define DOC_UTENTE "UTENTE" #define DOC_UTENTE "UTENTE"
#define DOC_COLL_GOLEM "COLL_GOLEM" #define DOC_COLL_GOLEM "COLL_GOLEM"
#define DOC_DOCEVASO "DOCEVASO" #define DOC_DOCEVASO "DOCEVASO"
#define DOC_CONTROEURO "CONTROEURO" #define DOC_CONTROEURO "CONTROEURO"
#define DOC_CODCMS "CODCMS" #define DOC_CODCMS "CODCMS"
@ -86,13 +85,13 @@
#define DOC_NUMREGCA "NUMREGCA" #define DOC_NUMREGCA "NUMREGCA"
#define DOC_TIPOCFFATT "TIPOCFFATT" #define DOC_TIPOCFFATT "TIPOCFFATT"
#define DOC_CODCFFATT "CODCFFATT" #define DOC_CODCFFATT "CODCFFATT"
#define DOC_LIQDIFF "LIQDIFF" #define DOC_LIQDIFF "LIQDIFF"
#define DOC_IVAXCASSA "IVAXCASSA" #define DOC_IVAXCASSA "IVAXCASSA"
#define DOC_DATACOMP "DATACOMP" #define DOC_DATACOMP "DATACOMP"
#define DOC_DATAFCOMP "DATAFCOMP" #define DOC_DATAFCOMP "DATAFCOMP"
#define DOC_DATASCIMP "DATASCIMP" #define DOC_DATASCIMP "DATASCIMP"
#define DOC_CUP "CUP" #define DOC_CUP "CUP"
#define DOC_CIG "CIG" #define DOC_CIG "CIG"
#define DOC_CONTSEP "CONTSEP" #define DOC_CONTSEP "CONTSEP"
#define DOC_NOLEGGIO "NOLEGGIO" #define DOC_NOLEGGIO "NOLEGGIO"
#define DOC_MODPAG "MODPAG" #define DOC_MODPAG "MODPAG"
@ -105,13 +104,13 @@
#define DOC_NOINVIOSDI "NOINVIOSDI" #define DOC_NOINVIOSDI "NOINVIOSDI"
// Virtuali // Virtuali
#define DOC_PLAFOND "PLAFOND" #define DOC_PLAFOND "PLAFOND"
#define DOC_FATID "FATID" #define DOC_FATID "FATID"
#define DOC_BOLLI "BOLLI" #define DOC_BOLLI "BOLLI"
// modulo pe // modulo pe
#define DOC_SPESEUPD "SPESEUPD" #define DOC_SPESEUPD "SPESEUPD"
#define DOC_USEK "USEK" #define DOC_USEK "USEK"
#define DOC_K "K" #define DOC_K "K"
#endif #endif

18
src/include/relapp.cpp
View File

@ -1559,7 +1559,7 @@ void TRelation_application::main_loop()
{ {
for (TEdit_field* e = (TEdit_field *) _mask->get_key_field(1, TRUE); e; e = (TEdit_field *) _mask->get_key_field(1, FALSE)) for (TEdit_field* e = (TEdit_field *) _mask->get_key_field(1, TRUE); e; e = (TEdit_field *) _mask->get_key_field(1, FALSE))
{ {
if (e->is_kind_of(CLASS_EDIT_FIELD) && e->shown() && e->browse() != NULL) // Ignora campi invisibili o senza check if (e->is_kind_of(CLASS_EDIT_FIELD) && e->shown() && e->browse() != NULL) // Ignora campi invisibili o senza check
{ {
TCursor* b = e->browse()->cursor(); TCursor* b = e->browse()->cursor();
@ -1611,28 +1611,28 @@ void TRelation_application::main_loop()
} }
} }
TCursor* cur = c ; TCursor* cur = c ;
if (c == NULL) if (c == NULL)
cur = new TCursor(get_relation()); cur = new TCursor(get_relation());
file().reread(); file().reread();
cur->curr() = file().curr(); cur->curr() = file().curr();
cur->read(); cur->read();
--(*cur); --(*cur);
while (cur->pos() > 0 && !can_I_read(cur->relation())) while (cur->pos() > 0 && !can_I_read(cur->relation()))
--(*cur); --(*cur);
file().curr() = cur->curr(); file().curr() = cur->curr();
if (can_I_read(cur->relation())) if (can_I_read(cur->relation()))
err = get_relation()->read(_isequal, _testandlock); err = get_relation()->read(_isequal, _testandlock);
if (c == NULL) if (c == NULL)
delete cur; delete cur;
} }
break; break;
case K_END: case K_END:
err = file().readat(_last, _testandlock); err = file().readat(_last, _testandlock);
break; break;
default: default:
break; break;
} }
if (err == NOERR || err == _islocked) if (err == NOERR || err == _islocked)
@ -1649,7 +1649,7 @@ void TRelation_application::main_loop()
} while (k != K_QUIT); } while (k != K_QUIT);
if (_mask->is_open()) if (_mask->is_open())
_mask->close_modal(); _mask->close_modal();
_mask->set_mode(NO_MODE); _mask->set_mode(NO_MODE);