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

Compare commits

base: root:e2a93f8f739c0cf64a44f4b9d928dfb4399ce9dc
Branches Tags
root:R12.00.1244
..
compare: root:caed12467b67900f641f54dfad763471df366f15
Branches Tags
root:R12.00.1244

No commits in common. "e2a93f8f739c0cf64a44f4b9d928dfb4399ce9dc" and "caed12467b67900f641f54dfad763471df366f15" have entirely different histories.
e2a93f8f73 ... caed12467b

13 changed files with 445 additions and 239 deletions
Show Stats Expand all files Collapse all files

482
.gitignore vendored
View File

@ -1,102 +1,408 @@
# ---> C++ ## Ignore Visual Studio temporary files, build results, and
# Prerequisites ## files generated by popular Visual Studio add-ons.
*.d ##
## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
# Compiled Object files # User-specific files
*.slo *.rsuser
*.lo *.suo
*.o *.user
*.obj *.userosscache
*.sln.docstates
# Precompiled Headers # User-specific files (MonoDevelop/Xamarin Studio)
*.gch *.userprefs
*.pch
# Compiled Dynamic libraries # Mono auto generated files
*.so mono_crash.*
*.dylib
*.dll
# Fortran module files # Build results
*.mod [Dd]ebug/
*.smod [Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
x64/
x86/
[Ww][Ii][Nn]32/
[Aa][Rr][Mm]/
[Aa][Rr][Mm]64/
bld/
[Bb]in/
[Oo]bj/
[Ll]og/
[Ll]ogs/
# Compiled Static libraries # Visual Studio 2015/2017 cache/options directory
*.lai .vs/
*.la # Uncomment if you have tasks that create the project's static files in wwwroot
*.a #wwwroot/
*.lib
# Executables # Visual Studio 2017 auto generated files
*.exe Generated\ Files/
!/build/*.exe
*.out
*.app
# ---> C # MSTest test Results
# Prerequisites [Tt]est[Rr]esult*/
*.d [Bb]uild[Ll]og.*
# Object files # NUnit
*.o *.VisualState.xml
*.ko TestResult.xml
*.obj nunit-*.xml
*.elf
# Linker output # Build Results of an ATL Project
[Dd]ebugPS/
[Rr]eleasePS/
dlldata.c
# Benchmark Results
BenchmarkDotNet.Artifacts/
# .NET Core
project.lock.json
project.fragment.lock.json
artifacts/
# ASP.NET Scaffolding
ScaffoldingReadMe.txt
# StyleCop
StyleCopReport.xml
# Files built by Visual Studio
*_i.c
*_p.c
*_h.h
*.ilk *.ilk
*.map *.meta
*.exp *.obj
*.iobj
# Precompiled Headers
*.gch
*.pch *.pch
# Libraries
*.lib
*.a
*.la
*.lo
# Shared objects (inc. Windows DLLs)
*.dll
*.so
*.so.*
*.dylib
# Executables
*.exe
!/build/*.exe
*.out
*.app
*.i*86
*.x86_64
*.hex
# Debug files
*.dSYM/
*.su
*.idb
*.pdb *.pdb
*.ipdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.tmp_proj
*_wpftmp.csproj
*.log
*.tlog
*.vspscc
*.vssscc
.builds
*.pidb
*.svclog
*.scc
# Kernel Module Compile Results # Chutzpah Test files
*.mod* _Chutzpah*
*.cmd
.tmp_versions/
modules.order
Module.symvers
Mkfile.old
dkms.conf
/build/*.sdf # Visual C++ cache files
/build/UpgradeLog.htm ipch/
/build/UpgradeLog2.htm *.aps
/build/UpgradeLog3.htm *.ncb
/build/UpgradeLog4.htm *.opendb
/build/UpgradeLog5.htm *.opensdf
/build/*.user *.sdf
/build/*.user *.cachefile
/build/*.user *.VC.db
/exe/*.* *.VC.VC.opendb
/obj/*.*
/releease/*.* # Visual Studio profiler
*.psess
*.vsp
*.vspx
*.sap
# Visual Studio Trace Files
*.e2e
# TFS 2012 Local Workspace
$tf/
# Guidance Automation Toolkit
*.gpState
# ReSharper is a .NET coding add-in
_ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user
# TeamCity is a build add-in
_TeamCity*
# DotCover is a Code Coverage Tool
*.dotCover
# AxoCover is a Code Coverage Tool
.axoCover/*
!.axoCover/settings.json
# Coverlet is a free, cross platform Code Coverage Tool
coverage*.json
coverage*.xml
coverage*.info
# Visual Studio code coverage results
*.coverage
*.coveragexml
# NCrunch
_NCrunch_*
.*crunch*.local.xml
nCrunchTemp_*
# MightyMoose
*.mm.*
AutoTest.Net/
# Web workbench (sass)
.sass-cache/
# Installshield output folder
[Ee]xpress/
# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html
# Click-Once directory
publish/
# Publish Web Output
*.[Pp]ublish.xml
*.azurePubxml
# Note: Comment the next line if you want to checkin your web deploy settings,
# but database connection strings (with potential passwords) will be unencrypted
*.pubxml
*.publishproj
# Microsoft Azure Web App publish settings. Comment the next line if you want to
# checkin your Azure Web App publish settings, but sensitive information contained
# in these scripts will be unencrypted
PublishScripts/
# NuGet Packages
*.nupkg
# NuGet Symbol Packages
*.snupkg
# The packages folder can be ignored because of Package Restore
**/[Pp]ackages/*
# except build/, which is used as an MSBuild target.
!**/[Pp]ackages/build/
# Uncomment if necessary however generally it will be regenerated when needed
#!**/[Pp]ackages/repositories.config
# NuGet v3's project.json files produces more ignorable files
*.nuget.props
*.nuget.targets
# Microsoft Azure Build Output
csx/
*.build.csdef
# Microsoft Azure Emulator
ecf/
rcf/
# Windows Store app package directories and files
AppPackages/
BundleArtifacts/
Package.StoreAssociation.xml
_pkginfo.txt
*.appx
*.appxbundle
*.appxupload
# Visual Studio cache files
# files ending in .cache can be ignored
*.[Cc]ache
# but keep track of directories ending in .cache
!?*.[Cc]ache/
# Others
ClientBin/
~$*
*~
*.dbmdl
*.dbproj.schemaview
*.jfm
*.pfx
*.publishsettings
orleans.codegen.cs
# Including strong name files can present a security risk
# (https://github.com/github/gitignore/pull/2483#issue-259490424)
#*.snk
# Since there are multiple workflows, uncomment next line to ignore bower_components
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
#bower_components/
# RIA/Silverlight projects
Generated_Code/
# Backup & report files from converting an old project file
# to a newer Visual Studio version. Backup files are not needed,
# because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm
ServiceFabricBackup/
*.rptproj.bak
# SQL Server files
*.mdf
*.ldf
*.ndf
# Business Intelligence projects
*.rdl.data
*.bim.layout
*.bim_*.settings
*.rptproj.rsuser
*- [Bb]ackup.rdl
*- [Bb]ackup ([0-9]).rdl
*- [Bb]ackup ([0-9][0-9]).rdl
# Microsoft Fakes
FakesAssemblies/
# GhostDoc plugin setting file
*.GhostDoc.xml
# Node.js Tools for Visual Studio
.ntvs_analysis.dat
node_modules/
# Visual Studio 6 build log
*.plg
# Visual Studio 6 workspace options file
*.opt
# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
*.vbw
# Visual Studio 6 auto-generated project file (contains which files were open etc.)
*.vbp
# Visual Studio 6 workspace and project file (working project files containing files to include in project)
*.dsw
*.dsp
# Visual Studio 6 technical files
*.ncb
*.aps
# Visual Studio LightSwitch build output
**/*.HTMLClient/GeneratedArtifacts
**/*.DesktopClient/GeneratedArtifacts
**/*.DesktopClient/ModelManifest.xml
**/*.Server/GeneratedArtifacts
**/*.Server/ModelManifest.xml
_Pvt_Extensions
# Paket dependency manager
.paket/paket.exe
paket-files/
# FAKE - F# Make
.fake/
# CodeRush personal settings
.cr/personal
# Python Tools for Visual Studio (PTVS)
__pycache__/
*.pyc
# Cake - Uncomment if you are using it
# tools/**
# !tools/packages.config
# Tabs Studio
*.tss
# Telerik's JustMock configuration file
*.jmconfig
# BizTalk build output
*.btp.cs
*.btm.cs
*.odx.cs
*.xsd.cs
# OpenCover UI analysis results
OpenCover/
# Azure Stream Analytics local run output
ASALocalRun/
# MSBuild Binary and Structured Log
*.binlog
# NVidia Nsight GPU debugger configuration file
*.nvuser
# MFractors (Xamarin productivity tool) working folder
.mfractor/
# Local History for Visual Studio
.localhistory/
# Visual Studio History (VSHistory) files
.vshistory/
# BeatPulse healthcheck temp database
healthchecksdb
# Backup folder for Package Reference Convert tool in Visual Studio 2017
MigrationBackup/
# Ionide (cross platform F# VS Code tools) working folder
.ionide/
# Fody - auto-generated XML schema
FodyWeavers.xsd
# VS Code files for those working on multiple tools
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
*.code-workspace
# Local History for Visual Studio Code
.history/
# Windows Installer files from build outputs
*.cab
*.msi
*.msix
*.msm
*.msp
# JetBrains Rider
*.sln.iml
#special file
build/fastrip.exe
build/patchdef.exe
#exe folder
exe/
#lib folder
lib/

BIN
build/PATCHDEF.EXE
View File

Binary file not shown.

BIN
build/fastrip.exe
View File

Binary file not shown.

6
build/msk232.bat
View File

@ -4,9 +4,6 @@ echo Compiling %1 into %2
set oldinc=%include set oldinc=%include
set include=..\src\include;..\src\xvaga;..\src\ve;%~p1 set include=..\src\include;..\src\xvaga;..\src\ve;%~p1
set OLDPATH=%PATH%
set PATH=%PATH%;..\..\build
type ..\src\include\uml.h >%TMP%\%~n1.tmp type ..\src\include\uml.h >%TMP%\%~n1.tmp
type %1 >>%TMP%\%~n1.tmp type %1 >>%TMP%\%~n1.tmp
@ -21,9 +18,6 @@ fastrip %TMP%\%~n1.msk %2
set include=%oldinc set include=%oldinc
set oldinc= set oldinc=
set PATH=%OLDPATH%
set OLDPATH=
del %TMP%\%~n1.tmp del %TMP%\%~n1.tmp
del %TMP%\%~n1.tm2 del %TMP%\%~n1.tm2
del %TMP%\%~n1.tm3 del %TMP%\%~n1.tm3

16
build/msk32.bat
View File

@ -1,27 +1,17 @@
rem @echo off rem @echo off
echo Compiling mask %1 into %2 echo Compiling mask %1 into %2
set oldinc=%include% set oldinc=%include
set include=..\src\include;..\src\xvaga;..src\ve;%~p1 set include=..\src\include;..\src\xvaga;..\src\ve;%~p1
set OLDPATH=%PATH%
set PATH=%PATH%;..\..\build;C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Tools\MSVC\14.16.27023\bin\Hostx64\x86;C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Tools\MSVC\14.16.27023\bin\Hostx64\x64
type ..\src\include\uml.h >%TMP%\%~n1.tmp type ..\src\include\uml.h >%TMP%\%~n1.tmp
type %1 >>%TMP%\%~n1.tmp type %1 >>%TMP%\%~n1.tmp
set dir=pwd
ECHO %dir%
cd
cl /nologo /EP %TMP%\%~n1.tmp > %TMP%\%~n1.msk cl /nologo /EP %TMP%\%~n1.tmp > %TMP%\%~n1.msk
fastrip %TMP%\%~n1.msk %2 fastrip %TMP%\%~n1.msk %2
set include=%oldinc% set include=%oldinc
set oldinc= set oldinc=
set PATH=%OLDPATH%
set OLDPATH=
del %TMP%\%~n1.msk del %TMP%\%~n1.msk
del %TMP%\%~n1.tmp del %TMP%\%~n1.tmp

4
src/ba/ba8300.cpp
View File

@ -517,6 +517,7 @@ bool TReport_mask::get_rep_path(TFilename& path) const
path.ext("rep"); path.ext("rep");
bool found = path.exist(); bool found = path.exist();
message_box("file %s - %s", (const char *)path, found ? "trovato" : "non trovato");
if (!found) if (!found)
{ {
TString80 fname = path.name_only(); fname.lower(); TString80 fname = path.name_only(); fname.lower();
@ -537,12 +538,15 @@ bool TReport_mask::get_rep_path(TFilename& path) const
} }
} }
} }
message_box("file %s - %s", (const char *)path, found ? "trovato" : "non trovato");
} }
else else
{ {
path.ext("rep"); path.ext("rep");
found = path.exist(); found = path.exist();
message_box("file %s - %s", (const char *)path, found ? "trovato" : "non trovato");
} }
message_box("file %s - %s", (const char *)path, found ? "trovato" : "non trovato");
} }
return found; return found;
} }

6
src/m770/770100.cpp
View File

@ -674,7 +674,7 @@ bool TSchedaPercipienti::user_create()
HR("@1|Data@11|Compenso@16|Ritenuta@16|"), HR("@1|Data@11|Compenso@16|Ritenuta@16|"),
0, NULL_WIN, 5); 0, NULL_WIN, 5);
set_search_field(H_NPROG); set_search_field(F_CODANAGRPERC);
// simulo una chiamata da contabilità (lo lascio per eventuali prove) // simulo una chiamata da contabilità (lo lascio per eventuali prove)
/* real totdocla = 1000000; /* real totdocla = 1000000;
@ -1764,11 +1764,11 @@ Pag_struct& TSchedaPercipienti::from_sheet_to_struct(TToken_string& t, Pag_struc
if ((pos = token_pos("COD10")) != -1) if ((pos = token_pos("COD10")) != -1)
s.cod10 = t.get(pos); s.cod10 = t.get(pos);
// set importi restituiti al netto della ritenuta // set imorti restituiti al netto della ritenuta
if ((pos = token_pos("SPESERIMB")) != -1) if ((pos = token_pos("SPESERIMB")) != -1)
s.speserimb = t.get_real(pos); s.speserimb = t.get_real(pos);
// set importi restituiti al netto della ritenuta // set imorti restituiti al netto della ritenuta
if ((pos = token_pos("RITRIMB")) != -1) if ((pos = token_pos("RITRIMB")) != -1)
s.ritrimb = t.get_real(pos); s.ritrimb = t.get_real(pos);

1
src/m770/770100a.h
View File

@ -6,7 +6,6 @@
#define F_TIPOA 151 #define F_TIPOA 151
#define F_CODANAGR 152 #define F_CODANAGR 152
#define F_NPROG 153 #define F_NPROG 153
#define H_NPROG 154
// m70100a // m70100a
#define F_RAGDITTA 200 #define F_RAGDITTA 200

32
src/m770/770100a.uml
View File

@ -171,6 +171,7 @@ BEGIN
GROUP 1 GROUP 1
END END
NUMBER F_NPROG 6 NUMBER F_NPROG 6
BEGIN BEGIN
PROMPT 1 11 "@bScheda numero " PROMPT 1 11 "@bScheda numero "
@ -198,37 +199,6 @@ BEGIN
OUTPUT F_NPROG NPROG OUTPUT F_NPROG NPROG
END END
NUMBER H_NPROG 6
BEGIN
PROMPT 30 11 " "
CHECKTYPE NORMAL
FLAGS "DG"
USE LF_SCPERC
JOIN LF_ANAG INTO TIPOA=TIPOA CODANAGR=CODANAGR
JOIN %CA7 INTO CODTAB=CODCAUS
INPUT CODDITTA F_CODDITTA
INPUT TIPOA F_TIPOA
INPUT CODANAGR F_CODANAGR
INPUT NPROG H_NPROG
DISPLAY "Tipo" TIPOA
DISPLAY "Codice" CODANAGR
DISPLAY "Denominazione@50" LF_ANAG->RAGSOC
DISPLAY "Numero@7" NPROG
DISPLAY "Data\nDocumento@10" DATADOC
DISPLAY "Numero\nDocumento@8" NUMDOC
DISPLAY "Causale" CODCAUS
DISPLAY "Quadro" %CA7->S1
DISPLAY "Causale\nQuadro@6" CAUSQUA
DISPLAY "Ritenute\noperate@15V" RITOPE
DISPLAY "Ritenute\nversate@15V" RITVER
DISPLAY "Compenso@15V" COMPENSO
OUTPUT F_TIPOA TIPOA
OUTPUT F_CODANAGR CODANAGR
OUTPUT H_NPROG NPROG
OUTPUT F_NPROG NPROG
END
BUTTON F_GESTPERC 28 2 BUTTON F_GESTPERC 28 2
BEGIN BEGIN
PROMPT -12 -1 "Fatture da ricevere" PROMPT -12 -1 "Fatture da ricevere"

4
src/m770/770100f.uml
View File

@ -136,8 +136,8 @@ BEGIN
ITEM "B|redditi assoggettati in parte al contributo 10%" ITEM "B|redditi assoggettati in parte al contributo 10%"
ITEM "C|redditi non assoggettati al contributo 10%" ITEM "C|redditi non assoggettati al contributo 10%"
OUTPUT 111 OUTPUT 111
// FIELD LF_RPAG->COD10 FIELD LF_RPAG->COD10
// VALIDATE REQIF_FUNC 3 101 102 103 VALIDATE REQIF_FUNC 3 101 102 103
WARNING "Il codice contributo Inps deve essere indicato" WARNING "Il codice contributo Inps deve essere indicato"
END END

47
src/m770/770102.cpp
View File

@ -1,8 +1,7 @@
#include "770100a.h" #include "770100a.h"
#include "770101.h" #include "770101.h"
#include "770102.h" #include "770102.h"
#include <tabutil.h> #include <tabutil.h>
#include <recarray.h>
void TSchedaPercipienti::init_mask(TMask& m, bool inserimento) void TSchedaPercipienti::init_mask(TMask& m, bool inserimento)
{ {
@ -118,37 +117,23 @@ bool TSchedaPercipienti::vers_notify(TSheet_field& s, int r, KEY k)
bool TSchedaPercipienti::pags_notify(TSheet_field& s, int r, KEY k) bool TSchedaPercipienti::pags_notify(TSheet_field& s, int r, KEY k)
{ {
switch (k) switch(k)
{ {
// Inserimento riga
case K_INS:
// Impedisce inserimento di nuove righe
return FALSE;
// Inserimento riga // Inizio modifica riga
case K_INS: case K_SPACE:
// Impedisce inserimento di nuove righe {
return FALSE; break;
}
// Inizio modifica riga // Fine modifica di una riga
case K_SPACE: case K_ENTER:
{ break;
break;
}
// Fine modifica di una riga
case K_ENTER:
{
TEdit_field & fld = s.mask().efield(F_CODCAUS);
TMask & row_mask = s.sheet_mask();
const TRectype & ca7 = cache().get("%CA7", fld.get());
if (ca7.get_bool("B4") == false && row_mask.get(111).blank())
{
row_mask.set(111, "C");
s.set_row_cell(111, "C", s.selected());
}
if (row_mask.get(101).full() && (row_mask.get(102).full() || row_mask.get(111).blank()) &&
row_mask.get(111).blank())
return error_box("Il codice contributo Inps deve essere indicato");
}
break;
default: default:
break; break;

2
src/ve/velib.h
View File

@ -1287,7 +1287,7 @@ public:
short cms_start_sh() const { return _cms_start_sh;} short cms_start_sh() const { return _cms_start_sh;}
short cms_end_sh() const { return _cms_end_sh;} short cms_end_sh() const { return _cms_end_sh;}
TString& codcms() { return _codcms;} TString& codcms() { return _codcms;}
const TString & codcms() const { return _codcms;} const TString& codcms() const { return _codcms;}
TString& codcms_sh() { return _codcms_sh;} TString& codcms_sh() { return _codcms_sh;}
const TString & codcms_sh() const { return _codcms_sh;} const TString & codcms_sh() const { return _codcms_sh;}
TString& codart() { return _codart; } TString& codart() { return _codart; }

84
src/ve/velib06a.cpp
View File

@ -22,7 +22,7 @@
#include "ve0100n.h" #include "ve0100n.h"
#include "../cg/cglib.h" #include "../cg/cglib.h"
#include "../db/dblib.h" #include "../db/dblib.h"
#include "../mg/mglib.h" #include "../mg/mglib.h"
#include "../db/dblib.h" #include "../db/dblib.h"
@ -499,7 +499,7 @@ bool data_hndl( TMask_field& field, KEY key )
if (m.id2pos(F_DATACAMBIO1) >= 0 && !m.get(F_CODVAL).empty()) if (m.id2pos(F_DATACAMBIO1) >= 0 && !m.get(F_CODVAL).empty())
m.set(F_DATACAMBIO1, field.get(), TRUE); m.set(F_DATACAMBIO1, field.get(), TRUE);
} }
const TDate datadoc(m.get(F_DATADOC)); const TDate datadoc(m.get(F_DATADOC));
if (key == K_ENTER || field.to_check(key)) if (key == K_ENTER || field.to_check(key))
@ -993,7 +993,7 @@ bool pricerange_handler(TMask_field& f, KEY key )
} }
} }
return true; return true;
} }
static bool __in_handler = false; static bool __in_handler = false;
@ -1107,8 +1107,8 @@ static void search_price(TEdit_field& f, KEY key )
TMask& row_mask = f.mask(); TMask& row_mask = f.mask();
TSheet_field& sh = *row_mask.get_sheet(); TSheet_field& sh = *row_mask.get_sheet();
TDocumento_mask& mask = (TDocumento_mask &)sh.mask(); TDocumento_mask& mask = (TDocumento_mask &)sh.mask();
TPrice_sheet sheet(f); TPrice_sheet sheet(f);
TString_array & el = sheet.rows_array(); TString_array & el = sheet.rows_array();
TRelation rel(LF_DOC); TRelation rel(LF_DOC);
@ -1928,10 +1928,10 @@ bool codart_handler(TMask_field& f, KEY key )
upd_colli_peso_tara(row_mask, codart); upd_colli_peso_tara(row_mask, codart);
} }
condv.ricerca(); condv.ricerca();
const char* rdoc_prezzo = mask.doc().tipo().calcolo_lordo() ? RDOC_PREZZOL : RDOC_PREZZO; const char* rdoc_prezzo = mask.doc().tipo().calcolo_lordo() ? RDOC_PREZZOL : RDOC_PREZZO;
mask.doc()[current_doc_row].put(rdoc_prezzo, row_mask.get(FR_PREZZO)); mask.doc()[current_doc_row].put(rdoc_prezzo, row_mask.get(FR_PREZZO));
TArticolo_conai cart(codart); TArticolo_conai cart(codart);
@ -2883,40 +2883,20 @@ bool cms_mag_handler(TMask_field& f, KEY key)
const TSheet_field& s = *m.get_sheet(); const TSheet_field& s = *m.get_sheet();
TDocumento_mask& mask = (TDocumento_mask&)s.mask(); TDocumento_mask& mask = (TDocumento_mask&)s.mask();
const TRectype& curr = m.efield(mask.cms_end_sh()).browse()->cursor()->curr(); const TRectype& curr = m.efield(mask.cms_end_sh()).browse()->cursor()->curr();
TString80 codcms = curr.get(COMMESSE_CODCMS); const TString80 codcms = curr.get(COMMESSE_CODCMS);
TString svcms = mask.codcms_sh();
if (svcms != codcms) // Cambio commessa
if (mask.codcms_sh() != codcms) // Cambio commessa
{ {
if ((key == K_TAB && f.focusdirty())) if ((key == K_TAB && f.focusdirty()))
{ {
const TTipo_cms_check t = mask.doc().tipo().tipo_cms_check(); const TTipo_cms_check t = mask.doc().tipo().tipo_cms_check();
bool chiusa = (t != _nessuno) && curr.get_bool(COMMESSE_CHIUSA); bool chiusa = (t != _nessuno) && curr.get_bool(COMMESSE_CHIUSA);
if (chiusa && curr.get_bool(COMMESSE_PROROGA)) if (chiusa && curr.get_bool(COMMESSE_PROROGA))
chiusa = mask.get_date(F_DATADOC) > curr.get_date(COMMESSE_DATAPROR); chiusa = mask.get_date(F_DATADOC) > curr.get_date(COMMESSE_DATAPROR);
if (chiusa) if (chiusa)
{ return (t == _bloccante) ? f.error_box(FR("La commessa %s è chiusa "), (const char*)codcms) : f.yesno_box(FR("La commessa chiusa %s, vuoi utilizzarla"), (const char*)codcms);
bool ok = (t == _bloccante) ? error_box(FR("La commessa %s è chiusa "), (const char*)codcms) :
yesno_box(FR("La commessa chiusa %s, vuoi utilizzarla ?"), (const char*)codcms);
if (!ok)
{
codcms = svcms;
for (short i = mask.cms_start(); i <= mask.cms_end(); i++)
{
TEdit_field & e = mask.efield(i);
const TFieldref * f = e.field();
if (f != nullptr)
{
const int from = f->from();
const int to = f->to();
mask.set(i, codcms.sub(from, to), 0x2);
}
}
}
return ok;
}
} }
mask.codcms_sh() = codcms; mask.codcms_sh() = codcms;
@ -2998,7 +2978,7 @@ bool codcms_handler(TMask_field& f, KEY key)
TDocumento& doc = mask.doc(); TDocumento& doc = mask.doc();
TSheet_field& sf = mask.sfield(F_SHEET); TSheet_field& sf = mask.sfield(F_SHEET);
const bool req = ca_active(doc.get_date(DOC_DATADOC)) && doc.valid() && doc.tipo().head_ca_required(); const bool req = ca_active(doc.get_date(DOC_DATADOC)) && doc.valid() && doc.tipo().head_ca_required();
if (f.empty()) if (f.empty())
{ {
if (req) if (req)
@ -3008,15 +2988,13 @@ bool codcms_handler(TMask_field& f, KEY key)
} }
const TRectype& curr_cms = ((TEdit_field&)f).browse()->cursor()->curr(); const TRectype& curr_cms = ((TEdit_field&)f).browse()->cursor()->curr();
TString80 codcms = curr_cms.get(COMMESSE_CODCMS); const TString80 codcms = curr_cms.get(COMMESSE_CODCMS);
mask.set(F_CMSH, codcms); mask.set(F_CMSH, codcms);
if ((key == K_TAB && f.focusdirty()) || key == K_ENTER) if ((key == K_TAB && f.focusdirty()) || key == K_ENTER)
{ {
// Controlla se c'e' la gestione dei centri di costo al secondo livello // Controlla se c'e' la gestione dei centri di costo al secondo livello
TString svcms = mask.codcms(); if (mask.codcms() != codcms)
if (svcms != codcms)
{ {
if ((key == K_TAB && f.focusdirty())) if ((key == K_TAB && f.focusdirty()))
{ {
@ -3026,27 +3004,7 @@ bool codcms_handler(TMask_field& f, KEY key)
if (chiusa && curr_cms.get_bool(COMMESSE_PROROGA)) if (chiusa && curr_cms.get_bool(COMMESSE_PROROGA))
chiusa = mask.get_date(F_DATADOC) > curr_cms.get_date(COMMESSE_DATAPROR); chiusa = mask.get_date(F_DATADOC) > curr_cms.get_date(COMMESSE_DATAPROR);
if (chiusa) if (chiusa)
{ return (t == _bloccante) ? f.error_box(FR("La commessa %s è chiusa "), (const char*)codcms) : f.yesno_box(FR("La commessa chiusa %s, vuoi utilizzarla"), (const char*)codcms);
bool ok = (t == _bloccante) ? error_box(FR("La commessa %s è chiusa "), (const char*)codcms) :
yesno_box(FR("La commessa chiusa %s, vuoi utilizzarla ?"), (const char*)codcms);
if (!ok)
{
codcms = svcms;
for (short i = mask.cms_start(); i <= mask.cms_end(); i++)
{
TEdit_field & e = mask.efield(i);
const TFieldref * f = e.field();
if (f != nullptr)
{
const int from = f->from();
const int to = f->to();
mask.set(i, codcms.sub(from, to), 0x2);
}
}
}
return ok;
}
} }
doc.put(DOC_CODCMS, codcms); doc.put(DOC_CODCMS, codcms);
FOR_EACH_PHYSICAL_RDOC(doc, r, riga) FOR_EACH_PHYSICAL_RDOC(doc, r, riga)
@ -3140,7 +3098,7 @@ bool codcms_handler(TMask_field& f, KEY key)
key.add(codcms); key.add(codcms);
key.add(mask.get(F_TIPOCF)); key.add(mask.get(F_TIPOCF));
key.add(mask.get(F_CODCF)); key.add(mask.get(F_CODCF));
const TRectype & cfcms1 = __cfcm.get(key); const TRectype & cfcms1 = __cfcm.get(key);
const int nrigaban = cfcms1.get_int(CFCMS_NRIGABAN); const int nrigaban = cfcms1.get_int(CFCMS_NRIGABAN);
@ -3151,7 +3109,7 @@ bool codcms_handler(TMask_field& f, KEY key)
key.add(mask.get(F_CODCF)); key.add(mask.get(F_CODCF));
key.add("V"); key.add("V");
key.add(nrigaban); key.add(nrigaban);
const TRectype & cfban = cache().get(LF_CFBAN, key); const TRectype & cfban = cache().get(LF_CFBAN, key);
mask.set(mask.field(F_CODABIA).active() ? F_CODABIA : F_CODABIA1, cfban.get(CFBAN_ABI), 3); mask.set(mask.field(F_CODABIA).active() ? F_CODABIA : F_CODABIA1, cfban.get(CFBAN_ABI), 3);
@ -3374,14 +3332,14 @@ bool gen_livelli_handler(TMask_field& f, KEY key )
if (name.starts_with("34.")) if (name.starts_with("34."))
{ {
TFieldref fld(name.after("34."), LF_RIGHEDOC); TFieldref fld(name.after("34."), LF_RIGHEDOC);
code << fld.read(r); code << fld.read(r);
} }
else else
if (name.starts_with("47.")) if (name.starts_with("47."))
{ {
TFieldref fld(name.after("47."), LF_ANAMAG); TFieldref fld(name.after("47."), LF_ANAMAG);
code << fld.read(anamag); code << fld.read(anamag);
} }
} }
@ -3788,4 +3746,4 @@ bool tipodocsdi_handler(TMask_field& f, KEY key)
mask.update_cartacei(); mask.update_cartacei();
} }
return true; return true;
} }