diff --git a/src/bs/bs0200.cpp b/src/bs/bs0200.cpp index 57ae3b93a..e0fd81ff9 100644 --- a/src/bs/bs0200.cpp +++ b/src/bs/bs0200.cpp @@ -1411,13 +1411,15 @@ void TBeeStore_sync::sync_corrisp(const TDate&, const TDate&) void TBeeStore_sync::sync_fatbol(const TDate& dal, const TDate& al) { + const TString8 codcausdef = ini_get_string(CONFIG_DITTA, "bs", MOVMAG_CODCAUS, "", 2); - + /* if (codcausdef.blank()) { _log->log(2, "Configurare parametri per movimenti Bee Store"); return; } + */ TString str(255); str << "SELECT tieDMovMag.*,tieTBolFat.* FROM tieDMovMag,tieTBolFat WHERE tieDMovMag.Origine=1 AND tieDMovMag.TipoTestata=2 AND tieDMovMag.CodTestata=tieTBolFat.Cod_PK"; // verificare diff --git a/src/bs/bs0200a.h b/src/bs/bs0200a.h index 1c946cc72..be575eeb7 100644 --- a/src/bs/bs0200a.h +++ b/src/bs/bs0200a.h @@ -20,6 +20,8 @@ #define F_BBDAL 121 #define F_BBAL 122 #define F_FATBOL 123 +#define F_FFDAL 124 +#define F_FFAL 125 #define F_C_CARSCAR 201 #define F_D_CARSCAR 202 diff --git a/src/bs/bs0200a.uml b/src/bs/bs0200a.uml index 1c946e98b..7e9421fd7 100644 --- a/src/bs/bs0200a.uml +++ b/src/bs/bs0200a.uml @@ -132,37 +132,49 @@ END ENDPAGE -PAGE "newpage_Boll_Fatt_Scontrini" 0 2 0 0 +PAGE "BeeStore Import:Fatt/Boll/Scon" 0 2 0 0 -GROUPBOX DLG_NULL 78 5 +GROUPBOX DLG_NULL 78 4 BEGIN PROMPT 1 1 "@bBolle" END DATE F_BBDAL BEGIN - PROMPT 2 4 "Dalla data di modifica " - FIELD SyncDateFrom + PROMPT 2 3 "Dalla data di modifica " + FIELD SyncDateFromB END DATE F_BBAL BEGIN - PROMPT 42 4 " al " - FIELD SyncDateTo + PROMPT 42 3 " al " + FIELD SyncDateToB END BOOLEAN F_FATBOL BEGIN - PROMPT 2 9 "FATT/BOLL" + PROMPT 2 7 "Importa da BeeStore le Fatture" FIELD SyncFatBol END -GROUPBOX DLG_NULL 78 5 +DATE F_FFDAL +BEGIN + PROMPT 2 8 "Dalla data di modifica " + FIELD SyncDateFromF +END + +DATE F_FFAL +BEGIN + PROMPT 42 8 " al " + FIELD SyncDateToF +END + +GROUPBOX DLG_NULL 78 4 BEGIN PROMPT 1 6 "@bFatture" END -GROUPBOX DLG_NULL 78 5 +GROUPBOX DLG_NULL 78 4 BEGIN PROMPT 1 11 "@bOrdini" END diff --git a/src/bs/bsmenu.men b/src/bs/bsmenu.men index d7d4b1169..16a087552 100644 --- a/src/bs/bsmenu.men +++ b/src/bs/bsmenu.men @@ -5,7 +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 = "BeeStore Importazione Fatture", "bs0 -1", "F", 9015 Item_02 = "SKNET Importer", "bs0 -2", "F", 9015 Item_03 = "Tabelle di conversione", [BSMENU_002]