diff --git a/src/bs/bs0500.cpp b/src/bs/bs0500.cpp index 9f799ae2c..fcac69fa0 100644 --- a/src/bs/bs0500.cpp +++ b/src/bs/bs0500.cpp @@ -1701,11 +1701,7 @@ void TImporta_sync::main_loop() if (mask.get_bool("SyncGenerici")) sync_generici(dal, al); if (mask.get_bool("SyncFatBol")) - { - const TDate dalfat = mask.get_date("SyncDateFromF"); - const TDate alfat = mask.get_date("SyncDateToF"); - sync_fatbol(dalfat, alfat); - } + sync_fatbol(dal, al); _log->preview(); delete _log; diff --git a/src/bs/bs0500a.h b/src/bs/bs0500a.h index dcebb071e..ae6a67e6c 100644 --- a/src/bs/bs0500a.h +++ b/src/bs/bs0500a.h @@ -17,11 +17,8 @@ #define F_FORNITORI 116 #define F_BARCODE 117 -#define F_BBDAL 121 -#define F_BBAL 122 -#define F_FATBOL 123 -#define F_FFDAL 124 -#define F_FFAL 125 +#define F_FATBOL 121 +#define F_CANCART 122 #define F_C_CARSCAR 201 #define F_D_CARSCAR 202 diff --git a/src/bs/bs0500a.uml b/src/bs/bs0500a.uml index b5490710f..35359afeb 100644 --- a/src/bs/bs0500a.uml +++ b/src/bs/bs0500a.uml @@ -6,7 +6,7 @@ ENDPAGE PAGE "Sincronizzazione Bee Store" 0 2 0 0 -GROUPBOX DLG_NULL 78 13 +GROUPBOX DLG_NULL 78 9 BEGIN PROMPT 1 1 "@bArchivi" END @@ -71,21 +71,15 @@ BEGIN FIELD SyncCorr END -BOOLEAN F_DOCUMENTI -BEGIN - PROMPT 2 9 "Documenti " - FIELD SyncDoc -END - BOOLEAN F_CARSCAR BEGIN - PROMPT 2 10 "Carichi/scarichi " + PROMPT 40 7 "Carichi/scarichi " FIELD SyncCarScar END BOOLEAN F_GENERICI BEGIN - PROMPT 2 11 "Mov.generici " + PROMPT 40 8 "Mov.generici " FIELD SyncGenerici END @@ -113,6 +107,22 @@ BEGIN FIELD SyncBarCode END +GROUPBOX DLG_NULL 78 4 +BEGIN + PROMPT 1 10 "@bDocumenti" +END +BOOLEAN F_FATBOL +BEGIN + PROMPT 2 11 "Importa le Fatture" + FIELD SyncFatBol +END + +BOOLEAN F_DOCUMENTI +BEGIN + PROMPT 2 12 "Documenti " + FIELD SyncDoc +END + GROUPBOX DLG_NULL 78 4 BEGIN PROMPT 1 14 "@bFiltri" @@ -132,55 +142,6 @@ END ENDPAGE -PAGE "Import: Bolle/Fatture/Scontr." 0 2 0 0 - -GROUPBOX DLG_NULL 78 4 -BEGIN - PROMPT 1 1 "@bBolle" -END - -DATE F_BBDAL -BEGIN - PROMPT 2 3 "Dalla data di modifica " - FIELD SyncDateFromB -END - -DATE F_BBAL -BEGIN - PROMPT 42 3 " al " - FIELD SyncDateToB -END - -BOOLEAN F_FATBOL -BEGIN - PROMPT 2 7 "Importa da BeeStore le Fatture" - FIELD SyncFatBol -END - -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 4 -BEGIN - PROMPT 1 11 "@bOrdini" -END - -ENDPAGE - PAGE "Parametri" 0 2 0 0 GROUPBOX DLG_NULL 78 7 @@ -293,6 +254,17 @@ BEGIN FLAGS "D" END +GROUPBOX DLG_NULL 78 3 +BEGIN + PROMPT 1 12 "@bParametri" +END + +BOOLEAN F_CANCART +BEGIN + PROMPT 2 13 "Cancellazione degli Articoli in sospeso" + FIELD SyncCANCART +END + ENDPAGE ENDMASK \ No newline at end of file