Index: pykota/trunk/bin/dumpykota
===================================================================
--- pykota/trunk/bin/dumpykota (revision 3093)
+++ pykota/trunk/bin/dumpykota (revision 3094)
@@ -98,4 +98,22 @@
          end            Job's date of printing
          
+  Dates formatting with 'start' and 'end' filter keys :
+  
+    YYYY : year boundaries
+    YYYYMM : month boundaries
+    YYYYMMDD : day boundaries
+    YYYYMMDDhh : hour boundaries
+    YYYYMMDDhhmm : minute boundaries
+    YYYYMMDDhhmmss : second boundaries
+    yesterday[+-NbDays] : yesterday more or less N days (e.g. : yesterday-15)
+    today[+-NbDays] : today more or less N days (e.g. : today-15)
+    tomorrow[+-NbDays] : tomorrow more or less N days (e.g. : tomorrow-15)
+    now[+-NbDays] : now more or less N days (e.g. now-15)
+
+  'now' and 'today' are not exactly the same since today represents the first
+  or last second of the day depending on if it's used in a start= or end=
+  date expression. The utility to be able to specify dates in the future is
+  a question which remains to be answered :-)
+  
   Contrary to other PyKota management tools, wildcard characters are not 
   expanded, so you can't use them.
Index: pykota/trunk/man/sv_SE/pkinvoice.1
===================================================================
--- pykota/trunk/man/sv_SE/pkinvoice.1 (revision 3069)
+++ pykota/trunk/man/sv_SE/pkinvoice.1 (revision 3094)
@@ -2,7 +2,7 @@
 .TH PKINVOICE "1" "novembre 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkinvoice \- page de manuel de pkinvoice 1.25alpha16_unofficial
+pkinvoice \- page de manuel de pkinvoice 1.25alpha18_unofficial
 .SH DESCRIPTION
-pkinvoice v1.25alpha16_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+pkinvoice v1.25alpha18_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 An invoice generator for PyKota.
@@ -10,5 +10,5 @@
 command line usage :
 .IP
-pkinvoice [options] user1 user2 ... userN
+pkinvoice [options] [filterexpr]
 .PP
 options :
@@ -49,15 +49,34 @@
 exposed. The default is 0.0, meaning no VAT
 information will be included.
+.IP
+Use the filter expressions to extract only parts of the
+datas. Allowed filters are of the form :
+.IP
+key=value
+.IP
+Allowed keys for now are :
 .TP
-\fB\-s\fR | \fB\-\-start\fR date
-Sets the starting date for the print jobs invoiced.
+username
+User's name
 .TP
-\fB\-e\fR | \fB\-\-end\fR date
-Sets the ending date for the print jobs invoiced.
+printername
+Printer's name
+.TP
+hostname
+Client's hostname
+.TP
+jobid
+Job's Id
+.TP
+billingcode
+Job's billing code
+.TP
+start
+Job's date of printing
+.TP
+end
+Job's date of printing
 .IP
-user1 through userN can use wildcards if needed. If no user argument is
-used, a wildcard of '*' is assumed, meaning include all users.
-.IP
-Dates formatting with \fB\-\-start\fR and \fB\-\-end\fR :
+Dates formatting with 'start' and 'end' filter keys :
 .IP
 YYYY : year boundaries
@@ -76,8 +95,11 @@
 date expression. The utility to be able to specify dates in the future is
 a question which remains to be answered :\-)
+.IP
+Contrary to other PyKota management tools, wildcard characters are not
+expanded, so you can't use them.
 .PP
 examples :
 .IP
