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

Patch level :

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :

Stampa cartellini Tetractis


git-svn-id: svn://10.65.10.50/branches/R_10_00@22208 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 2011-06-02 21:02:39 +00:00
parent ca80780a7b
commit 7a75b31554
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/reprint.cpp
View File

@ -1993,7 +1993,8 @@ void TBook::join_file(int pps)
// <page number=%d /> // <page number=%d />
in_page = str.get_int(1); in_page = str.get_int(1);
const int sub = ((in_page - 1) % pps); const int sub = ((in_page - 1) % pps);
off_page = sub * logical_page_height() / pps; // off_page = sub * logical_page_height() / pps;
off_page = sub * page_size().y / pps;
if (sub == 0) if (sub == 0)
{ {
out_page = (in_page - 1) / pps + 1; out_page = (in_page - 1) / pps + 1;
@ -2017,10 +2018,10 @@ void TBook::join_file(int pps)
} else } else
if (str.starts_with("</page ")) if (str.starts_with("</page "))
{ {
if (out_page % pps == 0) if (in_page % pps == 0)
{ {
str.format("</page number=%d>", out_page); str.format("</page number=%d>", out_page);
out_page = 0; in_page = 0;
} }
else else
continue; continue;
@ -2028,7 +2029,7 @@ void TBook::join_file(int pps)
out << str << endl; out << str << endl;
} }
if (out_page != 0) // Non ho ancora scritto l'ultimo fine pagina if (in_page != 0) // Non ho ancora scritto l'ultimo fine pagina
{ {
str.format("</page number=%d>", out_page); str.format("</page number=%d>", out_page);
out << str << endl; out << str << endl;

4
include/tabmod.cpp
View File

@ -32,8 +32,8 @@ TModule_table::TModule_table(const char* tabname)
if (_module.blank()) if (_module.blank())
_module = appname.left(2); _module = appname.left(2);
if (_customer <= 0L && real::is_natural(appname.mid(3))) // if (_customer <= 0L && real::is_natural(appname.mid(3)))
_customer = atol(app.mid(2)); // _customer = atol(app.mid(2));
} }
_module.upper(); _module.upper();
} }

2
ps/pl1048100.cpp
View File

@ -850,7 +850,7 @@ bool TCrea_cartellini::set_params(const TMask & m)
bool TCrea_cartellini::set_params() bool TCrea_cartellini::set_params()
{ {
const TFixed_string arg = argv(3); const TFixed_string arg = argv(2);
if ((arg[0] != '-' && arg[0] != '/') || (arg[1] != 'i' && arg[1] != 'I')) if ((arg[0] != '-' && arg[0] != '/') || (arg[1] != 'i' && arg[1] != 'I'))
return false; return false;

4
ps/pl1048100.rep
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<report libraries="ve1300, pl1048100" name="PL1048100" lpi="6"> <report libraries="ve1300, pl1048100" page_merge="1" name="pl1048100" lpi="6">
<description>Cartellini</description> <description>Cartellini</description>
<font face="Courier New" size="10" /> <font face="Courier New" size="10" />
<section type="Head" height="12" pattern="1"> <section type="Head" height="12" pattern="1">
@ -93,4 +93,4 @@ JOIN 20 INTO TIPOCF==TIPOCF CODCF==CODCF
JOIN 47 INTO CODART==CODART JOIN 47 INTO CODART==CODART
FROM TIPOCONT=#CONT CODICE=#KEY FROM TIPOCONT=#CONT CODICE=#KEY
TO TIPOCONT=#CONT CODICE=#KEY</sql> TO TIPOCONT=#CONT CODICE=#KEY</sql>
</report> </report>