Patch level : 12.0 1048

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

Inserimento primi riporti su soluzione BS

build/bs.sln

@@ -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}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AgaLib", "AgaLib.vcxproj", "{2D38A763-3D74-4338-9362-B891784EC90E}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedoc", "vedoc.vcxproj", "{A1CE9743-A597-4F92-B55A-345A366C9E55}"
 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
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		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}.Release|Win32.ActiveCfg = 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
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {9378D194-8834-42B8-AF00-8CFF5D4B42E8}
+	EndGlobalSection
 EndGlobal

build/bs0.vcxproj

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

build/fp0.vcxproj

@@ -229,55 +229,45 @@
   <ItemGroup>
     <SqlCompiler Include="..\src\fp\sql\fp0100.sql">
       <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>
     </SqlCompiler>
     <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>
     </SqlCompiler>
     <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>
     </SqlCompiler>
     <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>
     </SqlCompiler>
     <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>
     </SqlCompiler>
     <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>
     </SqlCompiler>
     <SqlCompiler Include="..\src\fp\sql\fp0114.sql">
       <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 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>
     </SqlCompiler>
     <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>
     </SqlCompiler>
   </ItemGroup>
   <ItemGroup>
     <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>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </SqlCompiler>

src/bs/bs0.cpp

@@ -6,10 +6,10 @@ int main(int argc, char** argv)
   const int p = argc > 1 ? argv[1][1]-'0' : 0;
   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  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;
 }

src/bs/bs0200.cpp

@@ -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
 {
   int err = 0;
-  if (doc != NULL)
+  if (doc != nullptr)
   {
     if (doc->rows() > 0)
     { 
@@ -983,8 +983,7 @@ bool TBeeStore_sync::save_and_delete_doc(TDocumento*& doc) const
           err = 0;
       }
     }
-    delete doc;
+    safe_delete(doc);
-    doc = NULL;
   }
   return err == 0;
 }

src/bs/bs0200a.h

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

src/bs/bs0200a.uml

@@ -132,6 +132,43 @@ END
 
 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
 
 GROUPBOX DLG_NULL 78 7

src/bs/bs0300.cpp

@@ -37,12 +37,6 @@
 // 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()
 {
   static const TString their_orig(1, (ini_get_int(CONFIG_DITTA, "BS", "Origine", 1) == 1 ? 2 : 1) + '0');

src/bs/bs0300b.h

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

src/bs/bsmenu.men

@@ -5,6 +5,7 @@ Module  = bs
 Flags   = "F"
 Item_01 = "Configurazione",   "bs0 -0", "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_03 = "Tabelle di conversione", [BSMENU_002]
 

src/include/doc.h

@@ -1,7 +1,6 @@
 #ifndef __DOC_H
 #define __DOC_H
 
-
 #define DOC_CODNUM        "CODNUM"
 #define DOC_ANNO          "ANNO"
 #define DOC_PROVV         "PROVV"