Merge branch 'R_10_00' of http://10.65.20.33/sirio/CAMPO/campo into R_10_00

This commit is contained in:
Simone Palacino 2019-03-07 10:39:20 +01:00
commit 3b359be8e5
5 changed files with 28 additions and 1 deletions

4
cd/test/bs0722.txt Normal file
View File

@ -0,0 +1,4 @@
bs0.exe
bs0300a.msk
Resa obbligatoria gestione CONAI in SKNT

22
cd/test/bs0722a.ini Normal file
View File

@ -0,0 +1,22 @@
[Main]
Demo=0
[bs1]
File(0) = bs0.exe|X
File(3) = bs0300a.msk|X
Patch = 722
Versione = 21511200
[bs]
Data = 06-03-2019
Descrizione = Bee Store
Dischi = 1
Moduli = ve
OEM =
Patch = 722
PostProcess =
PreProcess =
Prezzo(1) =
Prezzo(2) =
Versione = 21511200

BIN
cd/test/bs0722a1.zip Normal file

Binary file not shown.

View File

@ -1645,7 +1645,7 @@ bool TSknet_sync::create()
_sqlog = ini_get_string(CONFIG_DITTA, "BS", "Log", ""); _sqlog = ini_get_string(CONFIG_DITTA, "BS", "Log", "");
_usr = ini_get_string(CONFIG_DITTA, "BS", "USR", "BEESTORE"); _usr = ini_get_string(CONFIG_DITTA, "BS", "USR", "BEESTORE");
_psw = decode(ini_get_string(CONFIG_DITTA, "BS", "PSW", "BEESTORE")); _psw = decode(ini_get_string(CONFIG_DITTA, "BS", "PSW", "BEESTORE"));
_hasConai = ini_get_bool(CONFIG_DITTA, "BS", "SKEnabCONAI", false); _hasConai = true; // ini_get_bool(CONFIG_DITTA, "BS", "SKEnabCONAI", false);
if (_dsn.full()) if (_dsn.full())
{ {

View File

@ -252,6 +252,7 @@ BOOLEAN F_ENABCONAI
BEGIN BEGIN
PROMPT 40 16 "Abilita gestione CONAI" PROMPT 40 16 "Abilita gestione CONAI"
FIELD SKEnabCONAI FIELD SKEnabCONAI
FLAGS "H"
END END
STRING F_IMPORTUSER 20 STRING F_IMPORTUSER 20