-\f(CW$ pkinvoice --unit EURO --output invoices.pdf --start=now-30\fR
+\f(CW$ pkinvoice --unit EURO --output /tmp/invoices.pdf start=now-30\fR
 .IP
 Will generate a PDF document containing invoices for all users
Index: pykota/trunk/man/sv_SE/dumpykota.1
===================================================================
--- pykota/trunk/man/sv_SE/dumpykota.1 (revision 3065)
+++ pykota/trunk/man/sv_SE/dumpykota.1 (revision 3094)
@@ -2,7 +2,7 @@
 .TH DUMPYKOTA "1" "novembre 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-dumpykota \- page de manuel de dumpykota 1.25alpha16_unofficial
+dumpykota \- page de manuel de dumpykota 1.25alpha18_unofficial
 .SH DESCRIPTION
-dumpykota v1.25alpha16_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+dumpykota v1.25alpha18_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 Dumps PyKota database's content.
@@ -86,4 +86,7 @@
 Client's hostname
 .TP
+jobid
+Job's Id
+.TP
 billingcode
 Job's billing code
@@ -94,4 +97,22 @@
 end
 Job's date of printing
+.IP
+Dates formatting with 'start' and 'end' filter keys :
+.IP
+YYYY : year boundaries
+YYYYMM : month boundaries
+YYYYMMDD : day boundaries
+YYYYMMDDhh : hour boundaries
+YYYYMMDDhhmm : minute boundaries
+YYYYMMDDhhmmss : second boundaries
+yesterday[+\-NbDays] : yesterday more or less N days (e.g. : yesterday\-15)
+today[+\-NbDays] : today more or less N days (e.g. : today\-15)
+tomorrow[+\-NbDays] : tomorrow more or less N days (e.g. : tomorrow\-15)
+now[+\-NbDays] : now more or less N days (e.g. now\-15)
+.IP
+\&'now' and 'today' are not exactly the same since today represents the first
+or last second of the day depending on if it's used in a start= or end=
+date expression. The utility to be able to specify dates in the future is
+a question which remains to be answered :\-)
 .IP
 Contrary to other PyKota management tools, wildcard characters are not
Index: pykota/trunk/man/sv_SE/pkrefund.1
===================================================================
--- pykota/trunk/man/sv_SE/pkrefund.1 (revision 3069)
+++ pykota/trunk/man/sv_SE/pkrefund.1 (revision 3094)
@@ -2,7 +2,7 @@
 .TH PKREFUND "1" "novembre 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkrefund \- page de manuel de pkrefund 1.25alpha16_unofficial
+pkrefund \- page de manuel de pkrefund 1.25alpha18_unofficial
 .SH DESCRIPTION
-pkrefund v1.25alpha16_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+pkrefund v1.25alpha18_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 Refunds jobs.
@@ -25,4 +25,29 @@
 \fB\-r\fR | \fB\-\-reason\fR txt
 Sets textual information to explain the refunding.
+.TP
+\fB\-l\fR | \fB\-\-logo\fR img
+Use the image as the receipt's logo. The logo will
+be drawn at the center top of the page. The default
+logo is /usr/share/pykota/logos/pykota.jpeg
+.TP
+\fB\-p\fR | \fB\-\-pagesize\fR sz
+Sets sz as the page size. Most well known
+page sizes are recognized, like 'A4' or 'Letter'
+to name a few. The default size is A4.
+.TP
+\fB\-n\fR | \fB\-\-number\fR N
+Sets the number of the first receipt. This number
+will automatically be incremented for each receipt.
+.TP
+\fB\-o\fR | \fB\-\-output\fR f.pdf
+Defines the name of the PDF file which will contain
+the receipts. If not set, then no PDF file will
+be created. If set to '\-', then \fB\-\-force\fR is assumed,
+and the PDF document is sent to standard output.
+.TP
+\fB\-u\fR | \fB\-\-unit\fR u
+Defines the name of the unit to use on the receipts.
+The default unit is 'Credits', optionally translated
+to your native language if it is supported by PyKota.
 .IP
 Use the filter expressions to extract only parts of the
@@ -77,9 +102,11 @@
 Examples :
 .IP
-\f(CW$ pkrefund jobid=503\fR
+\f(CW$ pkrefund --output /tmp/receipts.pdf jobid=503\fR
 .IP
 This will refund all jobs which Id is 503. BEWARE : installing CUPS
-afresh will reset the first job id at 1. So you probably want to use
-a more precise filter as explained below
+afresh will reset the first job id at 1, so you probably want to use
+a more precise filter as explained below. A confirmation will
+be asked for each job to refund, and a PDF file named /tmp/receipts.pdf
+will be created which will contain printable receipts.
 .IP
 \f(CW$ pkrefund --reason "Hardware problem" jobid=503 start=today-7\fR
Index: pykota/trunk/man/pkinvoice.1
===================================================================
--- pykota/trunk/man/pkinvoice.1 (revision 3069)
+++ pykota/trunk/man/pkinvoice.1 (revision 3094)
@@ -2,7 +2,7 @@
 .TH PKINVOICE "1" "November 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NAME
-pkinvoice \- manual page for pkinvoice 1.25alpha16_unofficial
+pkinvoice \- manual page for pkinvoice 1.25alpha18_unofficial
 .SH DESCRIPTION
-pkinvoice v1.25alpha16_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+pkinvoice v1.25alpha18_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 An invoice generator for PyKota.
@@ -10,5 +10,5 @@
 command line usage :
 .IP
-pkinvoice [options] user1 user2 ... userN
+pkinvoice [options] [filterexpr]
 .PP
 options :
@@ -49,15 +49,34 @@
 exposed. The default is 0.0, meaning no VAT
 information will be included.
+.IP
+Use the filter expressions to extract only parts of the
+datas. Allowed filters are of the form :
+.IP
+key=value
+.IP
+Allowed keys for now are :
 .TP
-\fB\-s\fR | \fB\-\-start\fR date
-Sets the starting date for the print jobs invoiced.
+username
+User's name
 .TP
-\fB\-e\fR | \fB\-\-end\fR date
-Sets the ending date for the print jobs invoiced.
+printername
+Printer's name
+.TP
+hostname
+Client's hostname
+.TP
+jobid
+Job's Id
+.TP
+billingcode
+Job's billing code
+.TP
+start
+Job's date of printing
+.TP
+end
+Job's date of printing
 .IP
-user1 through userN can use wildcards if needed. If no user argument is
-used, a wildcard of '*' is assumed, meaning include all users.
-.IP
-Dates formatting with \fB\-\-start\fR and \fB\-\-end\fR :
+Dates formatting with 'start' and 'end' filter keys :
 .IP
 YYYY : year boundaries
@@ -76,8 +95,11 @@
 date expression. The utility to be able to specify dates in the future is
 a question which remains to be answered :\-)
+.IP
+Contrary to other PyKota management tools, wildcard characters are not
+expanded, so you can't use them.
 .PP
 examples :
 .IP
-\f(CW$ pkinvoice --unit EURO --output invoices.pdf --start=now-30\fR
+\f(CW$ pkinvoice --unit EURO --output /tmp/invoices.pdf start=now-30\fR
 .IP
 Will generate a PDF document containing invoices for all users
Index: pykota/trunk/man/de/pkinvoice.1
===================================================================
--- pykota/trunk/man/de/pkinvoice.1 (revision 3069)
+++ pykota/trunk/man/de/pkinvoice.1 (revision 3094)
@@ -2,7 +2,7 @@
 .TH PKINVOICE "1" "novembre 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkinvoice \- page de manuel de pkinvoice 1.25alpha16_unofficial
+pkinvoice \- page de manuel de pkinvoice 1.25alpha18_unofficial
 .SH DESCRIPTION
-pkinvoice v1.25alpha16_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+pkinvoice v1.25alpha18_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 An invoice generator for PyKota.
@@ -10,5 +10,5 @@
 command line usage :
 .IP
-pkinvoice [options] user1 user2 ... userN
+pkinvoice [options] [filterexpr]
 .PP
 options :
@@ -49,15 +49,34 @@
 exposed. The default is 0.0, meaning no VAT
 information will be included.
+.IP
+Use the filter expressions to extract only parts of the
+datas. Allowed filters are of the form :
+.IP
+key=value
+.IP
+Allowed keys for now are :
 .TP
-\fB\-s\fR | \fB\-\-start\fR date
-Sets the starting date for the print jobs invoiced.
+username
+User's name
 .TP
-\fB\-e\fR | \fB\-\-end\fR date
-Sets the ending date for the print jobs invoiced.
+printername
+Printer's name
+.TP
+hostname
+Client's hostname
+.TP
+jobid
+Job's Id
+.TP
+billingcode
+Job's billing code
+.TP
+start
+Job's date of printing
+.TP
+end
+Job's date of printing
 .IP
-user1 through userN can use wildcards if needed. If no user argument is
-used, a wildcard of '*' is assumed, meaning include all users.
-.IP
-Dates formatting with \fB\-\-start\fR and \fB\-\-end\fR :
+Dates formatting with 'start' and 'end' filter keys :
 .IP
 YYYY : year boundaries
@@ -76,8 +95,11 @@
 date expression. The utility to be able to specify dates in the future is
 a question which remains to be answered :\-)
+.IP
+Contrary to other PyKota management tools, wildcard characters are not
+expanded, so you can't use them.
 .PP
 examples :
 .IP
-\f(CW$ pkinvoice --unit EURO --output invoices.pdf --start=now-30\fR
+\f(CW$ pkinvoice --unit EURO --output /tmp/invoices.pdf start=now-30\fR
 .IP
 Will generate a PDF document containing invoices for all users
Index: pykota/trunk/man/de/dumpykota.1
===================================================================
--- pykota/trunk/man/de/dumpykota.1 (revision 3065)
+++ pykota/trunk/man/de/dumpykota.1 (revision 3094)
@@ -2,7 +2,7 @@
 .TH DUMPYKOTA "1" "novembre 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-dumpykota \- page de manuel de dumpykota 1.25alpha16_unofficial
+dumpykota \- page de manuel de dumpykota 1.25alpha18_unofficial
 .SH DESCRIPTION
-dumpykota v1.25alpha16_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+dumpykota v1.25alpha18_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 Dumps PyKota database's content.
@@ -86,4 +86,7 @@
 Client's hostname
 .TP
+jobid
+Job's Id
+.TP
 billingcode
 Job's billing code
@@ -94,4 +97,22 @@
 end
 Job's date of printing
+.IP
+Dates formatting with 'start' and 'end' filter keys :
+.IP
+YYYY : year boundaries
+YYYYMM : month boundaries
+YYYYMMDD : day boundaries
+YYYYMMDDhh : hour boundaries
+YYYYMMDDhhmm : minute boundaries
+YYYYMMDDhhmmss : second boundaries
+yesterday[+\-NbDays] : yesterday more or less N days (e.g. : yesterday\-15)
+today[+\-NbDays] : today more or less N days (e.g. : today\-15)
+tomorrow[+\-NbDays] : tomorrow more or less N days (e.g. : tomorrow\-15)
+now[+\-NbDays] : now more or less N days (e.g. now\-15)
+.IP
+\&'now' and 'today' are not exactly the same since today represents the first
+or last second of the day depending on if it's used in a start= or end=
+date expression. The utility to be able to specify dates in the future is
+a question which remains to be answered :\-)
 .IP
 Contrary to other PyKota management tools, wildcard characters are not
Index: pykota/trunk/man/de/pkrefund.1
===================================================================
--- pykota/trunk/man/de/pkrefund.1 (revision 3069)
+++ pykota/trunk/man/de/pkrefund.1 (revision 3094)
@@ -2,7 +2,7 @@
 .TH PKREFUND "1" "novembre 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkrefund \- page de manuel de pkrefund 1.25alpha16_unofficial
+pkrefund \- page de manuel de pkrefund 1.25alpha18_unofficial
 .SH DESCRIPTION
-pkrefund v1.25alpha16_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+pkrefund v1.25alpha18_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 Refunds jobs.
@@ -25,4 +25,29 @@
 \fB\-r\fR | \fB\-\-reason\fR txt
 Sets textual information to explain the refunding.
+.TP
+\fB\-l\fR | \fB\-\-logo\fR img
+Use the image as the receipt's logo. The logo will
+be drawn at the center top of the page. The default
+logo is /usr/share/pykota/logos/pykota.jpeg
+.TP
+\fB\-p\fR | \fB\-\-pagesize\fR sz
+Sets sz as the page size. Most well known
+page sizes are recognized, like 'A4' or 'Letter'
+to name a few. The default size is A4.
+.TP
+\fB\-n\fR | \fB\-\-number\fR N
+Sets the number of the first receipt. This number
+will automatically be incremented for each receipt.
+.TP
+\fB\-o\fR | \fB\-\-output\fR f.pdf
+Defines the name of the PDF file which will contain
+the receipts. If not set, then no PDF file will
+be created. If set to '\-', then \fB\-\-force\fR is assumed,
+and the PDF document is sent to standard output.
+.TP
+\fB\-u\fR | \fB\-\-unit\fR u
+Defines the name of the unit to use on the receipts.
+The default unit is 'Credits', optionally translated
+to your native language if it is supported by PyKota.
 .IP
 Use the filter expressions to extract only parts of the
@@ -77,9 +102,11 @@
 Examples :
 .IP
-\f(CW$ pkrefund jobid=503\fR
+\f(CW$ pkrefund --output /tmp/receipts.pdf jobid=503\fR
 .IP
 This will refund all jobs which Id is 503. BEWARE : installing CUPS
-afresh will reset the first job id at 1. So you probably want to use
-a more precise filter as explained below
+afresh will reset the first job id at 1, so you probably want to use
+a more precise filter as explained below. A confirmation will
+be asked for each job to refund, and a PDF file named /tmp/receipts.pdf
+will be created which will contain printable receipts.
 .IP
 \f(CW$ pkrefund --reason "Hardware problem" jobid=503 start=today-7\fR
Index: pykota/trunk/man/nb_NO/pkinvoice.1
===================================================================
--- pykota/trunk/man/nb_NO/pkinvoice.1 (revision 3069)
+++ pykota/trunk/man/nb_NO/pkinvoice.1 (revision 3094)
@@ -2,7 +2,7 @@
 .TH PKINVOICE "1" "novembre 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkinvoice \- page de manuel de pkinvoice 1.25alpha16_unofficial
+pkinvoice \- page de manuel de pkinvoice 1.25alpha18_unofficial
 .SH DESCRIPTION
-pkinvoice v1.25alpha16_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+pkinvoice v1.25alpha18_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 An invoice generator for PyKota.
@@ -10,5 +10,5 @@
 command line usage :
 .IP
-pkinvoice [options] user1 user2 ... userN
+pkinvoice [options] [filterexpr]
 .PP
 options :
@@ -49,15 +49,34 @@
 exposed. The default is 0.0, meaning no VAT
 information will be included.
+.IP
+Use the filter expressions to extract only parts of the
+datas. Allowed filters are of the form :
+.IP
+key=value
+.IP
+Allowed keys for now are :
 .TP
-\fB\-s\fR | \fB\-\-start\fR date
-Sets the starting date for the print jobs invoiced.
+username
+User's name
 .TP
-\fB\-e\fR | \fB\-\-end\fR date
-Sets the ending date for the print jobs invoiced.
+printername
+Printer's name
+.TP
+hostname
+Client's hostname
+.TP
+jobid
+Job's Id
+.TP
+billingcode
+Job's billing code
+.TP
+start
+Job's date of printing
+.TP
+end
+Job's date of printing
 .IP
-user1 through userN can use wildcards if needed. If no user argument is
-used, a wildcard of '*' is assumed, meaning include all users.
-.IP
-Dates formatting with \fB\-\-start\fR and \fB\-\-end\fR :
+Dates formatting with 'start' and 'end' filter keys :
 .IP
 YYYY : year boundaries
@@ -76,8 +95,11 @@
 date expression. The utility to be able to specify dates in the future is
 a question which remains to be answered :\-)
+.IP
+Contrary to other PyKota management tools, wildcard characters are not
+expanded, so you can't use them.
 .PP
 examples :
 .IP
-\f(CW$ pkinvoice --unit EURO --output invoices.pdf --start=now-30\fR
+\f(CW$ pkinvoice --unit EURO --output /tmp/invoices.pdf start=now-30\fR
 .IP
 Will generate a PDF document containing invoices for all users
Index: pykota/trunk/man/nb_NO/dumpykota.1
===================================================================
--- pykota/trunk/man/nb_NO/dumpykota.1 (revision 3065)
+++ pykota/trunk/man/nb_NO/dumpykota.1 (revision 3094)
@@ -2,7 +2,7 @@
 .TH DUMPYKOTA "1" "novembre 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-dumpykota \- page de manuel de dumpykota 1.25alpha16_unofficial
+dumpykota \- page de manuel de dumpykota 1.25alpha18_unofficial
 .SH DESCRIPTION
-dumpykota v1.25alpha16_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+dumpykota v1.25alpha18_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 Dumps PyKota database's content.
@@ -86,4 +86,7 @@
 Client's hostname
 .TP
+jobid
+Job's Id
+.TP
 billingcode
 Job's billing code
@@ -94,4 +97,22 @@
 end
 Job's date of printing
+.IP
+Dates formatting with 'start' and 'end' filter keys :
+.IP
+YYYY : year boundaries
+YYYYMM : month boundaries
+YYYYMMDD : day boundaries
+YYYYMMDDhh : hour boundaries
+YYYYMMDDhhmm : minute boundaries
+YYYYMMDDhhmmss : second boundaries
+yesterday[+\-NbDays] : yesterday more or less N days (e.g. : yesterday\-15)
+today[+\-NbDays] : today more or less N days (e.g. : today\-15)
+tomorrow[+\-NbDays] : tomorrow more or less N days (e.g. : tomorrow\-15)
+now[+\-NbDays] : now more or less N days (e.g. now\-15)
+.IP
+\&'now' and 'today' are not exactly the same since today represents the first
+or last second of the day depending on if it's used in a start= or end=
+date expression. The utility to be able to specify dates in the future is
+a question which remains to be answered :\-)
 .IP
 Contrary to other PyKota management tools, wildcard characters are not
Index: pykota/trunk/man/nb_NO/pkrefund.1
===================================================================
--- pykota/trunk/man/nb_NO/pkrefund.1 (revision 3069)
+++ pykota/trunk/man/nb_NO/pkrefund.1 (revision 3094)
@@ -2,7 +2,7 @@
 .TH PKREFUND "1" "novembre 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkrefund \- page de manuel de pkrefund 1.25alpha16_unofficial
+pkrefund \- page de manuel de pkrefund 1.25alpha18_unofficial
 .SH DESCRIPTION
-pkrefund v1.25alpha16_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+pkrefund v1.25alpha18_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 Refunds jobs.
@@ -25,4 +25,29 @@
 \fB\-r\fR | \fB\-\-reason\fR txt
 Sets textual information to explain the refunding.
+.TP
+\fB\-l\fR | \fB\-\-logo\fR img
+Use the image as the receipt's logo. The logo will
+be drawn at the center top of the page. The default
+logo is /usr/share/pykota/logos/pykota.jpeg
+.TP
+\fB\-p\fR | \fB\-\-pagesize\fR sz
+Sets sz as the page size. Most well known
+page sizes are recognized, like 'A4' or 'Letter'
+to name a few. The default size is A4.
+.TP
+\fB\-n\fR | \fB\-\-number\fR N
+Sets the number of the first receipt. This number
+will automatically be incremented for each receipt.
+.TP
+\fB\-o\fR | \fB\-\-output\fR f.pdf
+Defines the name of the PDF file which will contain
+the receipts. If not set, then no PDF file will
+be created. If set to '\-', then \fB\-\-force\fR is assumed,
+and the PDF document is sent to standard output.
+.TP
+\fB\-u\fR | \fB\-\-unit\fR u
+Defines the name of the unit to use on the receipts.
+The default unit is 'Credits', optionally translated
+to your native language if it is supported by PyKota.
 .IP
 Use the filter expressions to extract only parts of the
@@ -77,9 +102,11 @@
 Examples :
 .IP
-\f(CW$ pkrefund jobid=503\fR
+\f(CW$ pkrefund --output /tmp/receipts.pdf jobid=503\fR
 .IP
 This will refund all jobs which Id is 503. BEWARE : installing CUPS
-afresh will reset the first job id at 1. So you probably want to use
-a more precise filter as explained below
+afresh will reset the first job id at 1, so you probably want to use
+a more precise filter as explained below. A confirmation will
+be asked for each job to refund, and a PDF file named /tmp/receipts.pdf
+will be created which will contain printable receipts.
 .IP
 \f(CW$ pkrefund --reason "Hardware problem" jobid=503 start=today-7\fR
Index: pykota/trunk/man/pt_BR/pkinvoice.1
===================================================================
--- pykota/trunk/man/pt_BR/pkinvoice.1 (revision 3069)
+++ pykota/trunk/man/pt_BR/pkinvoice.1 (revision 3094)
@@ -2,7 +2,7 @@
 .TH PKINVOICE "1" "novembre 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkinvoice \- page de manuel de pkinvoice 1.25alpha16_unofficial
+pkinvoice \- page de manuel de pkinvoice 1.25alpha18_unofficial
 .SH DESCRIPTION
-pkinvoice v1.25alpha16_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+pkinvoice v1.25alpha18_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 An invoice generator for PyKota.
@@ -10,5 +10,5 @@
 command line usage :
 .IP
-pkinvoice [options] user1 user2 ... userN
+pkinvoice [options] [filterexpr]
 .PP
 options :
@@ -49,15 +49,34 @@
 exposed. The default is 0.0, meaning no VAT
 information will be included.
+.IP
+Use the filter expressions to extract only parts of the
+datas. Allowed filters are of the form :
+.IP
+key=value
+.IP
+Allowed keys for now are :
 .TP
-\fB\-s\fR | \fB\-\-start\fR date
-Sets the starting date for the print jobs invoiced.
+username
+User's name
 .TP
-\fB\-e\fR | \fB\-\-end\fR date
-Sets the ending date for the print jobs invoiced.
+printername
+Printer's name
+.TP
+hostname
+Client's hostname
+.TP
+jobid
+Job's Id
+.TP
+billingcode
+Job's billing code
+.TP
+start
+Job's date of printing
+.TP
+end
+Job's date of printing
 .IP
-user1 through userN can use wildcards if needed. If no user argument is
-used, a wildcard of '*' is assumed, meaning include all users.
-.IP
-Dates formatting with \fB\-\-start\fR and \fB\-\-end\fR :
+Dates formatting with 'start' and 'end' filter keys :
 .IP
 YYYY : year boundaries
@@ -76,8 +95,11 @@
 date expression. The utility to be able to specify dates in the future is
 a question which remains to be answered :\-)
+.IP
+Contrary to other PyKota management tools, wildcard characters are not
+expanded, so you can't use them.
 .PP
 examples :
 .IP
-\f(CW$ pkinvoice --unit EURO --output invoices.pdf --start=now-30\fR
+\f(CW$ pkinvoice --unit EURO --output /tmp/invoices.pdf start=now-30\fR
 .IP
 Will generate a PDF document containing invoices for all users
Index: pykota/trunk/man/pt_BR/dumpykota.1
===================================================================
--- pykota/trunk/man/pt_BR/dumpykota.1 (revision 3065)
+++ pykota/trunk/man/pt_BR/dumpykota.1 (revision 3094)
@@ -2,7 +2,7 @@
 .TH DUMPYKOTA "1" "novembre 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-dumpykota \- page de manuel de dumpykota 1.25alpha16_unofficial
+dumpykota \- page de manuel de dumpykota 1.25alpha18_unofficial
 .SH DESCRIPTION
-dumpykota v1.25alpha16_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+dumpykota v1.25alpha18_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 Dumps PyKota database's content.
@@ -86,4 +86,7 @@
 Client's hostname
 .TP
+jobid
+Job's Id
+.TP
 billingcode
 Job's billing code
@@ -94,4 +97,22 @@
 end
 Job's date of printing
+.IP
+Dates formatting with 'start' and 'end' filter keys :
+.IP
+YYYY : year boundaries
+YYYYMM : month boundaries
+YYYYMMDD : day boundaries
+YYYYMMDDhh : hour boundaries
+YYYYMMDDhhmm : minute boundaries
+YYYYMMDDhhmmss : second boundaries
+yesterday[+\-NbDays] : yesterday more or less N days (e.g. : yesterday\-15)
+today[+\-NbDays] : today more or less N days (e.g. : today\-15)
+tomorrow[+\-NbDays] : tomorrow more or less N days (e.g. : tomorrow\-15)
+now[+\-NbDays] : now more or less N days (e.g. now\-15)
+.IP
+\&'now' and 'today' are not exactly the same since today represents the first
+or last second of the day depending on if it's used in a start= or end=
+date expression. The utility to be able to specify dates in the future is
+a question which remains to be answered :\-)
 .IP
 Contrary to other PyKota management tools, wildcard characters are not
Index: pykota/trunk/man/pt_BR/pkrefund.1
===================================================================
--- pykota/trunk/man/pt_BR/pkrefund.1 (revision 3069)
+++ pykota/trunk/man/pt_BR/pkrefund.1 (revision 3094)
@@ -2,7 +2,7 @@
 .TH PKREFUND "1" "novembre 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkrefund \- page de manuel de pkrefund 1.25alpha16_unofficial
+pkrefund \- page de manuel de pkrefund 1.25alpha18_unofficial
 .SH DESCRIPTION
-pkrefund v1.25alpha16_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+pkrefund v1.25alpha18_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 Refunds jobs.
@@ -25,4 +25,29 @@
 \fB\-r\fR | \fB\-\-reason\fR txt
 Sets textual information to explain the refunding.
+.TP
+\fB\-l\fR | \fB\-\-logo\fR img
+Use the image as the receipt's logo. The logo will
+be drawn at the center top of the page. The default
+logo is /usr/share/pykota/logos/pykota.jpeg
+.TP
+\fB\-p\fR | \fB\-\-pagesize\fR sz
+Sets sz as the page size. Most well known
+page sizes are recognized, like 'A4' or 'Letter'
+to name a few. The default size is A4.
+.TP
+\fB\-n\fR | \fB\-\-number\fR N
+Sets the number of the first receipt. This number
+will automatically be incremented for each receipt.
+.TP
+\fB\-o\fR | \fB\-\-output\fR f.pdf
+Defines the name of the PDF file which will contain
+the receipts. If not set, then no PDF file will
+be created. If set to '\-', then \fB\-\-force\fR is assumed,
+and the PDF document is sent to standard output.
+.TP
+\fB\-u\fR | \fB\-\-unit\fR u
+Defines the name of the unit to use on the receipts.
+The default unit is 'Credits', optionally translated
+to your native language if it is supported by PyKota.
 .IP
 Use the filter expressions to extract only parts of the
@@ -77,9 +102,11 @@
 Examples :
 .IP
-\f(CW$ pkrefund jobid=503\fR
+\f(CW$ pkrefund --output /tmp/receipts.pdf jobid=503\fR
 .IP
 This will refund all jobs which Id is 503. BEWARE : installing CUPS
-afresh will reset the first job id at 1. So you probably want to use
-a more precise filter as explained below
+afresh will reset the first job id at 1, so you probably want to use
+a more precise filter as explained below. A confirmation will
+be asked for each job to refund, and a PDF file named /tmp/receipts.pdf
+will be created which will contain printable receipts.
 .IP
 \f(CW$ pkrefund --reason "Hardware problem" jobid=503 start=today-7\fR
Index: pykota/trunk/man/fr/pkinvoice.1
===================================================================
--- pykota/trunk/man/fr/pkinvoice.1 (revision 3065)
+++ pykota/trunk/man/fr/pkinvoice.1 (revision 3094)
@@ -2,88 +2,108 @@
 .TH PKINVOICE "1" "novembre 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkinvoice \- page de manuel de pkinvoice 1.25alpha16_unofficial
+pkinvoice \- page de manuel de pkinvoice 1.25alpha18_unofficial
 .SH DESCRIPTION
-pkinvoice v1.25alpha16_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+pkinvoice v1.25alpha18_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
-Un g�rateur de factures pour PyKota.
+An invoice generator for PyKota.
 .PP
-ligne de commande :
+command line usage :
 .IP
-pkinvoice [options] utilisateur1 utilisateur2 ... utilisateurN
+pkinvoice [options] [filterexpr]
 .PP
 options :
 .TP
 \fB\-v\fR | \fB\-\-version\fR
-Affiche la version de pkinvoice et quitte.
+Prints pkinvoice's version number then exits.
 .TP
 \fB\-h\fR | \fB\-\-help\fR
-Affiche ce message et quitte.
+Prints this message then exits.
 .TP
 \fB\-l\fR | \fB\-\-logo\fR img
-Utilise cette image comme logo sur la facture. Le logo
-sera dessin�u centre et en haut de la page. Le logo
-par d�ut est /usr/share/pykota/logos/pykota.jpeg
+Use the image as the invoice's logo. The logo will
+be drawn at the center top of the page. The default
+logo is /usr/share/pykota/logos/pykota.jpeg
 .TP
 \fB\-p\fR | \fB\-\-pagesize\fR sz
-Positionne la taille de page �z. La plupart des
-tailles standard sont reconnues, comme 'A4' ou 'Letter'
-par exemple. La taille par d�ut est A4.
+Sets sz as the page size. Most well known
+page sizes are recognized, like 'A4' or 'Letter'
+to name a few. The default size is A4.
 .TP
 \fB\-n\fR | \fB\-\-number\fR N
-Indique le num� de la premi� facture. Ce num�
-sera automatiquement incr�nt� chaque facture.
+Sets the number of the first invoice. This number
+will automatically be incremented for each invoice.
 .TP
 \fB\-o\fR | \fB\-\-output\fR f.pdf
-D�nit le nom du fichier PDF qui contiendra les
-factures. S'il n'est pas pr�s�u positionn� '\-'
-alors le document sera envoy�ur la sortie standard.
+Defines the name of the invoice file which will
+be generated as a PDF document. If not set or
+set to '\-', the PDF document is sent to standard
+output.
 .TP
 \fB\-u\fR | \fB\-\-unit\fR u
-D�nit le nom de l'unit� utiliser sur la facture.
-Le nom par d�ut est 'Credits', ou sa traduction
-�ntuelle dans votre langage pr�r�i PyKota
-le supporte.
+Defines the name of the unit to use on the invoice.
+The default unit is 'Credits', optionally translated
+to your native language if it is supported by PyKota.
 .TP
 \fB\-V\fR | \fB\-\-vat\fR p
-Indique le taux de TVA applicable qui sera indiqu�La valeur par d�ut est 0.0, qui fait qu'aucune
-information sur la TVA ne sera indiqu�
+Sets the percent value of the applicable VAT to be
+exposed. The default is 0.0, meaning no VAT
+information will be included.
+.IP
+Use the filter expressions to extract only parts of the
+datas. Allowed filters are of the form :
+.IP
+key=value
+.IP
+Allowed keys for now are :
 .TP
-\fB\-s\fR | \fB\-\-start\fR date
-Indique la date de d�t des travaux d'impression
-qui seront factur�
+username
+User's name
 .TP
-\fB\-e\fR | \fB\-\-end\fR date
-Indique la date de fin des travaux d'impression
-qui seront factur�
+printername
+Printer's name
+.TP
+hostname
+Client's hostname
+.TP
+jobid
+Job's Id
+.TP
+billingcode
+Job's billing code
+.TP
+start
+Job's date of printing
+.TP
+end
+Job's date of printing
 .IP
-utilisateur1 jusqu'�tilisateurN peuvent contenir des caract�s jokers
-au besoin. Si aucun nom d'utilisateur n'est indiqu�c'est comme si un
-joker '*' �it pr�s�ce qui veut dire inclure tous les utilisateurs.
+Dates formatting with 'start' and 'end' filter keys :
 .IP
-Formatage des dates avec \fB\-\-start\fR et \fB\-\-end\fR :
+YYYY : year boundaries
+YYYYMM : month boundaries
+YYYYMMDD : day boundaries
+YYYYMMDDhh : hour boundaries
+YYYYMMDDhhmm : minute boundaries
+YYYYMMDDhhmmss : second boundaries
+yesterday[+\-NbDays] : yesterday more or less N days (e.g. : yesterday\-15)
+today[+\-NbDays] : today more or less N days (e.g. : today\-15)
+tomorrow[+\-NbDays] : tomorrow more or less N days (e.g. : tomorrow\-15)
+now[+\-NbDays] : now more or less N days (e.g. now\-15)
 .IP
-AAAA : limites d'ann�AAAAMM : limites de mois
-AAAAMMJJ : limites de jour
-AAAAMMJJhh : limites d'heures
-AAAAMMJJhhmm : limites de minutes
-AAAAMMJJhhmmss : limites de secondes
-yesterday[+\-NbJours] : hier plus ou moins N jours (ex : yesterday\-15)
-today[+\-NbJours] : aujoud'hui plus ou moins N jours (ex : today\-15)
-tomorrow[+\-NbJours] : demain plus ou moins N jours (ex : tomorrow\-15)
-now[+\-NbJours] : maintenant plus ou moins N jours (ex : now\-15)
+\&'now' and 'today' are not exactly the same since today represents the first
+or last second of the day depending on if it's used in a start= or end=
+date expression. The utility to be able to specify dates in the future is
+a question which remains to be answered :\-)
 .IP
-\&'now' et 'today' ne sont pas exactement identiques car today repr�nte
-la premi� ou la derni� seconde du jour selon qu'il soit utilis�vec
-une expression de type start= ou end=.
-L'utilit�e pouvoir sp�fier une date dans le future est une question
-qui reste ouverte :\-)
+Contrary to other PyKota management tools, wildcard characters are not
+expanded, so you can't use them.
 .PP
-exemples :
+examples :
 .IP
-\f(CW$ pkinvoice --unit EURO --output factures.pdf --start=now-30\fR
+\f(CW$ pkinvoice --unit EURO --output /tmp/invoices.pdf start=now-30\fR
 .IP
-G�rera un document PDF contenant les factures de tous les utilisateurs
-qui ont d�ns�es cr�ts durant le mois �ul�Les factures seront en
-EURO. Aucune information de TVA ne sera incluse.
+Will generate a PDF document containing invoices for all users
+who have spent some credits last month. Invoices will be done in
+EURO.  No VAT information will be included.
 .PP
 This program is free software; you can redistribute it and/or modify
Index: pykota/trunk/man/fr/dumpykota.1
===================================================================
--- pykota/trunk/man/fr/dumpykota.1 (revision 3065)
+++ pykota/trunk/man/fr/dumpykota.1 (revision 3094)
@@ -2,7 +2,7 @@
 .TH DUMPYKOTA "1" "novembre 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-dumpykota \- page de manuel de dumpykota 1.25alpha16_unofficial
+dumpykota \- page de manuel de dumpykota 1.25alpha18_unofficial
 .SH DESCRIPTION
-dumpykota v1.25alpha16_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+dumpykota v1.25alpha18_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 Exporte le contenu de la base de donn� de PyKota.
@@ -95,4 +95,7 @@
 Nom d'h�de la machine cliente
 .TP
+jobid
+Id du travail d'impression
+.TP
 billingcode
 Code de facturation du travail d'impression
@@ -103,4 +106,22 @@
 end
 Date du travail d'impression
+.IP
+Formatage des dates avec les cl�'start' et 'end' :
+.IP
+AAAA : limites d'ann�AAAAMM : limites de mois
+AAAAMMJJ : limites de jour
+AAAAMMJJhh : limites d'heures
+AAAAMMJJhhmm : limites de minutes
+AAAAMMJJhhmmss : limites de secondes
+yesterday[+\-NbJours] : hier plus ou moins N jours (ex : yesterday\-15)
+today[+\-NbJours] : aujoud'hui plus ou moins N jours (ex : today\-15)
+tomorrow[+\-NbJours] : demain plus ou moins N jours (ex : tomorrow\-15)
+now[+\-NbJours] : maintenant plus ou moins N jours (ex : now\-15)
+.IP
+\&'now' et 'today' ne sont pas exactement identiques car today repr�nte
+la premi� ou la derni� seconde du jour selon qu'il soit utilis�vec
+une expression de type start= ou end=.
+L'utilit�e pouvoir sp�fier une date dans le future est une question
+qui reste ouverte :\-)
 .IP
 Contrairement aux autres outils d'administration de PyKota, les caract�s
Index: pykota/trunk/man/fr/pkrefund.1
===================================================================
--- pykota/trunk/man/fr/pkrefund.1 (revision 3069)
+++ pykota/trunk/man/fr/pkrefund.1 (revision 3094)
@@ -2,7 +2,7 @@
 .TH PKREFUND "1" "novembre 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkrefund \- page de manuel de pkrefund 1.25alpha16_unofficial
+pkrefund \- page de manuel de pkrefund 1.25alpha18_unofficial
 .SH DESCRIPTION
-pkrefund v1.25alpha16_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+pkrefund v1.25alpha18_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 Refunds jobs.
@@ -25,4 +25,29 @@
 \fB\-r\fR | \fB\-\-reason\fR txt
 Sets textual information to explain the refunding.
+.TP
+\fB\-l\fR | \fB\-\-logo\fR img
+Use the image as the receipt's logo. The logo will
+be drawn at the center top of the page. The default
+logo is /usr/share/pykota/logos/pykota.jpeg
+.TP
+\fB\-p\fR | \fB\-\-pagesize\fR sz
+Sets sz as the page size. Most well known
+page sizes are recognized, like 'A4' or 'Letter'
+to name a few. The default size is A4.
+.TP
+\fB\-n\fR | \fB\-\-number\fR N
+Sets the number of the first receipt. This number
+will automatically be incremented for each receipt.
+.TP
+\fB\-o\fR | \fB\-\-output\fR f.pdf
+Defines the name of the PDF file which will contain
+the receipts. If not set, then no PDF file will
+be created. If set to '\-', then \fB\-\-force\fR is assumed,
+and the PDF document is sent to standard output.
+.TP
+\fB\-u\fR | \fB\-\-unit\fR u
+Defines the name of the unit to use on the receipts.
+The default unit is 'Credits', optionally translated
+to your native language if it is supported by PyKota.
 .IP
 Use the filter expressions to extract only parts of the
@@ -77,9 +102,11 @@
 Examples :
 .IP
-\f(CW$ pkrefund jobid=503\fR
+\f(CW$ pkrefund --output /tmp/receipts.pdf jobid=503\fR
 .IP
 This will refund all jobs which Id is 503. BEWARE : installing CUPS
-afresh will reset the first job id at 1. So you probably want to use
-a more precise filter as explained below
+afresh will reset the first job id at 1, so you probably want to use
+a more precise filter as explained below. A confirmation will
+be asked for each job to refund, and a PDF file named /tmp/receipts.pdf
+will be created which will contain printable receipts.
 .IP
 \f(CW$ pkrefund --reason "Hardware problem" jobid=503 start=today-7\fR
Index: pykota/trunk/man/th/pkinvoice.1
===================================================================
--- pykota/trunk/man/th/pkinvoice.1 (revision 3069)
+++ pykota/trunk/man/th/pkinvoice.1 (revision 3094)
@@ -2,7 +2,7 @@
 .TH PKINVOICE "1" "novembre 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkinvoice \- page de manuel de pkinvoice 1.25alpha16_unofficial
+pkinvoice \- page de manuel de pkinvoice 1.25alpha18_unofficial
 .SH DESCRIPTION
-pkinvoice v1.25alpha16_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+pkinvoice v1.25alpha18_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 An invoice generator for PyKota.
@@ -10,5 +10,5 @@
 command line usage :
 .IP
-pkinvoice [options] user1 user2 ... userN
+pkinvoice [options] [filterexpr]
 .PP
 options :
@@ -49,15 +49,34 @@
 exposed. The default is 0.0, meaning no VAT
 information will be included.
+.IP
+Use the filter expressions to extract only parts of the
+datas. Allowed filters are of the form :
+.IP
+key=value
+.IP
+Allowed keys for now are :
 .TP
-\fB\-s\fR | \fB\-\-start\fR date
-Sets the starting date for the print jobs invoiced.
+username
+User's name
 .TP
-\fB\-e\fR | \fB\-\-end\fR date
-Sets the ending date for the print jobs invoiced.
+printername
+Printer's name
+.TP
+hostname
+Client's hostname
+.TP
+jobid
+Job's Id
+.TP
+billingcode
+Job's billing code
+.TP
+start
+Job's date of printing
+.TP
+end
+Job's date of printing
 .IP
-user1 through userN can use wildcards if needed. If no user argument is
-used, a wildcard of '*' is assumed, meaning include all users.
-.IP
-Dates formatting with \fB\-\-start\fR and \fB\-\-end\fR :
+Dates formatting with 'start' and 'end' filter keys :
 .IP
 YYYY : year boundaries
@@ -76,8 +95,11 @@
 date expression. The utility to be able to specify dates in the future is
 a question which remains to be answered :\-)
+.IP
+Contrary to other PyKota management tools, wildcard characters are not
+expanded, so you can't use them.
 .PP
 examples :
 .IP
-\f(CW$ pkinvoice --unit EURO --output invoices.pdf --start=now-30\fR
+\f(CW$ pkinvoice --unit EURO --output /tmp/invoices.pdf start=now-30\fR
 .IP
 Will generate a PDF document containing invoices for all users
Index: pykota/trunk/man/th/dumpykota.1
===================================================================
--- pykota/trunk/man/th/dumpykota.1 (revision 3065)
+++ pykota/trunk/man/th/dumpykota.1 (revision 3094)
@@ -2,7 +2,7 @@
 .TH DUMPYKOTA "1" "novembre 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-dumpykota \- page de manuel de dumpykota 1.25alpha16_unofficial
+dumpykota \- page de manuel de dumpykota 1.25alpha18_unofficial
 .SH DESCRIPTION
-dumpykota v1.25alpha16_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+dumpykota v1.25alpha18_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 Dumps PyKota database's content.
@@ -86,4 +86,7 @@
 Client's hostname
 .TP
+jobid
+Job's Id
+.TP
 billingcode
 Job's billing code
@@ -94,4 +97,22 @@
 end
 Job's date of printing
+.IP
+Dates formatting with 'start' and 'end' filter keys :
+.IP
+YYYY : year boundaries
+YYYYMM : month boundaries
+YYYYMMDD : day boundaries
+YYYYMMDDhh : hour boundaries
+YYYYMMDDhhmm : minute boundaries
+YYYYMMDDhhmmss : second boundaries
+yesterday[+\-NbDays] : yesterday more or less N days (e.g. : yesterday\-15)
+today[+\-NbDays] : today more or less N days (e.g. : today\-15)
+tomorrow[+\-NbDays] : tomorrow more or less N days (e.g. : tomorrow\-15)
+now[+\-NbDays] : now more or less N days (e.g. now\-15)
+.IP
+\&'now' and 'today' are not exactly the same since today represents the first
+or last second of the day depending on if it's used in a start= or end=
+date expression. The utility to be able to specify dates in the future is
+a question which remains to be answered :\-)
 .IP
 Contrary to other PyKota management tools, wildcard characters are not
Index: pykota/trunk/man/th/pkrefund.1
===================================================================
--- pykota/trunk/man/th/pkrefund.1 (revision 3069)
+++ pykota/trunk/man/th/pkrefund.1 (revision 3094)
@@ -2,7 +2,7 @@
 .TH PKREFUND "1" "novembre 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkrefund \- page de manuel de pkrefund 1.25alpha16_unofficial
+pkrefund \- page de manuel de pkrefund 1.25alpha18_unofficial
 .SH DESCRIPTION
-pkrefund v1.25alpha16_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+pkrefund v1.25alpha18_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 Refunds jobs.
@@ -25,4 +25,29 @@
 \fB\-r\fR | \fB\-\-reason\fR txt
 Sets textual information to explain the refunding.
+.TP
+\fB\-l\fR | \fB\-\-logo\fR img
+Use the image as the receipt's logo. The logo will
+be drawn at the center top of the page. The default
+logo is /usr/share/pykota/logos/pykota.jpeg
+.TP
+\fB\-p\fR | \fB\-\-pagesize\fR sz
+Sets sz as the page size. Most well known
+page sizes are recognized, like 'A4' or 'Letter'
+to name a few. The default size is A4.
+.TP
+\fB\-n\fR | \fB\-\-number\fR N
+Sets the number of the first receipt. This number
+will automatically be incremented for each receipt.
+.TP
+\fB\-o\fR | \fB\-\-output\fR f.pdf
+Defines the name of the PDF file which will contain
+the receipts. If not set, then no PDF file will
+be created. If set to '\-', then \fB\-\-force\fR is assumed,
+and the PDF document is sent to standard output.
+.TP
+\fB\-u\fR | \fB\-\-unit\fR u
+Defines the name of the unit to use on the receipts.
+The default unit is 'Credits', optionally translated
+to your native language if it is supported by PyKota.
 .IP
 Use the filter expressions to extract only parts of the
@@ -77,9 +102,11 @@
 Examples :
 .IP
-\f(CW$ pkrefund jobid=503\fR
+\f(CW$ pkrefund --output /tmp/receipts.pdf jobid=503\fR
 .IP
 This will refund all jobs which Id is 503. BEWARE : installing CUPS
-afresh will reset the first job id at 1. So you probably want to use
-a more precise filter as explained below
+afresh will reset the first job id at 1, so you probably want to use
+a more precise filter as explained below. A confirmation will
+be asked for each job to refund, and a PDF file named /tmp/receipts.pdf
+will be created which will contain printable receipts.
 .IP
 \f(CW$ pkrefund --reason "Hardware problem" jobid=503 start=today-7\fR
Index: pykota/trunk/man/pl/pkinvoice.1
===================================================================
--- pykota/trunk/man/pl/pkinvoice.1 (revision 3069)
+++ pykota/trunk/man/pl/pkinvoice.1 (revision 3094)
@@ -2,7 +2,7 @@
 .TH PKINVOICE "1" "novembre 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkinvoice \- page de manuel de pkinvoice 1.25alpha16_unofficial
+pkinvoice \- page de manuel de pkinvoice 1.25alpha18_unofficial
 .SH DESCRIPTION
-pkinvoice v1.25alpha16_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+pkinvoice v1.25alpha18_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 An invoice generator for PyKota.
@@ -10,5 +10,5 @@
 command line usage :
 .IP
-pkinvoice [options] user1 user2 ... userN
+pkinvoice [options] [filterexpr]
 .PP
 options :
@@ -49,15 +49,34 @@
 exposed. The default is 0.0, meaning no VAT
 information will be included.
+.IP
+Use the filter expressions to extract only parts of the
+datas. Allowed filters are of the form :
+.IP
+key=value
+.IP
+Allowed keys for now are :
 .TP
-\fB\-s\fR | \fB\-\-start\fR date
-Sets the starting date for the print jobs invoiced.
+username
+User's name
 .TP
-\fB\-e\fR | \fB\-\-end\fR date
-Sets the ending date for the print jobs invoiced.
+printername
+Printer's name
+.TP
+hostname
+Client's hostname
+.TP
+jobid
+Job's Id
+.TP
+billingcode
+Job's billing code
+.TP
+start
+Job's date of printing
+.TP
+end
+Job's date of printing
 .IP
-user1 through userN can use wildcards if needed. If no user argument is
-used, a wildcard of '*' is assumed, meaning include all users.
-.IP
-Dates formatting with \fB\-\-start\fR and \fB\-\-end\fR :
+Dates formatting with 'start' and 'end' filter keys :
 .IP
 YYYY : year boundaries
@@ -76,8 +95,11 @@
 date expression. The utility to be able to specify dates in the future is
 a question which remains to be answered :\-)
+.IP
+Contrary to other PyKota management tools, wildcard characters are not
+expanded, so you can't use them.
 .PP
 examples :
 .IP
-\f(CW$ pkinvoice --unit EURO --output invoices.pdf --start=now-30\fR
+\f(CW$ pkinvoice --unit EURO --output /tmp/invoices.pdf start=now-30\fR
 .IP
 Will generate a PDF document containing invoices for all users
Index: pykota/trunk/man/pl/dumpykota.1
===================================================================
--- pykota/trunk/man/pl/dumpykota.1 (revision 3065)
+++ pykota/trunk/man/pl/dumpykota.1 (revision 3094)
@@ -2,7 +2,7 @@
 .TH DUMPYKOTA "1" "novembre 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-dumpykota \- page de manuel de dumpykota 1.25alpha16_unofficial
+dumpykota \- page de manuel de dumpykota 1.25alpha18_unofficial
 .SH DESCRIPTION
-dumpykota v1.25alpha16_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+dumpykota v1.25alpha18_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 Dumps PyKota database's content.
@@ -86,4 +86,7 @@
 Client's hostname
 .TP
+jobid
+Job's Id
+.TP
 billingcode
 Job's billing code
@@ -94,4 +97,22 @@
 end
 Job's date of printing
+.IP
+Dates formatting with 'start' and 'end' filter keys :
+.IP
+YYYY : year boundaries
+YYYYMM : month boundaries
+YYYYMMDD : day boundaries
+YYYYMMDDhh : hour boundaries
+YYYYMMDDhhmm : minute boundaries
+YYYYMMDDhhmmss : second boundaries
+yesterday[+\-NbDays] : yesterday more or less N days (e.g. : yesterday\-15)
+today[+\-NbDays] : today more or less N days (e.g. : today\-15)
+tomorrow[+\-NbDays] : tomorrow more or less N days (e.g. : tomorrow\-15)
+now[+\-NbDays] : now more or less N days (e.g. now\-15)
+.IP
+\&'now' and 'today' are not exactly the same since today represents the first
+or last second of the day depending on if it's used in a start= or end=
+date expression. The utility to be able to specify dates in the future is
+a question which remains to be answered :\-)
 .IP
 Contrary to other PyKota management tools, wildcard characters are not
Index: pykota/trunk/man/pl/pkrefund.1
===================================================================
--- pykota/trunk/man/pl/pkrefund.1 (revision 3069)
+++ pykota/trunk/man/pl/pkrefund.1 (revision 3094)
@@ -2,7 +2,7 @@
 .TH PKREFUND "1" "novembre 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkrefund \- page de manuel de pkrefund 1.25alpha16_unofficial
+pkrefund \- page de manuel de pkrefund 1.25alpha18_unofficial
 .SH DESCRIPTION
-pkrefund v1.25alpha16_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+pkrefund v1.25alpha18_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 Refunds jobs.
@@ -25,4 +25,29 @@
 \fB\-r\fR | \fB\-\-reason\fR txt
 Sets textual information to explain the refunding.
+.TP
+\fB\-l\fR | \fB\-\-logo\fR img
+Use the image as the receipt's logo. The logo will
+be drawn at the center top of the page. The default
+logo is /usr/share/pykota/logos/pykota.jpeg
+.TP
+\fB\-p\fR | \fB\-\-pagesize\fR sz
+Sets sz as the page size. Most well known
+page sizes are recognized, like 'A4' or 'Letter'
+to name a few. The default size is A4.
+.TP
+\fB\-n\fR | \fB\-\-number\fR N
+Sets the number of the first receipt. This number
+will automatically be incremented for each receipt.
+.TP
+\fB\-o\fR | \fB\-\-output\fR f.pdf
+Defines the name of the PDF file which will contain
+the receipts. If not set, then no PDF file will
+be created. If set to '\-', then \fB\-\-force\fR is assumed,
+and the PDF document is sent to standard output.
+.TP
+\fB\-u\fR | \fB\-\-unit\fR u
+Defines the name of the unit to use on the receipts.
+The default unit is 'Credits', optionally translated
+to your native language if it is supported by PyKota.
 .IP
 Use the filter expressions to extract only parts of the
@@ -77,9 +102,11 @@
 Examples :
 .IP
-\f(CW$ pkrefund jobid=503\fR
+\f(CW$ pkrefund --output /tmp/receipts.pdf jobid=503\fR
 .IP
 This will refund all jobs which Id is 503. BEWARE : installing CUPS
-afresh will reset the first job id at 1. So you probably want to use
-a more precise filter as explained below
+afresh will reset the first job id at 1, so you probably want to use
+a more precise filter as explained below. A confirmation will
+be asked for each job to refund, and a PDF file named /tmp/receipts.pdf
+will be created which will contain printable receipts.
 .IP
 \f(CW$ pkrefund --reason "Hardware problem" jobid=503 start=today-7\fR
Index: pykota/trunk/man/pt/pkinvoice.1
===================================================================
--- pykota/trunk/man/pt/pkinvoice.1 (revision 3069)
+++ pykota/trunk/man/pt/pkinvoice.1 (revision 3094)
@@ -2,7 +2,7 @@
 .TH PKINVOICE "1" "novembre 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkinvoice \- page de manuel de pkinvoice 1.25alpha16_unofficial
+pkinvoice \- page de manuel de pkinvoice 1.25alpha18_unofficial
 .SH DESCRIPTION
-pkinvoice v1.25alpha16_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+pkinvoice v1.25alpha18_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 An invoice generator for PyKota.
@@ -10,5 +10,5 @@
 command line usage :
 .IP
-pkinvoice [options] user1 user2 ... userN
+pkinvoice [options] [filterexpr]
 .PP
 options :
@@ -49,15 +49,34 @@
 exposed. The default is 0.0, meaning no VAT
 information will be included.
+.IP
+Use the filter expressions to extract only parts of the
+datas. Allowed filters are of the form :
+.IP
+key=value
+.IP
+Allowed keys for now are :
 .TP
-\fB\-s\fR | \fB\-\-start\fR date
-Sets the starting date for the print jobs invoiced.
+username
+User's name
 .TP
-\fB\-e\fR | \fB\-\-end\fR date
-Sets the ending date for the print jobs invoiced.
+printername
+Printer's name
+.TP
+hostname
+Client's hostname
+.TP
+jobid
+Job's Id
+.TP
+billingcode
+Job's billing code
+.TP
+start
+Job's date of printing
+.TP
+end
+Job's date of printing
 .IP
-user1 through userN can use wildcards if needed. If no user argument is
-used, a wildcard of '*' is assumed, meaning include all users.
-.IP
-Dates formatting with \fB\-\-start\fR and \fB\-\-end\fR :
+Dates formatting with 'start' and 'end' filter keys :
 .IP
 YYYY : year boundaries
@@ -76,8 +95,11 @@
 date expression. The utility to be able to specify dates in the future is
 a question which remains to be answered :\-)
+.IP
+Contrary to other PyKota management tools, wildcard characters are not
+expanded, so you can't use them.
 .PP
 examples :
 .IP
-\f(CW$ pkinvoice --unit EURO --output invoices.pdf --start=now-30\fR
+\f(CW$ pkinvoice --unit EURO --output /tmp/invoices.pdf start=now-30\fR
 .IP
 Will generate a PDF document containing invoices for all users
Index: pykota/trunk/man/pt/dumpykota.1
===================================================================
--- pykota/trunk/man/pt/dumpykota.1 (revision 3065)
+++ pykota/trunk/man/pt/dumpykota.1 (revision 3094)
@@ -2,7 +2,7 @@
 .TH DUMPYKOTA "1" "novembre 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-dumpykota \- page de manuel de dumpykota 1.25alpha16_unofficial
+dumpykota \- page de manuel de dumpykota 1.25alpha18_unofficial
 .SH DESCRIPTION
-dumpykota v1.25alpha16_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+dumpykota v1.25alpha18_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 Dumps PyKota database's content.
@@ -86,4 +86,7 @@
 Client's hostname
 .TP
+jobid
+Job's Id
+.TP
 billingcode
 Job's billing code
@@ -94,4 +97,22 @@
 end
 Job's date of printing
+.IP
+Dates formatting with 'start' and 'end' filter keys :
+.IP
+YYYY : year boundaries
+YYYYMM : month boundaries
+YYYYMMDD : day boundaries
+YYYYMMDDhh : hour boundaries
+YYYYMMDDhhmm : minute boundaries
+YYYYMMDDhhmmss : second boundaries
+yesterday[+\-NbDays] : yesterday more or less N days (e.g. : yesterday\-15)
+today[+\-NbDays] : today more or less N days (e.g. : today\-15)
+tomorrow[+\-NbDays] : tomorrow more or less N days (e.g. : tomorrow\-15)
+now[+\-NbDays] : now more or less N days (e.g. now\-15)
+.IP
+\&'now' and 'today' are not exactly the same since today represents the first
+or last second of the day depending on if it's used in a start= or end=
+date expression. The utility to be able to specify dates in the future is
+a question which remains to be answered :\-)
 .IP
 Contrary to other PyKota management tools, wildcard characters are not
Index: pykota/trunk/man/pt/pkrefund.1
===================================================================
--- pykota/trunk/man/pt/pkrefund.1 (revision 3069)
+++ pykota/trunk/man/pt/pkrefund.1 (revision 3094)
@@ -2,7 +2,7 @@
 .TH PKREFUND "1" "novembre 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkrefund \- page de manuel de pkrefund 1.25alpha16_unofficial
+pkrefund \- page de manuel de pkrefund 1.25alpha18_unofficial
 .SH DESCRIPTION
-pkrefund v1.25alpha16_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+pkrefund v1.25alpha18_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 Refunds jobs.
@@ -25,4 +25,29 @@
 \fB\-r\fR | \fB\-\-reason\fR txt
 Sets textual information to explain the refunding.
+.TP
+\fB\-l\fR | \fB\-\-logo\fR img
+Use the image as the receipt's logo. The logo will
+be drawn at the center top of the page. The default
+logo is /usr/share/pykota/logos/pykota.jpeg
+.TP
+\fB\-p\fR | \fB\-\-pagesize\fR sz
+Sets sz as the page size. Most well known
+page sizes are recognized, like 'A4' or 'Letter'
+to name a few. The default size is A4.
+.TP
+\fB\-n\fR | \fB\-\-number\fR N
+Sets the number of the first receipt. This number
+will automatically be incremented for each receipt.
+.TP
+\fB\-o\fR | \fB\-\-output\fR f.pdf
+Defines the name of the PDF file which will contain
+the receipts. If not set, then no PDF file will
+be created. If set to '\-', then \fB\-\-force\fR is assumed,
+and the PDF document is sent to standard output.
+.TP
+\fB\-u\fR | \fB\-\-unit\fR u
+Defines the name of the unit to use on the receipts.
+The default unit is 'Credits', optionally translated
+to your native language if it is supported by PyKota.
 .IP
 Use the filter expressions to extract only parts of the
@@ -77,9 +102,11 @@
 Examples :
 .IP
-\f(CW$ pkrefund jobid=503\fR
+\f(CW$ pkrefund --output /tmp/receipts.pdf jobid=503\fR
 .IP
 This will refund all jobs which Id is 503. BEWARE : installing CUPS
-afresh will reset the first job id at 1. So you probably want to use
-a more precise filter as explained below
+afresh will reset the first job id at 1, so you probably want to use
+a more precise filter as explained below. A confirmation will
+be asked for each job to refund, and a PDF file named /tmp/receipts.pdf
+will be created which will contain printable receipts.
 .IP
 \f(CW$ pkrefund --reason "Hardware problem" jobid=503 start=today-7\fR
Index: pykota/trunk/man/tr/pkinvoice.1
===================================================================
--- pykota/trunk/man/tr/pkinvoice.1 (revision 3069)
+++ pykota/trunk/man/tr/pkinvoice.1 (revision 3094)
@@ -2,7 +2,7 @@
 .TH PKINVOICE "1" "novembre 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkinvoice \- page de manuel de pkinvoice 1.25alpha16_unofficial
+pkinvoice \- page de manuel de pkinvoice 1.25alpha18_unofficial
 .SH DESCRIPTION
-pkinvoice v1.25alpha16_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+pkinvoice v1.25alpha18_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 An invoice generator for PyKota.
@@ -10,5 +10,5 @@
 command line usage :
 .IP
-pkinvoice [options] user1 user2 ... userN
+pkinvoice [options] [filterexpr]
 .PP
 options :
@@ -49,15 +49,34 @@
 exposed. The default is 0.0, meaning no VAT
 information will be included.
+.IP
+Use the filter expressions to extract only parts of the
+datas. Allowed filters are of the form :
+.IP
+key=value
+.IP
+Allowed keys for now are :
 .TP
-\fB\-s\fR | \fB\-\-start\fR date
-Sets the starting date for the print jobs invoiced.
+username
+User's name
 .TP
-\fB\-e\fR | \fB\-\-end\fR date
-Sets the ending date for the print jobs invoiced.
+printername
+Printer's name
+.TP
+hostname
+Client's hostname
+.TP
+jobid
+Job's Id
+.TP
+billingcode
+Job's billing code
+.TP
+start
+Job's date of printing
+.TP
+end
+Job's date of printing
 .IP
-user1 through userN can use wildcards if needed. If no user argument is
-used, a wildcard of '*' is assumed, meaning include all users.
-.IP
-Dates formatting with \fB\-\-start\fR and \fB\-\-end\fR :
+Dates formatting with 'start' and 'end' filter keys :
 .IP
 YYYY : year boundaries
@@ -76,8 +95,11 @@
 date expression. The utility to be able to specify dates in the future is
 a question which remains to be answered :\-)
+.IP
+Contrary to other PyKota management tools, wildcard characters are not
+expanded, so you can't use them.
 .PP
 examples :
 .IP
-\f(CW$ pkinvoice --unit EURO --output invoices.pdf --start=now-30\fR
+\f(CW$ pkinvoice --unit EURO --output /tmp/invoices.pdf start=now-30\fR
 .IP
 Will generate a PDF document containing invoices for all users
Index: pykota/trunk/man/tr/dumpykota.1
===================================================================
--- pykota/trunk/man/tr/dumpykota.1 (revision 3065)
+++ pykota/trunk/man/tr/dumpykota.1 (revision 3094)
@@ -2,7 +2,7 @@
 .TH DUMPYKOTA "1" "novembre 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-dumpykota \- page de manuel de dumpykota 1.25alpha16_unofficial
+dumpykota \- page de manuel de dumpykota 1.25alpha18_unofficial
 .SH DESCRIPTION
-dumpykota v1.25alpha16_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+dumpykota v1.25alpha18_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 Dumps PyKota database's content.
@@ -86,4 +86,7 @@
 Client's hostname
 .TP
+jobid
+Job's Id
+.TP
 billingcode
 Job's billing code
@@ -94,4 +97,22 @@
 end
 Job's date of printing
+.IP
+Dates formatting with 'start' and 'end' filter keys :
+.IP
+YYYY : year boundaries
+YYYYMM : month boundaries
+YYYYMMDD : day boundaries
+YYYYMMDDhh : hour boundaries
+YYYYMMDDhhmm : minute boundaries
+YYYYMMDDhhmmss : second boundaries
+yesterday[+\-NbDays] : yesterday more or less N days (e.g. : yesterday\-15)
+today[+\-NbDays] : today more or less N days (e.g. : today\-15)
+tomorrow[+\-NbDays] : tomorrow more or less N days (e.g. : tomorrow\-15)
+now[+\-NbDays] : now more or less N days (e.g. now\-15)
+.IP
+\&'now' and 'today' are not exactly the same since today represents the first
+or last second of the day depending on if it's used in a start= or end=
+date expression. The utility to be able to specify dates in the future is
+a question which remains to be answered :\-)
 .IP
 Contrary to other PyKota management tools, wildcard characters are not
Index: pykota/trunk/man/tr/pkrefund.1
===================================================================
--- pykota/trunk/man/tr/pkrefund.1 (revision 3069)
+++ pykota/trunk/man/tr/pkrefund.1 (revision 3094)
@@ -2,7 +2,7 @@
 .TH PKREFUND "1" "novembre 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkrefund \- page de manuel de pkrefund 1.25alpha16_unofficial
+pkrefund \- page de manuel de pkrefund 1.25alpha18_unofficial
 .SH DESCRIPTION
-pkrefund v1.25alpha16_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+pkrefund v1.25alpha18_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 Refunds jobs.
@@ -25,4 +25,29 @@
 \fB\-r\fR | \fB\-\-reason\fR txt
 Sets textual information to explain the refunding.
+.TP
+\fB\-l\fR | \fB\-\-logo\fR img
+Use the image as the receipt's logo. The logo will
+be drawn at the center top of the page. The default
+logo is /usr/share/pykota/logos/pykota.jpeg
+.TP
+\fB\-p\fR | \fB\-\-pagesize\fR sz
+Sets sz as the page size. Most well known
+page sizes are recognized, like 'A4' or 'Letter'
+to name a few. The default size is A4.
+.TP
+\fB\-n\fR | \fB\-\-number\fR N
+Sets the number of the first receipt. This number
+will automatically be incremented for each receipt.
+.TP
+\fB\-o\fR | \fB\-\-output\fR f.pdf
+Defines the name of the PDF file which will contain
+the receipts. If not set, then no PDF file will
+be created. If set to '\-', then \fB\-\-force\fR is assumed,
+and the PDF document is sent to standard output.
+.TP
+\fB\-u\fR | \fB\-\-unit\fR u
+Defines the name of the unit to use on the receipts.
+The default unit is 'Credits', optionally translated
+to your native language if it is supported by PyKota.
 .IP
 Use the filter expressions to extract only parts of the
@@ -77,9 +102,11 @@
 Examples :
 .IP
-\f(CW$ pkrefund jobid=503\fR
+\f(CW$ pkrefund --output /tmp/receipts.pdf jobid=503\fR
 .IP
 This will refund all jobs which Id is 503. BEWARE : installing CUPS
-afresh will reset the first job id at 1. So you probably want to use
-a more precise filter as explained below
+afresh will reset the first job id at 1, so you probably want to use
+a more precise filter as explained below. A confirmation will
+be asked for each job to refund, and a PDF file named /tmp/receipts.pdf
+will be created which will contain printable receipts.
 .IP
 \f(CW$ pkrefund --reason "Hardware problem" jobid=503 start=today-7\fR
Index: pykota/trunk/man/el_GR/pkinvoice.1
===================================================================
--- pykota/trunk/man/el_GR/pkinvoice.1 (revision 3069)
+++ pykota/trunk/man/el_GR/pkinvoice.1 (revision 3094)
@@ -2,7 +2,7 @@
 .TH PKINVOICE "1" "novembre 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkinvoice \- page de manuel de pkinvoice 1.25alpha16_unofficial
+pkinvoice \- page de manuel de pkinvoice 1.25alpha18_unofficial
 .SH DESCRIPTION
-pkinvoice v1.25alpha16_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+pkinvoice v1.25alpha18_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 An invoice generator for PyKota.
@@ -10,5 +10,5 @@
 command line usage :
 .IP
-pkinvoice [options] user1 user2 ... userN
+pkinvoice [options] [filterexpr]
 .PP
 options :
@@ -49,15 +49,34 @@
 exposed. The default is 0.0, meaning no VAT
 information will be included.
+.IP
+Use the filter expressions to extract only parts of the
+datas. Allowed filters are of the form :
+.IP
+key=value
+.IP
+Allowed keys for now are :
 .TP
-\fB\-s\fR | \fB\-\-start\fR date
-Sets the starting date for the print jobs invoiced.
+username
+User's name
 .TP
-\fB\-e\fR | \fB\-\-end\fR date
-Sets the ending date for the print jobs invoiced.
+printername
+Printer's name
+.TP
+hostname
+Client's hostname
+.TP
+jobid
+Job's Id
+.TP
+billingcode
+Job's billing code
+.TP
+start
+Job's date of printing
+.TP
+end
+Job's date of printing
 .IP
-user1 through userN can use wildcards if needed. If no user argument is
-used, a wildcard of '*' is assumed, meaning include all users.
-.IP
-Dates formatting with \fB\-\-start\fR and \fB\-\-end\fR :
+Dates formatting with 'start' and 'end' filter keys :
 .IP
 YYYY : year boundaries
@@ -76,8 +95,11 @@
 date expression. The utility to be able to specify dates in the future is
 a question which remains to be answered :\-)
+.IP
+Contrary to other PyKota management tools, wildcard characters are not
+expanded, so you can't use them.
 .PP
 examples :
 .IP
-\f(CW$ pkinvoice --unit EURO --output invoices.pdf --start=now-30\fR
+\f(CW$ pkinvoice --unit EURO --output /tmp/invoices.pdf start=now-30\fR
 .IP
 Will generate a PDF document containing invoices for all users
Index: pykota/trunk/man/el_GR/dumpykota.1
===================================================================
--- pykota/trunk/man/el_GR/dumpykota.1 (revision 3065)
+++ pykota/trunk/man/el_GR/dumpykota.1 (revision 3094)
@@ -2,7 +2,7 @@
 .TH DUMPYKOTA "1" "novembre 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-dumpykota \- page de manuel de dumpykota 1.25alpha16_unofficial
+dumpykota \- page de manuel de dumpykota 1.25alpha18_unofficial
 .SH DESCRIPTION
-dumpykota v1.25alpha16_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+dumpykota v1.25alpha18_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 Dumps PyKota database's content.
@@ -86,4 +86,7 @@
 Client's hostname
 .TP
+jobid
+Job's Id
+.TP
 billingcode
 Job's billing code
@@ -94,4 +97,22 @@
 end
 Job's date of printing
+.IP
+Dates formatting with 'start' and 'end' filter keys :
+.IP
+YYYY : year boundaries
+YYYYMM : month boundaries
+YYYYMMDD : day boundaries
+YYYYMMDDhh : hour boundaries
+YYYYMMDDhhmm : minute boundaries
+YYYYMMDDhhmmss : second boundaries
+yesterday[+\-NbDays] : yesterday more or less N days (e.g. : yesterday\-15)
+today[+\-NbDays] : today more or less N days (e.g. : today\-15)
+tomorrow[+\-NbDays] : tomorrow more or less N days (e.g. : tomorrow\-15)
+now[+\-NbDays] : now more or less N days (e.g. now\-15)
+.IP
+\&'now' and 'today' are not exactly the same since today represents the first
+or last second of the day depending on if it's used in a start= or end=
+date expression. The utility to be able to specify dates in the future is
+a question which remains to be answered :\-)
 .IP
 Contrary to other PyKota management tools, wildcard characters are not
Index: pykota/trunk/man/el_GR/pkrefund.1
===================================================================
--- pykota/trunk/man/el_GR/pkrefund.1 (revision 3069)
+++ pykota/trunk/man/el_GR/pkrefund.1 (revision 3094)
@@ -2,7 +2,7 @@
 .TH PKREFUND "1" "novembre 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkrefund \- page de manuel de pkrefund 1.25alpha16_unofficial
+pkrefund \- page de manuel de pkrefund 1.25alpha18_unofficial
 .SH DESCRIPTION
-pkrefund v1.25alpha16_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+pkrefund v1.25alpha18_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 Refunds jobs.
@@ -25,4 +25,29 @@
 \fB\-r\fR | \fB\-\-reason\fR txt
 Sets textual information to explain the refunding.
+.TP
+\fB\-l\fR | \fB\-\-logo\fR img
+Use the image as the receipt's logo. The logo will
+be drawn at the center top of the page. The default
+logo is /usr/share/pykota/logos/pykota.jpeg
+.TP
+\fB\-p\fR | \fB\-\-pagesize\fR sz
+Sets sz as the page size. Most well known
+page sizes are recognized, like 'A4' or 'Letter'
+to name a few. The default size is A4.
+.TP
+\fB\-n\fR | \fB\-\-number\fR N
+Sets the number of the first receipt. This number
+will automatically be incremented for each receipt.
+.TP
+\fB\-o\fR | \fB\-\-output\fR f.pdf
+Defines the name of the PDF file which will contain
+the receipts. If not set, then no PDF file will
+be created. If set to '\-', then \fB\-\-force\fR is assumed,
+and the PDF document is sent to standard output.
+.TP
+\fB\-u\fR | \fB\-\-unit\fR u
+Defines the name of the unit to use on the receipts.
+The default unit is 'Credits', optionally translated
+to your native language if it is supported by PyKota.
 .IP
 Use the filter expressions to extract only parts of the
@@ -77,9 +102,11 @@
 Examples :
 .IP
-\f(CW$ pkrefund jobid=503\fR
+\f(CW$ pkrefund --output /tmp/receipts.pdf jobid=503\fR
 .IP
 This will refund all jobs which Id is 503. BEWARE : installing CUPS
-afresh will reset the first job id at 1. So you probably want to use
-a more precise filter as explained below
+afresh will reset the first job id at 1, so you probably want to use
+a more precise filter as explained below. A confirmation will
+be asked for each job to refund, and a PDF file named /tmp/receipts.pdf
+will be created which will contain printable receipts.
 .IP
 \f(CW$ pkrefund --reason "Hardware problem" jobid=503 start=today-7\fR
Index: pykota/trunk/man/zh_TW/pkinvoice.1
===================================================================
--- pykota/trunk/man/zh_TW/pkinvoice.1 (revision 3069)
+++ pykota/trunk/man/zh_TW/pkinvoice.1 (revision 3094)
@@ -2,7 +2,7 @@
 .TH PKINVOICE "1" "novembre 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkinvoice \- page de manuel de pkinvoice 1.25alpha16_unofficial
+pkinvoice \- page de manuel de pkinvoice 1.25alpha18_unofficial
 .SH DESCRIPTION
-pkinvoice v1.25alpha16_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+pkinvoice v1.25alpha18_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 An invoice generator for PyKota.
@@ -10,5 +10,5 @@
 command line usage :
 .IP
-pkinvoice [options] user1 user2 ... userN
+pkinvoice [options] [filterexpr]
 .PP
 options :
@@ -49,15 +49,34 @@
 exposed. The default is 0.0, meaning no VAT
 information will be included.
+.IP
+Use the filter expressions to extract only parts of the
+datas. Allowed filters are of the form :
+.IP
+key=value
+.IP
+Allowed keys for now are :
 .TP
-\fB\-s\fR | \fB\-\-start\fR date
-Sets the starting date for the print jobs invoiced.
+username
+User's name
 .TP
-\fB\-e\fR | \fB\-\-end\fR date
-Sets the ending date for the print jobs invoiced.
+printername
+Printer's name
+.TP
+hostname
+Client's hostname
+.TP
+jobid
+Job's Id
+.TP
+billingcode
+Job's billing code
+.TP
+start
+Job's date of printing
+.TP
+end
+Job's date of printing
 .IP
-user1 through userN can use wildcards if needed. If no user argument is
-used, a wildcard of '*' is assumed, meaning include all users.
-.IP
-Dates formatting with \fB\-\-start\fR and \fB\-\-end\fR :
+Dates formatting with 'start' and 'end' filter keys :
 .IP
 YYYY : year boundaries
@@ -76,8 +95,11 @@
 date expression. The utility to be able to specify dates in the future is
 a question which remains to be answered :\-)
+.IP
+Contrary to other PyKota management tools, wildcard characters are not
+expanded, so you can't use them.
 .PP
 examples :
 .IP
-\f(CW$ pkinvoice --unit EURO --output invoices.pdf --start=now-30\fR
+\f(CW$ pkinvoice --unit EURO --output /tmp/invoices.pdf start=now-30\fR
 .IP
 Will generate a PDF document containing invoices for all users
Index: pykota/trunk/man/zh_TW/dumpykota.1
===================================================================
--- pykota/trunk/man/zh_TW/dumpykota.1 (revision 3065)
+++ pykota/trunk/man/zh_TW/dumpykota.1 (revision 3094)
@@ -2,7 +2,7 @@
 .TH DUMPYKOTA "1" "novembre 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-dumpykota \- page de manuel de dumpykota 1.25alpha16_unofficial
+dumpykota \- page de manuel de dumpykota 1.25alpha18_unofficial
 .SH DESCRIPTION
-dumpykota v1.25alpha16_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+dumpykota v1.25alpha18_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 Dumps PyKota database's content.
@@ -86,4 +86,7 @@
 Client's hostname
 .TP
+jobid
+Job's Id
+.TP
 billingcode
 Job's billing code
@@ -94,4 +97,22 @@
 end
 Job's date of printing
+.IP
+Dates formatting with 'start' and 'end' filter keys :
+.IP
+YYYY : year boundaries
+YYYYMM : month boundaries
+YYYYMMDD : day boundaries
+YYYYMMDDhh : hour boundaries
+YYYYMMDDhhmm : minute boundaries
+YYYYMMDDhhmmss : second boundaries
+yesterday[+\-NbDays] : yesterday more or less N days (e.g. : yesterday\-15)
+today[+\-NbDays] : today more or less N days (e.g. : today\-15)
+tomorrow[+\-NbDays] : tomorrow more or less N days (e.g. : tomorrow\-15)
+now[+\-NbDays] : now more or less N days (e.g. now\-15)
+.IP
+\&'now' and 'today' are not exactly the same since today represents the first
+or last second of the day depending on if it's used in a start= or end=
+date expression. The utility to be able to specify dates in the future is
+a question which remains to be answered :\-)
 .IP
 Contrary to other PyKota management tools, wildcard characters are not
Index: pykota/trunk/man/zh_TW/pkrefund.1
===================================================================
--- pykota/trunk/man/zh_TW/pkrefund.1 (revision 3069)
+++ pykota/trunk/man/zh_TW/pkrefund.1 (revision 3094)
@@ -2,7 +2,7 @@
 .TH PKREFUND "1" "novembre 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkrefund \- page de manuel de pkrefund 1.25alpha16_unofficial
+pkrefund \- page de manuel de pkrefund 1.25alpha18_unofficial
 .SH DESCRIPTION
-pkrefund v1.25alpha16_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+pkrefund v1.25alpha18_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 Refunds jobs.
@@ -25,4 +25,29 @@
 \fB\-r\fR | \fB\-\-reason\fR txt
 Sets textual information to explain the refunding.
+.TP
+\fB\-l\fR | \fB\-\-logo\fR img
+Use the image as the receipt's logo. The logo will
+be drawn at the center top of the page. The default
+logo is /usr/share/pykota/logos/pykota.jpeg
+.TP
+\fB\-p\fR | \fB\-\-pagesize\fR sz
+Sets sz as the page size. Most well known
+page sizes are recognized, like 'A4' or 'Letter'
+to name a few. The default size is A4.
+.TP
+\fB\-n\fR | \fB\-\-number\fR N
+Sets the number of the first receipt. This number
+will automatically be incremented for each receipt.
+.TP
+\fB\-o\fR | \fB\-\-output\fR f.pdf
+Defines the name of the PDF file which will contain
+the receipts. If not set, then no PDF file will
+be created. If set to '\-', then \fB\-\-force\fR is assumed,
+and the PDF document is sent to standard output.
+.TP
+\fB\-u\fR | \fB\-\-unit\fR u
+Defines the name of the unit to use on the receipts.
+The default unit is 'Credits', optionally translated
+to your native language if it is supported by PyKota.
 .IP
 Use the filter expressions to extract only parts of the
@@ -77,9 +102,11 @@
 Examples :
 .IP
-\f(CW$ pkrefund jobid=503\fR
+\f(CW$ pkrefund --output /tmp/receipts.pdf jobid=503\fR
 .IP
 This will refund all jobs which Id is 503. BEWARE : installing CUPS
-afresh will reset the first job id at 1. So you probably want to use
-a more precise filter as explained below
+afresh will reset the first job id at 1, so you probably want to use
+a more precise filter as explained below. A confirmation will
+be asked for each job to refund, and a PDF file named /tmp/receipts.pdf
+will be created which will contain printable receipts.
 .IP
 \f(CW$ pkrefund --reason "Hardware problem" jobid=503 start=today-7\fR
Index: pykota/trunk/man/es/pkinvoice.1
===================================================================
--- pykota/trunk/man/es/pkinvoice.1 (revision 3069)
+++ pykota/trunk/man/es/pkinvoice.1 (revision 3094)
@@ -2,7 +2,7 @@
 .TH PKINVOICE "1" "novembre 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkinvoice \- page de manuel de pkinvoice 1.25alpha16_unofficial
+pkinvoice \- page de manuel de pkinvoice 1.25alpha18_unofficial
 .SH DESCRIPTION
-pkinvoice v1.25alpha16_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+pkinvoice v1.25alpha18_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 An invoice generator for PyKota.
@@ -10,5 +10,5 @@
 command line usage :
 .IP
-pkinvoice [options] user1 user2 ... userN
+pkinvoice [options] [filterexpr]
 .PP
 options :
@@ -49,15 +49,34 @@
 exposed. The default is 0.0, meaning no VAT
 information will be included.
+.IP
+Use the filter expressions to extract only parts of the
+datas. Allowed filters are of the form :
+.IP
+key=value
+.IP
+Allowed keys for now are :
 .TP
-\fB\-s\fR | \fB\-\-start\fR date
-Sets the starting date for the print jobs invoiced.
+username
+User's name
 .TP
-\fB\-e\fR | \fB\-\-end\fR date
-Sets the ending date for the print jobs invoiced.
+printername
+Printer's name
+.TP
+hostname
+Client's hostname
+.TP
+jobid
+Job's Id
+.TP
+billingcode
+Job's billing code
+.TP
+start
+Job's date of printing
+.TP
+end
+Job's date of printing
 .IP
-user1 through userN can use wildcards if needed. If no user argument is
-used, a wildcard of '*' is assumed, meaning include all users.
-.IP
-Dates formatting with \fB\-\-start\fR and \fB\-\-end\fR :
+Dates formatting with 'start' and 'end' filter keys :
 .IP
 YYYY : year boundaries
@@ -76,8 +95,11 @@
 date expression. The utility to be able to specify dates in the future is
 a question which remains to be answered :\-)
+.IP
+Contrary to other PyKota management tools, wildcard characters are not
+expanded, so you can't use them.
 .PP
 examples :
 .IP
-\f(CW$ pkinvoice --unit EURO --output invoices.pdf --start=now-30\fR
+\f(CW$ pkinvoice --unit EURO --output /tmp/invoices.pdf start=now-30\fR
 .IP
 Will generate a PDF document containing invoices for all users
Index: pykota/trunk/man/es/dumpykota.1
===================================================================
--- pykota/trunk/man/es/dumpykota.1 (revision 3065)
+++ pykota/trunk/man/es/dumpykota.1 (revision 3094)
@@ -2,7 +2,7 @@
 .TH DUMPYKOTA "1" "novembre 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-dumpykota \- page de manuel de dumpykota 1.25alpha16_unofficial
+dumpykota \- page de manuel de dumpykota 1.25alpha18_unofficial
 .SH DESCRIPTION
-dumpykota v1.25alpha16_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+dumpykota v1.25alpha18_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 Dumps PyKota database's content.
@@ -86,4 +86,7 @@
 Client's hostname
 .TP
+jobid
+Job's Id
+.TP
 billingcode
 Job's billing code
@@ -94,4 +97,22 @@
 end
 Job's date of printing
+.IP
+Dates formatting with 'start' and 'end' filter keys :
+.IP
+YYYY : year boundaries
+YYYYMM : month boundaries
+YYYYMMDD : day boundaries
+YYYYMMDDhh : hour boundaries
+YYYYMMDDhhmm : minute boundaries
+YYYYMMDDhhmmss : second boundaries
+yesterday[+\-NbDays] : yesterday more or less N days (e.g. : yesterday\-15)
+today[+\-NbDays] : today more or less N days (e.g. : today\-15)
+tomorrow[+\-NbDays] : tomorrow more or less N days (e.g. : tomorrow\-15)
+now[+\-NbDays] : now more or less N days (e.g. now\-15)
+.IP
+\&'now' and 'today' are not exactly the same since today represents the first
+or last second of the day depending on if it's used in a start= or end=
+date expression. The utility to be able to specify dates in the future is
+a question which remains to be answered :\-)
 .IP
 Contrary to other PyKota management tools, wildcard characters are not
Index: pykota/trunk/man/es/pkrefund.1
===================================================================
--- pykota/trunk/man/es/pkrefund.1 (revision 3069)
+++ pykota/trunk/man/es/pkrefund.1 (revision 3094)
@@ -2,7 +2,7 @@
 .TH PKREFUND "1" "novembre 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkrefund \- page de manuel de pkrefund 1.25alpha16_unofficial
+pkrefund \- page de manuel de pkrefund 1.25alpha18_unofficial
 .SH DESCRIPTION
-pkrefund v1.25alpha16_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+pkrefund v1.25alpha18_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 Refunds jobs.
@@ -25,4 +25,29 @@
 \fB\-r\fR | \fB\-\-reason\fR txt
 Sets textual information to explain the refunding.
+.TP
+\fB\-l\fR | \fB\-\-logo\fR img
+Use the image as the receipt's logo. The logo will
+be drawn at the center top of the page. The default
+logo is /usr/share/pykota/logos/pykota.jpeg
+.TP
+\fB\-p\fR | \fB\-\-pagesize\fR sz
+Sets sz as the page size. Most well known
+page sizes are recognized, like 'A4' or 'Letter'
+to name a few. The default size is A4.
+.TP
+\fB\-n\fR | \fB\-\-number\fR N
+Sets the number of the first receipt. This number
+will automatically be incremented for each receipt.
+.TP
+\fB\-o\fR | \fB\-\-output\fR f.pdf
+Defines the name of the PDF file which will contain
+the receipts. If not set, then no PDF file will
+be created. If set to '\-', then \fB\-\-force\fR is assumed,
+and the PDF document is sent to standard output.
+.TP
+\fB\-u\fR | \fB\-\-unit\fR u
+Defines the name of the unit to use on the receipts.
+The default unit is 'Credits', optionally translated
+to your native language if it is supported by PyKota.
 .IP
 Use the filter expressions to extract only parts of the
@@ -77,9 +102,11 @@
 Examples :
 .IP
-\f(CW$ pkrefund jobid=503\fR
+\f(CW$ pkrefund --output /tmp/receipts.pdf jobid=503\fR
 .IP
 This will refund all jobs which Id is 503. BEWARE : installing CUPS
-afresh will reset the first job id at 1. So you probably want to use
-a more precise filter as explained below
+afresh will reset the first job id at 1, so you probably want to use
+a more precise filter as explained below. A confirmation will
+be asked for each job to refund, and a PDF file named /tmp/receipts.pdf
+will be created which will contain printable receipts.
 .IP
 \f(CW$ pkrefund --reason "Hardware problem" jobid=503 start=today-7\fR
Index: pykota/trunk/man/dumpykota.1
===================================================================
--- pykota/trunk/man/dumpykota.1 (revision 3065)
+++ pykota/trunk/man/dumpykota.1 (revision 3094)
@@ -2,7 +2,7 @@
 .TH DUMPYKOTA "1" "November 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NAME
-dumpykota \- manual page for dumpykota 1.25alpha16_unofficial
+dumpykota \- manual page for dumpykota 1.25alpha18_unofficial
 .SH DESCRIPTION
-dumpykota v1.25alpha16_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+dumpykota v1.25alpha18_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 Dumps PyKota database's content.
@@ -86,4 +86,7 @@
 Client's hostname
 .TP
+jobid
+Job's Id
+.TP
 billingcode
 Job's billing code
@@ -94,4 +97,22 @@
 end
 Job's date of printing
+.IP
+Dates formatting with 'start' and 'end' filter keys :
+.IP
+YYYY : year boundaries
+YYYYMM : month boundaries
+YYYYMMDD : day boundaries
+YYYYMMDDhh : hour boundaries
+YYYYMMDDhhmm : minute boundaries
+YYYYMMDDhhmmss : second boundaries
+yesterday[+\-NbDays] : yesterday more or less N days (e.g. : yesterday\-15)
+today[+\-NbDays] : today more or less N days (e.g. : today\-15)
+tomorrow[+\-NbDays] : tomorrow more or less N days (e.g. : tomorrow\-15)
+now[+\-NbDays] : now more or less N days (e.g. now\-15)
+.IP
+\&'now' and 'today' are not exactly the same since today represents the first
+or last second of the day depending on if it's used in a start= or end=
+date expression. The utility to be able to specify dates in the future is
+a question which remains to be answered :\-)
 .IP
 Contrary to other PyKota management tools, wildcard characters are not
Index: pykota/trunk/man/it/pkinvoice.1
===================================================================
--- pykota/trunk/man/it/pkinvoice.1 (revision 3069)
+++ pykota/trunk/man/it/pkinvoice.1 (revision 3094)
@@ -2,7 +2,7 @@
 .TH PKINVOICE "1" "novembre 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkinvoice \- page de manuel de pkinvoice 1.25alpha16_unofficial
+pkinvoice \- page de manuel de pkinvoice 1.25alpha18_unofficial
 .SH DESCRIPTION
-pkinvoice v1.25alpha16_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+pkinvoice v1.25alpha18_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 An invoice generator for PyKota.
@@ -10,5 +10,5 @@
 command line usage :
 .IP
-pkinvoice [options] user1 user2 ... userN
+pkinvoice [options] [filterexpr]
 .PP
 options :
@@ -49,15 +49,34 @@
 exposed. The default is 0.0, meaning no VAT
 information will be included.
+.IP
+Use the filter expressions to extract only parts of the
+datas. Allowed filters are of the form :
+.IP
+key=value
+.IP
+Allowed keys for now are :
 .TP
-\fB\-s\fR | \fB\-\-start\fR date
-Sets the starting date for the print jobs invoiced.
+username
+User's name
 .TP
-\fB\-e\fR | \fB\-\-end\fR date
-Sets the ending date for the print jobs invoiced.
+printername
+Printer's name
+.TP
+hostname
+Client's hostname
+.TP
+jobid
+Job's Id
+.TP
+billingcode
+Job's billing code
+.TP
+start
+Job's date of printing
+.TP
+end
+Job's date of printing
 .IP
-user1 through userN can use wildcards if needed. If no user argument is
-used, a wildcard of '*' is assumed, meaning include all users.
-.IP
-Dates formatting with \fB\-\-start\fR and \fB\-\-end\fR :
+Dates formatting with 'start' and 'end' filter keys :
 .IP
 YYYY : year boundaries
@@ -76,8 +95,11 @@
 date expression. The utility to be able to specify dates in the future is
 a question which remains to be answered :\-)
+.IP
+Contrary to other PyKota management tools, wildcard characters are not
+expanded, so you can't use them.
 .PP
 examples :
 .IP
-\f(CW$ pkinvoice --unit EURO --output invoices.pdf --start=now-30\fR
+\f(CW$ pkinvoice --unit EURO --output /tmp/invoices.pdf start=now-30\fR
 .IP
 Will generate a PDF document containing invoices for all users
Index: pykota/trunk/man/it/dumpykota.1
===================================================================
--- pykota/trunk/man/it/dumpykota.1 (revision 3065)
+++ pykota/trunk/man/it/dumpykota.1 (revision 3094)
@@ -2,7 +2,7 @@
 .TH DUMPYKOTA "1" "novembre 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-dumpykota \- page de manuel de dumpykota 1.25alpha16_unofficial
+dumpykota \- page de manuel de dumpykota 1.25alpha18_unofficial
 .SH DESCRIPTION
-dumpykota v1.25alpha16_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+dumpykota v1.25alpha18_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 Dumps PyKota database's content.
@@ -86,4 +86,7 @@
 Client's hostname
 .TP
+jobid
+Job's Id
+.TP
 billingcode
 Job's billing code
@@ -94,4 +97,22 @@
 end
 Job's date of printing
+.IP
+Dates formatting with 'start' and 'end' filter keys :
+.IP
+YYYY : year boundaries
+YYYYMM : month boundaries
+YYYYMMDD : day boundaries
+YYYYMMDDhh : hour boundaries
+YYYYMMDDhhmm : minute boundaries
+YYYYMMDDhhmmss : second boundaries
+yesterday[+\-NbDays] : yesterday more or less N days (e.g. : yesterday\-15)
+today[+\-NbDays] : today more or less N days (e.g. : today\-15)
+tomorrow[+\-NbDays] : tomorrow more or less N days (e.g. : tomorrow\-15)
+now[+\-NbDays] : now more or less N days (e.g. now\-15)
+.IP
+\&'now' and 'today' are not exactly the same since today represents the first
+or last second of the day depending on if it's used in a start= or end=
+date expression. The utility to be able to specify dates in the future is
+a question which remains to be answered :\-)
 .IP
 Contrary to other PyKota management tools, wildcard characters are not
Index: pykota/trunk/man/it/pkrefund.1
===================================================================
--- pykota/trunk/man/it/pkrefund.1 (revision 3069)
+++ pykota/trunk/man/it/pkrefund.1 (revision 3094)
@@ -2,7 +2,7 @@
 .TH PKREFUND "1" "novembre 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NOM
-pkrefund \- page de manuel de pkrefund 1.25alpha16_unofficial
+pkrefund \- page de manuel de pkrefund 1.25alpha18_unofficial
 .SH DESCRIPTION
-pkrefund v1.25alpha16_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+pkrefund v1.25alpha18_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 Refunds jobs.
@@ -25,4 +25,29 @@
 \fB\-r\fR | \fB\-\-reason\fR txt
 Sets textual information to explain the refunding.
+.TP
+\fB\-l\fR | \fB\-\-logo\fR img
+Use the image as the receipt's logo. The logo will
+be drawn at the center top of the page. The default
+logo is /usr/share/pykota/logos/pykota.jpeg
+.TP
+\fB\-p\fR | \fB\-\-pagesize\fR sz
+Sets sz as the page size. Most well known
+page sizes are recognized, like 'A4' or 'Letter'
+to name a few. The default size is A4.
+.TP
+\fB\-n\fR | \fB\-\-number\fR N
+Sets the number of the first receipt. This number
+will automatically be incremented for each receipt.
+.TP
+\fB\-o\fR | \fB\-\-output\fR f.pdf
+Defines the name of the PDF file which will contain
+the receipts. If not set, then no PDF file will
+be created. If set to '\-', then \fB\-\-force\fR is assumed,
+and the PDF document is sent to standard output.
+.TP
+\fB\-u\fR | \fB\-\-unit\fR u
+Defines the name of the unit to use on the receipts.
+The default unit is 'Credits', optionally translated
+to your native language if it is supported by PyKota.
 .IP
 Use the filter expressions to extract only parts of the
@@ -77,9 +102,11 @@
 Examples :
 .IP
-\f(CW$ pkrefund jobid=503\fR
+\f(CW$ pkrefund --output /tmp/receipts.pdf jobid=503\fR
 .IP
 This will refund all jobs which Id is 503. BEWARE : installing CUPS
-afresh will reset the first job id at 1. So you probably want to use
-a more precise filter as explained below
+afresh will reset the first job id at 1, so you probably want to use
+a more precise filter as explained below. A confirmation will
+be asked for each job to refund, and a PDF file named /tmp/receipts.pdf
+will be created which will contain printable receipts.
 .IP
 \f(CW$ pkrefund --reason "Hardware problem" jobid=503 start=today-7\fR
Index: pykota/trunk/man/pkrefund.1
===================================================================
--- pykota/trunk/man/pkrefund.1 (revision 3069)
+++ pykota/trunk/man/pkrefund.1 (revision 3094)
@@ -2,7 +2,7 @@
 .TH PKREFUND "1" "November 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NAME
-pkrefund \- manual page for pkrefund 1.25alpha16_unofficial
+pkrefund \- manual page for pkrefund 1.25alpha18_unofficial
 .SH DESCRIPTION
-pkrefund v1.25alpha16_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
+pkrefund v1.25alpha18_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com
 .PP
 Refunds jobs.
@@ -25,4 +25,29 @@
 \fB\-r\fR | \fB\-\-reason\fR txt
 Sets textual information to explain the refunding.
+.TP
+\fB\-l\fR | \fB\-\-logo\fR img
+Use the image as the receipt's logo. The logo will
+be drawn at the center top of the page. The default
+logo is /usr/share/pykota/logos/pykota.jpeg
+.TP
+\fB\-p\fR | \fB\-\-pagesize\fR sz
+Sets sz as the page size. Most well known
+page sizes are recognized, like 'A4' or 'Letter'
+to name a few. The default size is A4.
+.TP
+\fB\-n\fR | \fB\-\-number\fR N
+Sets the number of the first receipt. This number
+will automatically be incremented for each receipt.
+.TP
+\fB\-o\fR | \fB\-\-output\fR f.pdf
+Defines the name of the PDF file which will contain
+the receipts. If not set, then no PDF file will
+be created. If set to '\-', then \fB\-\-force\fR is assumed,
+and the PDF document is sent to standard output.
+.TP
+\fB\-u\fR | \fB\-\-unit\fR u
+Defines the name of the unit to use on the receipts.
+The default unit is 'Credits', optionally translated
+to your native language if it is supported by PyKota.
 .IP
 Use the filter expressions to extract only parts of the
@@ -77,9 +102,11 @@
 Examples :
 .IP
-\f(CW$ pkrefund jobid=503\fR
+\f(CW$ pkrefund --output /tmp/receipts.pdf jobid=503\fR
 .IP
 This will refund all jobs which Id is 503. BEWARE : installing CUPS
-afresh will reset the first job id at 1. So you probably want to use
-a more precise filter as explained below
+afresh will reset the first job id at 1, so you probably want to use
+a more precise filter as explained below. A confirmation will
+be asked for each job to refund, and a PDF file named /tmp/receipts.pdf
+will be created which will contain printable receipts.
 .IP
 \f(CW$ pkrefund --reason "Hardware problem" jobid=503 start=today-7\fR
Index: pykota/trunk/po/fr/pykota.po
===================================================================
--- pykota/trunk/po/fr/pykota.po (revision 3092)
+++ pykota/trunk/po/fr/pykota.po (revision 3094)
@@ -2491,4 +2491,24 @@
 "         end            Job's date of printing\n"
 "         \n"
+"  Dates formatting with 'start' and 'end' filter keys :\n"
+"  \n"
+"    YYYY : year boundaries\n"
+"    YYYYMM : month boundaries\n"
+"    YYYYMMDD : day boundaries\n"
+"    YYYYMMDDhh : hour boundaries\n"
+"    YYYYMMDDhhmm : minute boundaries\n"
+"    YYYYMMDDhhmmss : second boundaries\n"
+"    yesterday[+-NbDays] : yesterday more or less N days (e.g. : yesterday-"
+"15)\n"
+"    today[+-NbDays] : today more or less N days (e.g. : today-15)\n"
+"    tomorrow[+-NbDays] : tomorrow more or less N days (e.g. : tomorrow-15)\n"
+"    now[+-NbDays] : now more or less N days (e.g. now-15)\n"
+"\n"
+"  'now' and 'today' are not exactly the same since today represents the "
+"first\n"
+"  or last second of the day depending on if it's used in a start= or end=\n"
+"  date expression. The utility to be able to specify dates in the future is\n"
+"  a question which remains to be answered :-)\n"
+"  \n"
 "  Contrary to other PyKota management tools, wildcard characters are not \n"
 "  expanded, so you can't use them.\n"
@@ -2595,4 +2615,23 @@
 "         end            Date du travail d'impression\n"
 "         \n"
+"  Formatage des dates avec les cl�'start' et 'end' :\n"
+"  \n"
+"    AAAA : limites d'ann�n"
+"    AAAAMM : limites de mois\n"
+"    AAAAMMJJ : limites de jour\n"
+"    AAAAMMJJhh : limites d'heures\n"
+"    AAAAMMJJhhmm : limites de minutes\n"
+"    AAAAMMJJhhmmss : limites de secondes\n"
+"    yesterday[+-NbJours] : hier plus ou moins N jours (ex : yesterday-15)\n"
+"    today[+-NbJours] : aujoud'hui plus ou moins N jours (ex : today-15)\n"
+"    tomorrow[+-NbJours] : demain plus ou moins N jours (ex : tomorrow-15)\n"
+"    now[+-NbJours] : maintenant plus ou moins N jours (ex : now-15)\n"
+"\n"
+"  'now' et 'today' ne sont pas exactement identiques car today repr�nte\n"
+"  la premi� ou la derni� seconde du jour selon qu'il soit utilis�vec\n"
+"  une expression de type start= ou end=.\n"
+"  L'utilit�e pouvoir sp�fier une date dans le future est une question\n"
+"  qui reste ouverte :-)\n"
+"\n"
 "  Contrairement aux autres outils d'administration de PyKota, les "
 "caract�s\n"
Index: pykota/trunk/po/pykota.pot
===================================================================
--- pykota/trunk/po/pykota.pot (revision 3092)
+++ pykota/trunk/po/pykota.pot (revision 3094)
@@ -1562,4 +1562,22 @@
 "         end            Job's date of printing\n"
 "         \n"
+"  Dates formatting with 'start' and 'end' filter keys :\n"
+"  \n"
+"    YYYY : year boundaries\n"
+"    YYYYMM : month boundaries\n"
+"    YYYYMMDD : day boundaries\n"
+"    YYYYMMDDhh : hour boundaries\n"
+"    YYYYMMDDhhmm : minute boundaries\n"
+"    YYYYMMDDhhmmss : second boundaries\n"
+"    yesterday[+-NbDays] : yesterday more or less N days (e.g. : yesterday-15)\n"
+"    today[+-NbDays] : today more or less N days (e.g. : today-15)\n"
+"    tomorrow[+-NbDays] : tomorrow more or less N days (e.g. : tomorrow-15)\n"
+"    now[+-NbDays] : now more or less N days (e.g. now-15)\n"
+"\n"
+"  'now' and 'today' are not exactly the same since today represents the first\n"
+"  or last second of the day depending on if it's used in a start= or end=\n"
+"  date expression. The utility to be able to specify dates in the future is\n"
+"  a question which remains to be answered :-)\n"
+"  \n"
 "  Contrary to other PyKota management tools, wildcard characters are not \n"
 "  expanded, so you can't use them.\n"
