Merge lp:~openerp-dev/openobject-addons/trunk-account_check_writing_jam into lp:openobject-addons

[qdp (OpenERP)]

[Dave Burkholder (akxws32zf-dave-j0p9h616h)]

This is an excellent module according to the tests that I've done and I'm very eager for it to be merged into trunk. I want to wait till it's officially merged before deploying it in my company workflow. How much longer will the merge take?

Thanks!

review: Approve

[Ray Carnes (rcarnes)]

I am offering to do any further testing to speed this up - we have several clients on their way through 7.0 migration that will be looking for this module.

Ray.

[alex kwak (cinnamongg)]

I ran this on runbot to test this module. It was successful and it worked it out. Thank you so much for fitting our needs just right. I think it should be merged soon.
Thanks,

Alex

review: Approve

[Dave Burkholder (akxws32zf-dave-j0p9h616h)]

Is there an ETA on this module? Back in 12/29/12 Fabrice mentioned this module on stackoverflow, saying they hoped to merge into core soon. 8 months is not soon. Is there any way I could sponsor this project to speed it up?

http://stackoverflow.com/questions/14076413/how-can-the-check-printing-report-be-modified-to-include-a-suppliers-invoice-nu

[Brendan Clune (Logic Supply) (brendan-clune)]

We have been running this module backported to 7.0 with minimal issues. It would be nice to see it hit trunk, though, just to keep code workflows a bit cleaner.

review: Approve

[lp:~openerp-dev/openobject-addons/trunk-account_check_writing_jam]

8341. By Jigar A. on 2013-08-23

[MERGE] Sync with trunk

8342. By Jigar A. on 2013-08-26

[FIX] Commnets and Removed not needed field

8343. By Jigar A. on 2013-08-26

[Merge] lp:openobject-addons

8344. By Jigar A. on 2013-08-26

[FIX] Check_Writing: Replaced the Module image to right folder.
Renamed the Report and Report Titles Names

8345. By Jigar A. on 2013-08-26

[FIX] impoved the multui currecy options payment view section

8346. By Jigar A. on 2013-08-26

[FIX] View Imp

8347. By Jigar A. on 2013-08-29

[FIX] account_check_writing: Improved the Config File MOdule Help text

8348. By Jigar A. on 2013-08-29

[MERGE] lp:openobject-addons

8349. By Jigar A. on 2013-08-29

[IMP] account_check_writing: - added the demo record for the check.
- added the yaml test cases to vlidate, assign check number using batch print wizard, and print top, middle and top report

8350. By Jigar A. on 2013-09-06

 merge lp:openobject-addons

8351. By Jigar A. on 2013-09-06

[MERGE] lp:~openerp-dev/openobject-addons/trunk-account_check_writing_jam-improvement-sgo

8352. By Jigar A. on 2013-09-10

[FIX] Added the Demo yaml file and impoved the rest demo records

8353. By Jigar A. on 2013-09-10

[REF] refectored the action names and fucntion call ref

8354. By Jigar A. on 2013-09-10

[MERGE] lp:openobject-addons

8355. By Jigar A. on 2013-09-10

[FIX] Impoved the print report code and vie of the batch print wizards

8356. By Jigar A. on 2013-09-10

[FIX] Added the translate fucntions

8357. By Jigar A. on 2013-09-11

[IMP] Impoved The OE Copyright License text as suggested

8358. By Jigar A. on 2013-09-11

[MERGE] lp:openobject-addons

8359. By Jigar A. on 2013-09-13

[merge] lp:openobject-addons

8360. By Jigar A. on 2013-09-13

[MERGE] lp:openobject-addons

8361. By Jigar A. on 2013-09-13

[MERGE] account_check_writing: Creating the Check Journal on installing COA
lp:~openerp-dev/openobject-addons/trunk-account_check_writing_jam-config-journal-sgo

8362. By Jigar A. on 2013-09-16

[FIX] Setting the back account for the check

8363. By Jigar A. on 2013-09-16

[FIX]context check fix

8364. By Jigar A. on 2013-09-16

[MERGE] lp:openobject-addons

8365. By Jigar A. on 2013-09-17

[FIX] Set allow_check_writing for bank type journal to enable bank journal to enable to be used as check payment

8366. By Jigar A. on 2013-09-17

[MERGE] lp:openobject-addons

8367. By Jigar A. on 2013-09-18

[IMP] Added the help tooltip for Payment Method on Check

8368. By Jigar A. on 2013-09-18

[MERGE] lp:openobject-addons

8369. By Jigar A. on 2013-09-18

[FIX] removed no needed old code for journal creation

8370. By Jigar A. on 2013-09-19

[MERGE] If journal type is bank when installed account_check_writing set allow_check_writing as true. and if type is equal to bank allow_check_writing set as true on onchange of type.
lp:~openerp-dev/openobject-addons/trunk-account_check_writing_jam-journal-fix-sgo

8371. By Jigar A. on 2013-09-19

[MERGE] lp:openobject-addons

8372. By Jigar A. on 2013-09-20

[TYPO] fixed the tooptip typo

8373. By Jigar A. on 2013-09-20

[MERGE] lp:openobject-addons

8374. By Jigar A. on 2013-09-23

[merge] lp:openobject-addons

8375. By Jigar A. on 2013-09-26

[merge] lp:openobject-addons

8376. By Thibault Delavallée (OpenERP) on 2013-10-09

[MERGE] Sync with addons-trunk

[Thibault Delavallée (OpenERP) (tde-openerp)]

Hello,

I have some remarks:

account_check_writing/__openerp__.py:
- why did you change the author, or at least removed NovaPoint ? By the way you did the same thing in another __opener__ file.

account_check_writing/account.py:
- group multiple imports from same module (from openerp.osv import osv, fields)
- tiny remark: from openerp import SUPERUSER_ID should be above from openerp.osv ... because of alphabetical order :)
- columns declaration: use line returns; 80 characters length is not a hard limit, but your lines are quite long; put the help at the next line
- 'implementation':'no_gap', -> space forgotten (use a linter)
- allow_check_writing = type == "bank" and True or False -> "and True or False" is not necessary, type == 'bank' already returns a boolean

account_check_writing/amount_to_text_en.py: I don't see the point with the whole file. Is the purpose do display '5 and 3/4' instead of '5 and 75 cents' ? Why ? If this is standard, please update the server file with comments, doc and explanations instead of re-defining everything twice for a custom addon. If this is not standard, maybe you should consider dropping this feature.

account_check_writing/account_voucher.py:
- _get_currency: no need to declare a variable user_pool that is used only once -> write a single statement
- columns :
-- check_number -> if this is the same columns as 'number', please add the 'oldname' argument to ease migration
- def get_lang(self, cr, uid, ids, context=None):
-- 1/ not sure this method is necessary and seems more like a hack than everything else; if it is necessary, please move it with other language-related methods, in tools
-- 2/ if you keep it, please avoid obfuscated code; just a language = context and context.get('lang', 'en')[0:2] seems sufficient
- def copy:
-- override default only if None, not if void
-- use update if you have multiple values to change; otherwise default[key] = value is sufficient
- def print_check: various indentation issues, please use a linter

account_check_writing/report/check_print.py
- general for this file: please add in comments the type and expected value of your various parameters; using dedicated methods for each part of the process is a good thing, but this requires some explanations of what you do and on which parameters yhou are working
- def _getchunk_line(self, defaults={}): I would put defaults=None as parameter to avoid issues with immutable dict

Best regards,

Thibault.

review: Needs Fixing ((technical))

[lp:~openerp-dev/openobject-addons/trunk-account_check_writing_jam]

8377. By Jigar A. on 2013-10-10

[IMP] account_checkl_writing: added the mutiple PEP std improvments suggest on MP technical review

8378. By Jigar A. on 2013-10-10

[MERGE] trunk sync

8379. By Jigar A. on 2013-10-10

[IMP] account_checkl_writing: added the mutiple PEP8 Standard improvments suggest on MP technical review

8380. By Jigar A. on 2013-10-10

[FIX] account_check_writing: column -> , this is the same columns as , added the 'oldname' argument to ease migration.

8381. By Jigar A. on 2013-10-10

[FIX] refector the code and added the docstring for function

8382. By Jigar A. on 2013-10-10

[FIX]Added the doc string for the file amount to text

8383. By Jigar A. on 2013-10-15

[MERGE] trunk sync

8384. By Jigar A. on 2013-10-15

[REVERT] reverted the Commit 8380 as numner anf check_number are not same field, both field has sigificent meaning and check_number is newly added field to preservethe check number while number is the lalgecy field from voucher object so store the voucher entry number.

8385. By Jigar A. on 2013-10-24

[MERGE] lp:openobject-addons

[Thibault Delavallée (OpenERP) (tde-openerp)]

Hello,

Some more remarks about the updated code.

account_voucher.py:
- lint remark: your imports should separate standard lib imports from openerp imports (and each category should be ordered), like
from lxml import etree
// intended void line
from openerp.addons.account_check_writing.amount_to_text_en import amount_to_text
from openerp.osv import osv, fields
- _make_journal docstring: seacrh -> search :)
- _get_currency: in account_voucher/account_voucher.py, it already returns self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id.id, the same line that you added in account_check_writing. Your override does not seem necessary to me.
- _get_amount_in_word:
-- do not lowerize currency.id.name; instead, in amount_to_text do a currency.upper() == 'USD' (I think uppercase is more standard)
-- the following code is not correct:
language = 'en'
if context.get('lang'):
    language = context.get('lang')[0:2]
it fails if context is not defined. Please add an "if context is None: context = {}" at the beginning of the function. You could also simplify the line using the 'get' default value: language = context.get('lang', 'en')[0:2]
- I think you could improve the columns name to ease readability / understandability:
-- rename allow_check to allow_check_writing, because it is a related field and having the same name ease the code readability
-- rename check_done into 'printed', not necessary to add a prefix, and if the column meaning is to tell that the check has been printed, then the variable name should be printed
-- minor remark: put 'journal_id' column definition above 'allow_check_writing' to have a consistent columns order
-- I saw you added and then removed check_number being a "new field" based on number, using oldname, as I asked you in the first review. Why? Has the number field any meaning when having account_check_writing installed ? Should'nt check_number be number; basically ? Do you have any use of the two fields at the same time ?
- onchange_amount:
-- same remark about language = context.get(...)
-- same remark about currency.name.lower()
- onchange_journal: shouldn't the reset of currency_id also be applied if vals is void ?
- fields_view_get: if context == None -> if context is None
- print_check:
-- same remark about if context and None
-- the management of ids is not clean.
--- you browse on ids[0]
--- in value, you add a protection about ids: for example 'id': ids and ids[0] or False
---> at the beginning of the method, if ids is void, return {}, the set check_id to ids[0] and use this variable through the whole method

account.py
- Why are you using SUPERUSER_ID when calling create_check_sequence? If you have some access rights issues, shouldn't they be solved by regular access rights ?

check_print.py
- N, STARS, LINEKEYS -> should be class variables with a trailing underscore, not global variables (call to N will therefore become self._N)
- if defaults == None -> if defaults is None
- You added docstrings, it is a good practice. However could you also tell the type of the variables ? For example, :param list lines: a list of my.object.lines to be added on the check to print

res_company.py
- ...

review: Needs Fixing (technical)

[lp:~openerp-dev/openobject-addons/trunk-account_check_writing_jam]

8386. By Jigar A. on 2013-11-19

[MERGE] trunk Sync

Unmerged revisions

8386. By Jigar A. on 2013-11-19

[MERGE] trunk Sync

8385. By Jigar A. on 2013-10-24

[MERGE] lp:openobject-addons

8384. By Jigar A. on 2013-10-15

[REVERT] reverted the Commit 8380 as numner anf check_number are not same field, both field has sigificent meaning and check_number is newly added field to preservethe check number while number is the lalgecy field from voucher object so store the voucher entry number.

8383. By Jigar A. on 2013-10-15

[MERGE] trunk sync

8382. By Jigar A. on 2013-10-10

[FIX]Added the doc string for the file amount to text

8381. By Jigar A. on 2013-10-10

[FIX] refector the code and added the docstring for function

8380. By Jigar A. on 2013-10-10

[FIX] account_check_writing: column -> , this is the same columns as , added the 'oldname' argument to ease migration.

8379. By Jigar A. on 2013-10-10

[IMP] account_checkl_writing: added the mutiple PEP8 Standard improvments suggest on MP technical review

8378. By Jigar A. on 2013-10-10

[MERGE] trunk sync

8377. By Jigar A. on 2013-10-10

[IMP] account_checkl_writing: added the mutiple PEP std improvments suggest on MP technical review

=== modified file 'account_check_writing/__init__.py'
--- account_check_writing/__init__.py	2011-10-13 21:11:47 +0000
+++ account_check_writing/__init__.py	2013-11-19 00:05:44 +0000
@@ -18,9 +18,11 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
+import amount_to_text_en
+import res_company
 import account
 import account_voucher
 import wizard
 import report
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account_check_writing/__openerp__.py'
--- account_check_writing/__openerp__.py	2012-12-07 18:30:24 +0000
+++ account_check_writing/__openerp__.py	2013-11-19 00:05:44 +0000
@@ -21,23 +21,42 @@
 {
     'name': 'Check Writing',
     'version': '1.1',
-    'author': 'OpenERP SA, NovaPoint Group',
+    'author': 'OpenERP SA, Ursa Information Systems',
     'category': 'Generic Modules/Accounting',
     'description': """
-Module for the Check Writing and Check Printing.
-================================================
+With this module, you will be able to write checks to your vendors in OpenERP.
+==============================================================================
+
+This module supports the following:
+-----------------------------------
+    * Multiple currencies: it is possible to write checks in different currencies.
+    * Multiple journals: each check can use a different payment method.
+    * Multiple formats: checks can be printed on top, in the middle or at the bottom to fit Quickbooks/Peachtree/... templates.
+    * Batch check number assignation.
+    * Batch printing of checks.
+    * Complete check number sequence management: number auto-suggestion, sequence recalibration, optional overwrite if already specified, duplicates detection.
+    * Optional printing of check number: if the paper checks of your bank already include numbers, you can use these numbers instead of OpenERP’s check numbers.
+    * Optional spill-over on multiple stubs: when the check includes more than 10 invoice lines, they will be printed  on several pages.
+    * Optional printing of credits.
+    * Integration with payments workflow: checks are an integrated part of the payment workflow in OpenERP.
+    * Comprehensive and accurate information displayed on stub: supplier's invoice number, void status, memo, suppresses invoices that are not paid with this check.
     """,
     'website': 'http://www.openerp.com',
-    'depends' : ['account_voucher'],
+    'depends': ['account_voucher'],
     'data': [
         'wizard/account_check_batch_printing_view.xml',
-        'account_check_writing_report.xml',
         'account_view.xml',
         'account_voucher_view.xml',
+        'res_company_view.xml',
         'account_check_writing_data.xml',
     ],
-    'demo': ['account_demo.xml'],
-    'test': [],
+    'demo': [
+        'account_check_writing_demo.xml',
+        'account_check_writing_demo.yml',
+        ],
+    'test': [
+        'test/account_check_writing_report.yml'
+    ],
     'installable': True,
     'active': False,
 }

=== modified file 'account_check_writing/account.py'
--- account_check_writing/account.py	2013-04-15 10:23:49 +0000
+++ account_check_writing/account.py	2013-11-19 00:05:44 +0000
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-Today OpenERP S.A. (<http://www.openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -19,30 +19,77 @@
 #
 ##############################################################################
 
-from openerp.osv import osv,fields
+from openerp import SUPERUSER_ID
+from openerp.osv import osv, fields
+from openerp.tools.translate import _
+
 
 class account_journal(osv.osv):
     _inherit = "account.journal"
 
     _columns = {
-        'allow_check_writing': fields.boolean('Allow Check writing', help='Check this if the journal is to be used for writing checks.'),
-        'use_preprint_check': fields.boolean('Use Preprinted Check'),
-        }
-
-
-class res_company(osv.osv):
-    _inherit = "res.company"
-    _columns = {
-        'check_layout': fields.selection([
-            ('top', 'Check on Top'),
-            ('middle', 'Check in middle'),
-            ('bottom', 'Check on bottom'),
-            ],"Check Layout",
-            help="Check on top is compatible with Quicken, QuickBooks and Microsoft Money. Check in middle is compatible with Peachtree, ACCPAC and DacEasy. Check on bottom is compatible with Peachtree, ACCPAC and DacEasy only"  ),
-        }
-        
-    _defaults = {
-        'check_layout' : lambda *a: 'top',
-    }
-    
+        'allow_check_writing': fields.boolean('Allow Check Writing',
+                help='Check this to be able to write checks using this journal.'),
+        'use_preprint_check': fields.boolean('Use Preprinted Checks',
+                help="Check this if your checks already have a number preprinted on them. Otherwise check numbers will be printed on paper."),
+        'check_sequence_id': fields.many2one('ir.sequence', 'Check Sequence',
+                help="This field contains the information related to the numbering of the Check of this journal."),
+        }
+
+    def configure_check_journal(self, cr, uid, context=None):
+        '''
+        This function set up bank journal to be used on check payment by
+        setting allow check writing on bank type journals this function will
+        be triggered while installing module.
+        '''
+        journal_ids = self.search(cr, uid, [('type', '=', 'bank')], context=context)
+        if journal_ids:
+            self.write(cr, uid, journal_ids, {'allow_check_writing': True}, context=context)
+        return True
+
+    def onchange_journal_type(self, cr, uid, ids, type, context=None):
+        """
+        on change journal type enable the allow_check_writing flag to allow
+        configuration of check journal.
+        """
+        return {'value': {'allow_check_writing': type == "bank"}}
+
+    def create_check_sequence(self, cr, uid, vals, context=None):
+        """
+        Create new no_gap entry sequence for check Journal using given vals.
+        """
+        val = {
+            'name': vals['name'] + _(" : Check Number Sequence"),
+            'implementation': 'no_gap',
+            'padding': 4,
+            'number_increment': 1
+        }
+        if 'company_id' in vals:
+            val['company_id'] = vals['company_id']
+        return self.pool.get('ir.sequence').create(cr, uid, val, context)
+
+    def create(self, cr, uid, vals, context=None):
+        if not 'check_sequence_id' in vals or not vals['check_sequence_id']  and vals.get('allow_check_writing'):
+            # if we have the right to create a journal, we should be able to
+            # create it's check number sequence.
+            vals.update({'check_sequence_id': self.create_check_sequence(cr, SUPERUSER_ID, vals, context)})
+        return super(account_journal, self).create(cr, uid, vals, context)
+
+
+class tmodel_multi_charts_accounts(osv.TransientModel):
+
+    _inherit = 'wizard.multi.charts.accounts'
+
+    def _prepare_bank_journal(self, cr, uid, line, current_num, default_account_id, company_id, context=None):
+        '''
+        This function prepares the value to use for the creation of a bank and
+        addes the allow_check_writing flag value for Bank Type journal
+        :rtype: dict
+        '''
+        vals = super(tmodel_multi_charts_accounts, self)._prepare_bank_journal(cr, uid, line, current_num, default_account_id, company_id, context=context)
+        if line['account_type'] == "bank":
+            vals.update({'allow_check_writing': True})
+        return vals
+
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account_check_writing/account_check_writing_data.xml'
--- account_check_writing/account_check_writing_data.xml	2011-10-13 21:11:47 +0000
+++ account_check_writing/account_check_writing_data.xml	2013-11-19 00:05:44 +0000
@@ -7,9 +7,17 @@
         </record>
 
         <record id="sequence_check_number" model="ir.sequence">
+            <field name="name">Check Journal Number</field>
+            <field name="code">check.number</field>
+            <field name="prefix">CHK/%(year)s/</field>
+            <field eval="4" name="padding"/>
+        </record>
+
+        <record id="seq_check_number" model="ir.sequence">
             <field name="name">Check Number</field>
             <field name="code">check.number</field>
             <field eval="4" name="padding"/>
-        </record>        
+        </record>
+        <function model="account.journal" name="configure_check_journal"/>
     </data>
 </openerp>

=== added file 'account_check_writing/account_check_writing_demo.xml'
--- account_check_writing/account_check_writing_demo.xml	1970-01-01 00:00:00 +0000
+++ account_check_writing/account_check_writing_demo.xml	2013-11-19 00:05:44 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+       <record id="account.check_journal" model="account.journal">
+            <field name="allow_check_writing" eval="1" />
+            <field name="sequence_id" ref="sequence_check_number"/>
+            <field name="check_sequence_id" ref="seq_check_number"/>
+        </record>
+    </data>
+</openerp>

=== added file 'account_check_writing/account_check_writing_demo.yml'
--- account_check_writing/account_check_writing_demo.yml	1970-01-01 00:00:00 +0000
+++ account_check_writing/account_check_writing_demo.yml	2013-11-19 00:05:44 +0000
@@ -0,0 +1,40 @@
+-
+  I set the context as would do the action in supplier invoice.
+-
+  !context
+    'default_type': 'in_invoice'
+-
+  I create a customer invoice
+-
+  !record {model: account.invoice, id: account_checkinvoice_0}:
+    account_id: account.a_pay
+    company_id: base.main_company
+    journal_id: account.expenses_journal
+    partner_id: base.res_partner_6
+    name: Supplier Invoice
+    invoice_line:
+      - account_id: account.a_expense
+        name: '[UDC] USD Datacard'
+        quantity: 10.0
+        price_unit: 450.0
+        quantity: 10.0
+        uos_id: product.product_uom_unit
+-
+  I validate invoice by clicking on Validate button
+-
+  !workflow {model: account.invoice, action: invoice_open, ref: account_checkinvoice_0}
+-
+  I set the context that will be used for the encoding of all the vouchers of this file
+-
+  !context
+    'type': 'payment'
+-
+  I create account voucher with check journal for supplier invoice
+-
+  !record {model: account.voucher, id: account_checkvoucher_01, view: view_vendor_payment_check_form}:
+    type: payment
+    company_id: base.main_company
+    account_id: account.cash
+    amount: 4500.0
+    journal_id: account.check_journal
+    partner_id: base.res_partner_6

=== removed file 'account_check_writing/account_check_writing_report.xml'
--- account_check_writing/account_check_writing_report.xml	2012-02-10 09:33:15 +0000
+++ account_check_writing/account_check_writing_report.xml	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-    <report id="account_print_check_top"
-            string="Print Check (Top)"
-            model="account.voucher"
-            name="account.print.check.top"
-            rml="account_check_writing/report/check_print_top.rml"
-            multi="True"
-            auto="False"/>
-
-    <report id="account_print_check_middle"
-            string="Print Check (Middle)"
-            model="account.voucher"
-            name="account.print.check.middle"
-            rml="account_check_writing/report/check_print_middle.rml"
-            multi="True"
-            auto="False"/>
-            
-    <report id="account_print_check_bottom"
-            string="Print Check (Bottom)"
-            model="account.voucher"
-            name="account.print.check.bottom"
-            rml="account_check_writing/report/check_print_bottom.rml"
-            multi="True"
-            auto="False"/>
-            
-     </data>
-</openerp>

=== removed file 'account_check_writing/account_demo.xml'
--- account_check_writing/account_demo.xml	2011-10-13 21:11:47 +0000
+++ account_check_writing/account_demo.xml	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data noupdate="1">
-       <record id="account.check_journal" model="account.journal">
-            <field name="allow_check_writing" eval="1" />
-            <field name="sequence_id" ref="sequence_check_number"/>
-        </record>
-    </data>
-</openerp>

=== modified file 'account_check_writing/account_view.xml'
--- account_check_writing/account_view.xml	2012-11-29 22:26:45 +0000
+++ account_check_writing/account_view.xml	2013-11-19 00:05:44 +0000
@@ -11,7 +11,13 @@
             <field name="model">account.journal</field>
             <field name="inherit_id" ref="account.view_account_journal_form" />
             <field name="arch" type="xml">
-                <field name="type" />
+                <field name="type"/>
+                <field name="sequence_id" position="after">
+                    <field name="check_sequence_id" attrs="{'invisible': [('allow_check_writing', '!=', True)]}"/>
+                </field>
+                <field name="type" position="attributes">
+                    <attribute name="on_change">onchange_journal_type(type)</attribute>
+                </field>
                 <field name="entry_posted" position="after">
                     <field name="allow_check_writing" attrs="{'readonly':[('type','!=','bank')]}" />
                     <field name="use_preprint_check" attrs="{'readonly':[('type','!=','bank')]}" />

=== modified file 'account_check_writing/account_voucher.py'
--- account_check_writing/account_voucher.py	2013-04-15 10:23:49 +0000
+++ account_check_writing/account_voucher.py	2013-11-19 00:05:44 +0000
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-Today OpenERP S.A. (<http://www.openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -19,81 +19,157 @@
 #
 ##############################################################################
 
-from openerp.osv import osv,fields
+from lxml import etree
+from openerp.osv import osv, fields
 from openerp.tools.translate import _
-from openerp.tools.amount_to_text_en import amount_to_text
-from lxml import etree
-
-class account_voucher(osv.osv):
+from openerp.addons.account_check_writing.amount_to_text_en import amount_to_text
+
+
+class account_voucher(osv.Model):
     _inherit = 'account.voucher'
 
+    def _get_currency(self, cr, uid, context=None):
+        res = super(account_voucher, self)._get_currency(cr, uid, context)
+        if not res:
+            res = self.pool.get("res.users").browse(cr, uid, uid).company_id.currency_id.id
+        return res
+
     def _make_journal_search(self, cr, uid, ttype, context=None):
-        if context is None: 
+        """ 
+        Inherited: Add only check writing journal seacrh behaviour for Checks action view.
+        """
+        if context is None:
             context = {}
         journal_pool = self.pool.get('account.journal')
-        if context.get('write_check',False) :
-            return journal_pool.search(cr, uid, [('allow_check_writing', '=', True)], limit=1)
-        return journal_pool.search(cr, uid, [('type', '=', ttype)], limit=1)
+        if context.get('write_check'):
+            return journal_pool.search(cr, uid, [('allow_check_writing', '=', True)], limit=1, context=context)
+        return journal_pool.search(cr, uid, [('type', '=', ttype)], limit=1, context=context)
+
+    def _get_amount_in_word(self, cr, uid, ids, field_name, arg, context=None):
+        """
+        fields.function method to generate the textual representation of the
+        float amount, to be printed on check later.
+        """
+        res = {}
+        for check in self.browse(cr, uid, ids, context=context):
+            language = 'en'
+            if context.get('lang'):
+                language = context.get('lang')[0:2]
+            currency = check.currency_id.name.lower()
+            res.update({check.id: amount_to_text(check.amount, lang=language, currency=currency)})
+        return res
 
     _columns = {
-        'amount_in_word' : fields.char("Amount in Word" , size=128, readonly=True, states={'draft':[('readonly',False)]}),
-        'allow_check' : fields.related('journal_id', 'allow_check_writing', type='boolean', string='Allow Check Writing'),
-        'number': fields.char('Number', size=32),
+        'amount_in_word': fields.function(_get_amount_in_word, type='char', readonly=True, store=True),
+        'allow_check': fields.related('journal_id', 'allow_check_writing', type='boolean', string='Allow Check Writing'),
+        'check_number': fields.char('Check Number', size=32),
+        'journal_id': fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft': [('readonly', False)]}),
+        'check_done': fields.boolean("Check Printed")
     }
 
+    _sql_constraints = [
+        ('check_per_journal_uniq', 'unique(check_number, journal_id)', 'Check Number Must be Unique Per Journal!'),
+    ]
+
     def onchange_amount(self, cr, uid, ids, amount, rate, partner_id, journal_id, currency_id, ttype, date, payment_rate_currency_id, company_id, context=None):
-        """ Inherited - add amount_in_word and allow_check_writting in returned value dictionary """
+        """ 
+        Inherited: add amount_in_word and allow_check_writing in @returned value dictionary 
+        """
         if not context:
             context = {}
         default = super(account_voucher, self).onchange_amount(cr, uid, ids, amount, rate, partner_id, journal_id, currency_id, ttype, date, payment_rate_currency_id, company_id, context=context)
         if 'value' in default:
             amount = 'amount' in default['value'] and default['value']['amount'] or amount
-
-            #TODO : generic amount_to_text is not ready yet, otherwise language (and country) and currency can be passed
-            #amount_in_word = amount_to_text(amount, context=context)
-            amount_in_word = amount_to_text(amount)
-            default['value'].update({'amount_in_word':amount_in_word})
+            currency = self.pool.get('res.currency').browse(cr, uid, currency_id, context=context)
+            language = 'en'
+            if context.get('lang'):
+                language = context.get('lang')[0:2]
+            currency = currency.name.lower()
+            amount_in_word = amount_to_text(amount, lang=language, currency=currency)
+            default['value'].update({'amount_in_word': amount_in_word})
             if journal_id:
                 allow_check_writing = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context).allow_check_writing
-                default['value'].update({'allow_check':allow_check_writing})
+                default['value'].update({'allow_check': allow_check_writing})
         return default
 
-    def print_check(self, cr, uid, ids, context=None):
-        if not ids:
-            return  {}
-
-        check_layout_report = {
-            'top' : 'account.print.check.top',
-            'middle' : 'account.print.check.middle',
-            'bottom' : 'account.print.check.bottom',
-        }
-
-        check_layout = self.browse(cr, uid, ids[0], context=context).company_id.check_layout
-        return {
-            'type': 'ir.actions.report.xml', 
-            'report_name':check_layout_report[check_layout],
-            'datas': {
-                    'model':'account.voucher',
-                    'id': ids and ids[0] or False,
-                    'ids': ids and ids or [],
-                    'report_type': 'pdf'
-                },
-            'nodestroy': True
-            }
+    def onchange_journal(self, cr, uid, ids, journal_id, line_ids, tax_id, partner_id, date, amount, ttype, company_id, context=None):
+        """ 
+        Inherited: add currency_id @returned value dictionary 
+        """
+        vals = super(account_voucher, self).onchange_journal(cr, uid, ids, journal_id, line_ids, tax_id, partner_id, date, amount, ttype, company_id, context=context)
+        if vals and not vals.get('value', {})['currency_id']:
+            vals['value']['currency_id'] = self.pool.get("res.users").browse(cr, uid, uid).company_id.currency_id.id
+        return vals
+
+    def copy(self, cr, uid, ids, default=None, context=None):
+        if default is None:
+            default = {}
+        default['check_number'] = False
+        return super(account_voucher, self).copy(cr, uid, ids, default=default, context=context)
 
     def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
         """
-            Add domain 'allow_check_writting = True' on journal_id field and remove 'widget = selection' on the same
-            field because the dynamic domain is not allowed on such widget
+        Inherited: Add domain 'allow_check_writing = True' on journal_id
+                   field and remove 'widget = selection' on the same field
+                   because the dynamic domain is not allowed on such widget.
         """
-        if not context: context = {}
+        if context == None:
+            context = {}
         res = super(account_voucher, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
         doc = etree.XML(res['arch'])
         nodes = doc.xpath("//field[@name='journal_id']")
-        if context.get('write_check', False) :
+        if context.get('write_check', False):
             for node in nodes:
                 node.set('domain', "[('type', '=', 'bank'), ('allow_check_writing','=',True)]")
                 node.set('widget', '')
             res['arch'] = etree.tostring(doc)
         return res
 
+    def print_check(self, cr, uid, ids, context=None):
+        """
+        Method will either print the report or will call the Print check wizard.
+        This button will appear in from view only so, If check is assigned with
+        check number then it will print the check directly or else it will call 
+        the betch check batch printing wizard to assign check number first and
+        thenprint the check.
+        
+        @return: return the action (either report action or act_window action)
+        """
+        if context == None:
+            context = {}
+        value = {}
+        model_data = self.pool.get('ir.model.data')
+        check_layout_report = {
+            'top': 'account.print.check.top',
+            'middle': 'account.print.check.middle',
+            'bottom': 'account.print.check.bottom',
+        }
+        check = self.browse(cr, uid, ids[0], context=context)
+        if check.check_number or check.journal_id.use_preprint_check:
+            check_layout = check.company_id.check_layout
+            value = {
+                'type': 'ir.actions.report.xml',
+                'report_name': check_layout_report[check_layout],
+                'datas': {
+                    'model': 'account.voucher',
+                    'id': ids and ids[0] or False,
+                    'ids': ids and ids or [],
+                    'report_type': 'pdf'
+                },
+                'nodestroy': True
+            }
+        else:
+            form_view = model_data.get_object_reference(cr, uid, 'account_check_writing', 'view_account_check_write')
+            value = {
+                'name': _('Print Check'),
+                'view_type': 'form',
+                'view_mode': 'tree,form',
+                'res_model': 'account.check.write',
+                'views': [(form_view and form_view[1] or False, 'form'), (False, 'tree')],
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'context': context,
+            }
+        return value
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account_check_writing/account_voucher_view.xml'
--- account_check_writing/account_voucher_view.xml	2012-12-08 10:33:38 +0000
+++ account_check_writing/account_voucher_view.xml	2013-11-19 00:05:44 +0000
@@ -2,30 +2,171 @@
 <openerp>
     <data>
 
-        <!-- Supplier write check view -->
-
         <record model="ir.ui.view" id="view_vendor_payment_check_form">
-            <field name="name">account.voucher.payment.check.form</field>
-            <field name="model">account.voucher</field>
-            <field name="inherit_id" ref="account_voucher.view_vendor_payment_form" />
-            <field name="arch" type="xml">
-                <field name="amount" position="after">
-                    <newline/>
-                    <field name="allow_check" invisible="1"/>
-                    <field name="amount_in_word" attrs="{'invisible':[('allow_check','!=',1)]}" nolabel="1" colspan="6"/>
-                    <newline/>
-                </field>
+            <field name="name">Account Voucher Check Payment Form</field>
+            <field name="model">account.voucher</field>
+            <field name="arch" type="xml">
+                <form string="Voucher Payment" version="7.0">
+                <header>
+                    <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)" class="oe_highlight"/>
+                    <button name="cancel_voucher" string="Cancel" states="draft,proforma"  invisible="context.get('line_type', False)"/>
+                    <button name="print_check" string="Print Check" type="object" attrs="{'invisible':['|',('allow_check','!=',True),('state','!=','posted')]}" class="oe_highlight"/>
+                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" invisible="context.get('line_type', False)"/>
+                    <button name="cancel_voucher" string="Void" type="object" states="posted" invattrs="{'invisible':[('allow_check','!=',True)]}" confirm="Are you sure to unreconcile and cancel this record ?"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
+                </header>
+                <sheet>
+                    <field name="account_id" invisible="True"/>
+                    <field name="pre_line" invisible="True"/>
+                    <field name="type" invisible="True"/>
+                    <field name="allow_check" invisible="True"/>
+                    <field name="currency_id" invisible="True"/>
+                    <group col="10" colspan="4">
+                        <group colspan="6"/>
+                        <group colspan="2">
+                                <field name="check_number" attrs="{'invisible':[('allow_check','!=',True)]}"/>
+                                <field name="date" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
+                        </group>
+                    </group>
+                    <group colspan="4">
+                        <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1, 'invoice_currency': currency_id}" string="Pay to the order of:"/>
+                    </group>
+                   <group col="10" colspan="4">
+                        <field name="amount_in_word"  attrs="{'invisible':[('allow_check','!=',True)]}" nolabel="1" colspan="8"/>
+                        <h2>
+                             <field name="amount" invisible="context.get('line_type', False)" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)" class="oe_inline" widget='monetary' options='{"currency_field": "currency_id"}' nolabel="1" colspan="2"/>
+                        </h2>
+                    </group>
+                   <group col="10" colspan="4">
+                        <group colspan="6">
+                            <field name="name" colspan="2" invisible="context.get('line_type', False)" placeholder="e.g. Invoice SAJ/0042"/>
+                            <field name="journal_id"
+                                domain="[('type','in',['bank', 'cash'])]"
+                                widget="selection"
+                                on_change="onchange_journal(journal_id, line_dr_ids, False, partner_id, date, amount, type, company_id, context)"
+                                invisible="context.get('line_type', False)"
+                                string="Payment Method"
+                                context="{'default_type': 'bank', 'default_allow_check_writing':1}"
+                                help="Only journals with 'Allow Check Writing' checked can be used as a payment method on checks. To configure this, go to Accounting > Configuration > Journals > Journals."/>
+                        </group>
+                        <group colspan="2">
+                            <field name="reference" invisible="context.get('line_type', False)" string="Payment Ref" placeholder="e.g. 003/10"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="Payment Information">
+                            <label for="line_dr_ids"/>
+                            <field name="line_dr_ids" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, type, context)">
+                                <tree string="Supplier Invoices and Outstanding transactions" editable="bottom" colors="gray:amount==0">
+                                    <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
+                                        on_change="onchange_move_line_id(move_line_id)"
+                                        domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
+                                        required="1"/>
+                                    <field name="account_id" groups="base.group_no_one" domain="[('type','=','payable')]"/>
+                                    <field name="date_original" readonly="1"/>
+                                    <field name="date_due" readonly="1"/>
+                                    <field name="amount_original" readonly="1"/>
+                                    <field name="amount_unreconciled" readonly="1" groups="account.group_account_user"/>
+                                    <field name="reconcile" on_change="onchange_reconcile(reconcile, amount, amount_unreconciled, context)" groups="account.group_account_user"/>
+                                    <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
+                                </tree>
+                            </field>
+                            <label for="line_cr_ids" attrs="{'invisible': [('pre_line','=',False)]}"/>
+                            <field name="line_cr_ids" attrs="{'invisible': [('pre_line','=',False)]}" context="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, type, context)">
+                                <tree string="Credits" editable="bottom" colors="gray:amount==0">
+                                    <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
+                                        on_change="onchange_move_line_id(move_line_id)"
+                                        domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
+                                        required="1"/>
+                                    <field name="account_id" groups="base.group_no_one" domain="[('type','=','payable')]"/>
+                                    <field name="date_original" readonly="1"/>
+                                    <field name="date_due" readonly="1"/>
+                                    <field name="amount_original" readonly="1"/>
+                                    <field name="amount_unreconciled" readonly="1" groups="account.group_account_user"/>
+                                    <field name="reconcile" on_change="onchange_reconcile(reconcile, amount, amount_unreconciled, context)" groups="account.group_account_user"/>
+                                    <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
+                                </tree>
+                            </field>
+                            <group>
+                                <group string="Internal Notes">
+                                    <field name="narration" colspan="2" nolabel="1"/>
+                                </group>
+                                <group>
+                                    <field name="is_multi_currency" invisible="True"/>
+                                    <group col="2" attrs="{'invisible':[('is_multi_currency','=',False)]}">
+                                        <separator string="Currency Options" colspan="2"/>
+                                        <label for="payment_rate" colspan="1"/>
+                                        <div>
+                                            <field name="payment_rate" required="1" class="oe_inline" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
+                                            <field name="payment_rate_currency_id" class="oe_inline" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" groups="base.group_multi_currency"/>
+                                        </div>
+                                        <field name="currency_help_label" colspan="2" nolabel="1" class="oe_grey"/>
+                                        <field name="paid_amount_in_company_currency" colspan="2" invisible="1"/>
+                                    </group>
+                                    <group col="2">
+                                        <separator string="Payment Options" colspan="2"/>
+                                        <field name="writeoff_amount" widget='monetary' options='{"currency_field": "currency_id"}'/>
+                                        <field name="payment_option" required="1"/>
+                                        <field name="writeoff_acc_id"
+                                               attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
+                                               domain="[('type','=','other')]"/>
+                                        <field name="comment"
+                                               attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
+                                        <field name="analytic_id"
+                                               groups="analytic.group_analytic_accounting"/>
+                                    </group>
+                                </group>
+                            </group>
+                        </page>
+                        <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
+                            <group col="4">
+                                <field name="period_id"/>
+                                <field name="audit"/>
+                                <field name="number"/>
+                            </group>
+                            <field name="move_ids" readonly="1">
+                               <tree string="Journal Items">
+                                   <field name="move_id"/>
+                                   <field name="ref"/>
+                                   <field name="date"/>
+                                   <field name="statement_id"/>
+                                   <field name="partner_id"/>
+                                   <field name="account_id"/>
+                                   <field name="name"/>
+                                   <field name="debit"/>
+                                   <field name="credit"/>
+                                   <field name="state"/>
+                                   <field name="reconcile_id"/>
+                                   <field name="amount_currency" groups="base.group_multi_currency"/>
+                                   <field name="currency_id" groups="base.group_multi_currency"/>
+                               </tree>
+                            </field>
+                        </page>
+                    </notebook>
+                    </sheet>
+                    <div class="oe_chatter">
+                        <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
+                    </div>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_voucher_tree_inheirt">
+            <field name="name">account.voucher.tree.inherit</field>
+            <field name="model">account.voucher</field>
+            <field name="inherit_id" ref="account_voucher.view_voucher_tree"/>
+            <field name="arch" type="xml">
                 <field name="number" position="replace">
-                    <field name="number" attrs="{'readonly':[('allow_check','!=',1)]}" />
+                    <field name="number" invisible="context.get('write_check', False)"/>
+                    <field name="check_number" invisible="not context.get('write_check', False)"/>
                 </field>
-                <button name="proforma_voucher" position="after">
-                    <button name="print_check" icon="gtk-print" string="Print Check" type="object" attrs="{'invisible':['|',('allow_check','!=',1),('state','!=','posted') ]}" class="oe_highlight"/>
-                </button>
             </field>
         </record>
 
         <record id="action_write_check" model="ir.actions.act_window">
-            <field name="name">Write Checks</field>
+            <field name="name">Checks</field>
             <field name="res_model">account.voucher</field>
             <field name="view_type">form</field>
             <field name="view_mode">form,tree</field>

=== added file 'account_check_writing/amount_to_text_en.py'
--- account_check_writing/amount_to_text_en.py	1970-01-01 00:00:00 +0000
+++ account_check_writing/amount_to_text_en.py	2013-11-19 00:05:44 +0000
@@ -0,0 +1,61 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-Today OpenERP S.A. (<http://www.openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import logging
+from openerp.tools.translate import _
+from openerp.tools import amount_to_text_en
+
+_logger = logging.getLogger(__name__)
+
+#This will file methods will facilitates the US specific check amount to text 
+#conversion. When we convert the amount to text using server tools api it 
+#produces following output for amount 4500.00: 
+#    Four Thousand, Five Hundred euro and Zero Cent
+#but when it comes to USd check expected output should is:
+#    Four Thousand, Five Hundred and 0/100
+#So this method below will generate the above output for the USD currency for 
+#the places where we have this specific function called.
+
+
+def amount_to_text(number, currency):
+    if currency == "usd":
+        number = '%.2f' % number
+        list = str(number).split('.')
+        start_word = amount_to_text_en.english_number(int(list[0]))
+        end_word = "%d/%d"%(int(list[1]),100)
+        return ' '.join(filter(None, [start_word, 'and', end_word]))
+    else:
+        return amount_to_text_en.amount_to_text(number, currency)
+
+
+_translate_funcs = {'en' : amount_to_text}
+
+def amount_to_text(nbr, lang='en', currency='euro'):
+    """ 
+    Converts an integer to its textual representation, using the 
+    language set in the context if any.
+    """
+    if lang not in _translate_funcs:
+        _logger.warning(_("no translation function found for lang: '%s'"), lang)
+        lang = 'en'
+    return _translate_funcs[lang](abs(nbr), currency)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account_check_writing/report/check_print.py'
--- account_check_writing/report/check_print.py	2012-12-06 14:56:32 +0000
+++ account_check_writing/report/check_print.py	2013-11-19 00:05:44 +0000
@@ -2,7 +2,8 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2012-Today Ursa Information Systems
+#                        <http://www.ursainfosystems.com>.
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -20,68 +21,155 @@
 ##############################################################################
 
 import time
+from operator import itemgetter
 from openerp.report import report_sxw
-from openerp.tools import amount_to_text_en
+from openerp.tools.translate import _
+
+N = 9
+STARS = 70
+LINEKEYS = ['date_due', 'date_original', 'name', 'amount_original', 'amount_due', 'amount']
 
 class report_print_check(report_sxw.rml_parse):
+
     def __init__(self, cr, uid, name, context):
         super(report_print_check, self).__init__(cr, uid, name, context)
-        self.number_lines = 0
-        self.number_add = 0
         self.localcontext.update({
             'time': time,
-            'get_lines': self.get_lines,
-            'fill_stars' : self.fill_stars,
+            'get_data': self.get_vouchers,
         })
-    def fill_stars(self, amount):
-        amount = amount.replace('Dollars','')
-        if len(amount) < 100:
-            stars = 100 - len(amount)
-            return ' '.join([amount,'*'*stars])
-
-        else: return amount
-    
-    def get_lines(self, voucher_lines):
-        result = []
-        self.number_lines = len(voucher_lines)
-        for i in range(0, min(10,self.number_lines)):
-            if i < self.number_lines:
-                res = {
-                    'date_due' : voucher_lines[i].date_due,
-                    'name' : voucher_lines[i].name,
-                    'amount_original' : voucher_lines[i].amount_original and voucher_lines[i].amount_original or False,
-                    'amount_unreconciled' : voucher_lines[i].amount_unreconciled and voucher_lines[i].amount_unreconciled or False,
-                    'amount' : voucher_lines[i].amount and voucher_lines[i].amount or False,
-                }
-            else :
-                res = {
-                    'date_due' : False,
-                    'name' : False,
-                    'amount_original' : False,
-                    'amount_due' : False,
-                    'amount' : False,
-                }
-            result.append(res)
-        return result
+
+    def _getchunk_line(self, defaults=None):
+        """
+        Method Prepares a speical line to be printed on check description setion
+        with given defaults values.
+        @param defaults: dict with default values to be added on lines.
+        @return: a dict speical lines to be printed on check.
+        """
+        if defaults == None:
+            defaults = {}
+        line = dict.fromkeys(LINEKEYS, "")
+        line.update(defaults)
+        return line
+
+    def _prepare_line(self, line, credit=False):
+        sign = credit and -1 or 1
+        return {
+            'date_due': line.date_due,
+            'date_original': line.date_original,
+            'name': line.move_line_id and line.move_line_id.ref or line.name,
+            'amount_original': line.amount_original and  sign * line.amount_original or False,
+            'amount_due': line.amount_unreconciled and sign * line.amount_unreconciled or False,
+            'amount': line.amount and sign * line.amount or False,
+        }
+
+    def _prepare_pages(self, voucher, lines, n):
+        '''
+        Prepare page info for check. Adds the empty lines on description section
+        to keep check well fromatted
+        @param voucher: voucher browse object to be printed.
+        @param lines: total payment lines to be added on check.
+        @param n: max line to be printed on description section for page stub.
+        '''
+        check_lines  = [lines[i:i + n] for i in range(0, len(lines), n)]
+        return [{'lines': chunk,
+                 'amount': voucher.amount,
+                 'amount_words': False,
+                 'number': self._get_check_number(voucher),
+                 'name': voucher.name,
+                 'use_preprint_check': voucher.journal_id.use_preprint_check,
+                 'date': voucher.date,
+                 'partner': voucher.partner_id.name,
+                 'address': voucher.partner_id}
+                            for chunk in check_lines]
+
+    def _get_check_number(self, voucher):
+        '''
+        Wrapper function for special case where customisation may require
+        getting check number else where in child parser
+        '''
+        return voucher.journal_id.use_preprint_check and '' or voucher.check_number
+
+    def _prepare_first_page(self, voucher, stars):
+        '''
+        Change amounts on first page of check, can be inherited or overridden.
+        
+        '''
+        return {
+            'chk_amount': voucher.amount,
+            'amount_words': voucher.amount_in_word and
+                voucher.amount_in_word.ljust(stars, '*') or ''.ljust(stars, '*')
+        }
+
+    def get_vouchers(self, objects, n=N, stars=STARS):
+        '''
+        Wrapper function to get record to be printed on rml. It will add the
+        pages and correction section to be printed.
+        @param: objects - a list of objects 
+        @param: n - number of max line in description section.
+        @param: stars - max number of start to be added after amount fo words to
+                     fill the line.
+        @returns a list of pages as a dict.
+        '''
+        res = []
+        for voucher in objects:
+            res.extend(self._get_data(voucher, n, stars))
+        return res
+
+    def _get_data(self, voucher, n=N, stars=STARS):
+        '''
+        Parses the voucher and chunks it in to a dictionary for the report.
+        - It arranges the items section for credit and debit section to be printed.
+        - Pad the extra lines on stub description section to be printed as empty spaces.
+        - Finally, Add the check amounts to first page and prepare the final value.
+        '''
+        credit_section = voucher.company_id.credit_section
+        suppress_unpaid = voucher.company_id.suppress_unpaid
+        #first chunk up the lines
+        dr_lines = [self._prepare_line(line) for line in voucher.line_dr_ids
+                        if line.amount or not suppress_unpaid]
+        cr_lines = [self._prepare_line(line, 1) for line in voucher.line_cr_ids
+                        if line.amount or not suppress_unpaid]
+        #This section just arranges the items
+        if credit_section:
+            dr_lines.sort(key=itemgetter('date_original'))
+            cr_lines.sort(key=itemgetter('date_original'))
+            #credits to next page if needed
+            lines = ([self._getchunk_line({'name': _('Invoices')})] + dr_lines +
+                     (cr_lines and [self._getchunk_line({'name': _('Credits')})] + cr_lines or []))
+        else:
+            lines = dr_lines + cr_lines
+            lines.sort(key=itemgetter('date_original'))
+        #just pad up the lines -
+        #only 1 field really necessary RML will handle rest
+        lines.extend([self._getchunk_line() for i in range(n - len(lines) % n)])
+        pages = self._prepare_pages(voucher, lines, n)
+        #now add the check amounts to first page
+        pages[0].update(self._prepare_first_page(voucher, stars))
+        if not voucher.company_id.multi_stub:
+            return [pages[0]]
+        return pages
 
 report_sxw.report_sxw(
-    'report.account.print.check.top',
-    'account.voucher',
-    'addons/account_check_writing/report/check_print_top.rml',
-    parser=report_print_check,header=False
+     'report.account.print.check.top',
+     'account.voucher',
+     'addons/account_check_writing/report/check_print_top.rml',
+     parser=report_print_check,
+     header=False
 )
 
 report_sxw.report_sxw(
     'report.account.print.check.middle',
     'account.voucher',
     'addons/account_check_writing/report/check_print_middle.rml',
-    parser=report_print_check,header=False
+    parser=report_print_check,
+    header=False
 )
 
 report_sxw.report_sxw(
     'report.account.print.check.bottom',
     'account.voucher',
     'addons/account_check_writing/report/check_print_bottom.rml',
-    parser=report_print_check,header=False
+    parser=report_print_check,
+    header=False
 )
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account_check_writing/report/check_print_bottom.rml'
--- account_check_writing/report/check_print_bottom.rml	2012-11-29 22:26:45 +0000
+++ account_check_writing/report/check_print_bottom.rml	2013-11-19 00:05:44 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595, 842)" title="Test" author="Martin Simon" allowSplitting="20">
+<document filename="Check (Bottom).pdf">
+  <template pageSize="(612.0,792.0)" title="Check (Bottom)" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="13.0" y1="0.0" width="567" height="765"/>
+      <frame id="first" x1="13.0" y1="0.0" width="567" height="785"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -14,18 +14,6 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Table4">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table5">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table12">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
     <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -46,10 +34,22 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table5">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
     <blockTableStyle id="Table7">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
+    <blockTableStyle id="Table13">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
     <blockTableStyle id="Table8">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -61,30 +61,43 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" rightIndent="-1.0" leftIndent="0.0" fontName="Helvetica"/>
-    <paraStyle name="P2" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica"/>
-    <paraStyle name="P3" fontName="Helvetica"/>
-    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT"/>
-    <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="RIGHT"/>
-    <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="9.0" leading="11"/>
-    <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT"/>
-    <paraStyle name="P8" fontName="Helvetica" fontSize="9.0" leading="11"/>
-    <paraStyle name="P9" fontName="Helvetica" fontSize="10.0" leading="13"/>
-    <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="RIGHT"/>
-    <paraStyle name="P11" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="LEFT"/>
-    <paraStyle name="P12" fontName="Helvetica" fontSize="12.0" leading="15"/>
-    <paraStyle name="P13" fontName="Helvetica"/>
-    <paraStyle name="P14" fontName="Helvetica" fontSize="10.0" leading="13"/>
-    <paraStyle name="P15" fontName="Helvetica" fontSize="10.0" leading="13"/>
-    <paraStyle name="P16" fontName="Helvetica-Bold" fontSize="9.0" leading="11"/>
-    <paraStyle name="P17" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT"/>
-    <paraStyle name="P18" fontName="Helvetica" fontSize="9.0" leading="11"/>
-    <paraStyle name="P19" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
-    <paraStyle name="P20" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT"/>
-    <paraStyle name="P21" fontName="Helvetica" fontSize="8.0" leading="10"/>
-    <paraStyle name="P22" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/>
-    <paraStyle name="P23" fontName="Helvetica-Bold" fontSize="8.0" leading="10"/>
-    <paraStyle name="P24" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P1" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica"/>
+    <paraStyle name="P2" fontName="Helvetica"/>
+    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="8.0" leading="10"/>
+    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P5" fontName="Helvetica" fontSize="8.0" leading="10"/>
+    <paraStyle name="P6" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT"/>
+    <paraStyle name="P9" rightIndent="-1.0" leftIndent="0.0" fontName="Helvetica" fontSize="6.0" leading="8"/>
+    <paraStyle name="P10" fontName="Helvetica"/>
+    <paraStyle name="P11" fontName="Helvetica-Bold" fontSize="8.0" leading="10"/>
+    <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="8.0" leading="10"/>
+    <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="8.0" leading="10"/>
+    <paraStyle name="P14" fontName="Helvetica-Bold" fontSize="10.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P15" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P16" fontName="Helvetica-Bold" fontSize="8.0" leading="10"/>
+    <paraStyle name="P17" fontName="Helvetica-Bold" fontSize="10.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P18" fontName="Helvetica-Bold" fontSize="8.0" leading="10"/>
+    <paraStyle name="P19" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P20" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P21" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P22" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P23" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P24" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P25" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P26" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT"/>
+    <paraStyle name="P27" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT"/>
+    <paraStyle name="P28" fontName="Helvetica-Bold" fontSize="10.0" leading="11" alignment="RIGHT"/>
+    <paraStyle name="P29" fontName="Helvetica-Bold" fontSize="10.0" leading="13"/>
+    <paraStyle name="P30" fontName="Helvetica" fontSize="7.0" leading="9"/>
+    <paraStyle name="P31" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT"/>
+    <paraStyle name="P32" fontName="Helvetica" fontSize="10.0" leading="11" alignment="RIGHT"/>
+    <paraStyle name="P33" fontName="Helvetica" fontSize="9.0" leading="11"/>
+    <paraStyle name="P34" fontName="Helvetica" fontSize="9.0" leading="11"/>
+    <paraStyle name="P35" fontName="Helvetica" fontSize="11.0" leading="14"/>
+    <paraStyle name="P36" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT"/>
+    <paraStyle name="P38" fontName="Helvetica" fontSize="11.0" leading="10"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -96,75 +109,133 @@
     <images/>
   </stylesheet>
   <story>
-    <para style="P1">[[repeatIn(objects,'voucher')]]</para>
-    <blockTable colWidths="568.0" style="Table2" rowHeights="285">
-      <tr>
-        <td>
-          <blockTable colWidths="445.0,117.0" style="Table6">
+    <para style="P14">[[repeatIn(get_data(objects),'page')]]</para>
+    <blockTable colWidths="568.0" style="Table1">
+      <tr>
+        <td>
+          <para style="P2">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P2">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="568.0" style="Table2">
+      <tr>
+        <td>
+          <blockTable colWidths="369.0,97.0,97.0" style="Table6">
             <tr>
               <td>
-                <para style="P16">[[voucher.partner_id.name]]</para>
-              </td>
-              <td>
-                <para style="P16">[[ formatLang(voucher.date , date=True) or '' ]] [[ voucher.journal_id.use_preprint_check and voucher.chk_seq or '' ]]</para>
+                <para style="P3">[[ page['partner'] ]]</para>
+              </td>
+              <td>
+                <para style="P3">[[ formatLang(page['date'], date=True) or '' ]]</para>
+              </td>
+              <td>
+                <para style="P3">[[ not page['use_preprint_check'] and page['number'] or '' ]]</para>
               </td>
             </tr>
           </blockTable>
           <blockTable colWidths="81.0,186.0,83.0,81.0,54.0,78.0" style="Table10">
             <tr>
               <td>
-                <para style="P4">Due Date</para>
-              </td>
-              <td>
-                <para style="P4">Description</para>
-              </td>
-              <td>
-                <para style="P4">Original Amount</para>
-              </td>
-              <td>
-                <para style="P4">Balance Due</para>
-              </td>
-              <td>
-                <para style="P4">Discount</para>
-              </td>
-              <td>
-                <para style="P4">Payment</para>
+                <para style="P9">Due Date</para>
+              </td>
+              <td>
+                <para style="P9">Description</para>
+              </td>
+              <td>
+                <para style="P9">Original Amount</para>
+              </td>
+              <td>
+                <para style="P9">Balance Due</para>
+              </td>
+              <td>
+                <para style="P9">Discount</para>
+              </td>
+              <td>
+                <para style="P9">Payment</para>
               </td>
             </tr>
             <tr>
               <td>
-                <para style="P19">[[ repeatIn(get_lines(voucher.line_dr_ids),'l') ]] [[ formatLang(l['date_original'] ,date=True) or '' ]]</para>
-              </td>
-              <td>
-                <para style="P19">[[ l['name'] ]]</para>
-              </td>
-              <td>
-                <para style="P19">[[formatLang( l['amount_original']) ]]</para>
-              </td>
-              <td>
-                <para style="P19">[[ formatLang( l['amount_due']) ]]</para>
-              </td>
-              <td>
-                <para style="P19">
+                <para style="P7">
+                  <font face="Helvetica" size="2.0">[[ repeatIn(page['lines'],'l') ]]</font>
+                  <font face="Helvetica"> [[ formatLang(l['date_original'] ,date=True) or '' ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="P7">[[ l['name'] ]]</para>
+              </td>
+              <td>
+                <para style="P7">[[formatLang(l['amount_original']) ]]</para>
+              </td>
+              <td>
+                <para style="P7">[[ formatLang(l['amount_due']) ]]</para>
+              </td>
+              <td>
+                <para style="P7">
                   <font color="white"> </font>
                 </para>
               </td>
               <td>
-                <para style="P19">[[ formatLang (l['amount']) ]]</para>
+                <para style="P5">[[ formatLang(l['amount']) ]]</para>
               </td>
             </tr>
           </blockTable>
           <blockTable colWidths="485.0,77.0" style="Table11">
             <tr>
               <td>
-                <para style="P24">Check Amount</para>
-              </td>
-              <td>
-                <para style="P23">[[ formatLang (voucher.amount) ]]</para>
+                <para style="P4">Check Amount</para>
+              </td>
+              <td>
+                <para style="P3">[[ formatLang(page['amount']) or 'VOID' ]]</para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="P4">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P3">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="P4">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P3">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="P4">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P3">
+                  <font color="white"> </font>
+                </para>
               </td>
             </tr>
           </blockTable>
-          <para style="P3">
+          <para style="P2">
             <font color="white"> </font>
           </para>
         </td>
@@ -173,146 +244,302 @@
     <blockTable colWidths="568.0" style="Table3">
       <tr>
         <td>
-          <blockTable colWidths="446.0,116.0" style="Table7">
-            <tr>
-              <td>
-                <para style="P16">[[voucher.partner_id.name]]</para>
-              </td>
-              <td>
-                <para style="P16">[[ formatLang(voucher.date , date=True) or '' ]] [[ voucher.journal_id.use_preprint_check and voucher.chk_seq or '' ]]</para>
-              </td>
-            </tr>
-          </blockTable>
-          <blockTable colWidths="82.0,185.0,89.0,76.0,52.0,78.0" style="Table8">
-            <tr>
-              <td>
-                <para style="P4">Due Date</para>
-              </td>
-              <td>
-                <para style="P4">Description</para>
-              </td>
-              <td>
-                <para style="P4">Original Amount</para>
-              </td>
-              <td>
-                <para style="P4">Balance Due</para>
-              </td>
-              <td>
-                <para style="P4">Discount</para>
-              </td>
-              <td>
-                <para style="P4">Payment</para>
-              </td>
-            </tr>
-            <tr>
-              <td>
-                <para style="P19">[[ repeatIn(get_lines(voucher.line_dr_ids),'l') ]] [[ formatLang(l['date_original'] ,date=True) or '' ]]</para>
-              </td>
-              <td>
-                <para style="P19">[[ l['name'] ]]</para>
-              </td>
-              <td>
-                <para style="P19">[[ formatLang (l['amount_original']) ]]</para>
-              </td>
-              <td>
-                <para style="P19">[[ formatLang (l['amount_due']) ]]</para>
-              </td>
-              <td>
-                <para style="P19">
-                  <font color="white"> </font>
-                </para>
-              </td>
-              <td>
-                <para style="P19">[[ formatLang (l['amount']) ]]</para>
-              </td>
-            </tr>
-          </blockTable>
-          <blockTable colWidths="485.0,77.0" style="Table9"  rowHeights="40.5">
-            <tr>
-              <td>
-                <para style="P17">Check Amount</para>
-              </td>
-              <td>
-                <para style="P16">[[ formatLang (voucher.amount) ]]</para>
-              </td>
-            </tr>
-          </blockTable>
-          <para style="P3">
-            <font color="white"> </font>
-          </para>
+          <blockTable colWidths="370.0,96.0,96.0" style="Table4">
+            <tr>
+              <td>
+                <para style="P3">[[ page['partner'] ]]</para>
+              </td>
+              <td>
+                <para style="P3">[[ formatLang(page['date'], date=True) or '' ]]</para>
+              </td>
+              <td>
+                <para style="P3">[[ not page['use_preprint_check'] and page['number'] or '' ]]</para>
+              </td>
+            </tr>
+          </blockTable>
+          <blockTable colWidths="82.0,185.0,89.0,76.0,52.0,78.0" style="Table5">
+            <tr>
+              <td>
+                <para style="P9">Due Date</para>
+              </td>
+              <td>
+                <para style="P9">Description</para>
+              </td>
+              <td>
+                <para style="P9">Original Amount</para>
+              </td>
+              <td>
+                <para style="P9">Balance Due</para>
+              </td>
+              <td>
+                <para style="P9">Discount</para>
+              </td>
+              <td>
+                <para style="P9">Payment</para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="P7">
+                  <font face="Helvetica" size="2.0">[[ repeatIn(page['lines'],'l') ]]</font>
+                  <font face="Helvetica"> [[ formatLang(l['date_original'] ,date=True) or '' ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="P7">[[ l['name'] ]]</para>
+              </td>
+              <td>
+                <para style="P7">[[formatLang(l['amount_original']) ]]</para>
+              </td>
+              <td>
+                <para style="P7">[[ formatLang(l['amount_due']) ]]</para>
+              </td>
+              <td>
+                <para style="P7">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P5">[[ formatLang(l['amount']) ]]</para>
+              </td>
+            </tr>
+          </blockTable>
+          <blockTable colWidths="485.0,77.0" style="Table7">
+            <tr>
+              <td>
+                <para style="P4">Check Amount</para>
+              </td>
+              <td>
+                <para style="P3">[[ formatLang(page['amount']) or 'VOID' ]]</para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="P8">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P6">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="P8">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P6">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="P8">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P6">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="P8">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P6">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+          </blockTable>
+
+          <blockTable colWidths="56.0,420.0,86.0" style="Table4">
+            <tr>
+              <td>
+                <para style="P3">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P3">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P28">
+                  <font face="Helvetica">[[ not page['use_preprint_check'] and page['number'] or '' ]]</font>
+                </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="P3">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P3">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P3">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="P38">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P38">
+                  <font color="white"></font>
+                </para>
+              </td>
+              <td>
+                <para style="P38">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="P3">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P29">
+                  <font face="Helvetica">[[ page['amount_words'] or 'VOID'.ljust(70, '*') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="P28">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="P2">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P35">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P3">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="P3">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P36">
+                  <font face="Helvetica">[[ formatLang(page['date'] , date=True) or '' ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="P32">
+                  <font face="Helvetica">[[ 'chk_amount' in page and formatLang(page['chk_amount']) or 'VOID' ]]</font>
+                </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="P3">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P3">
+                  <font color="white"></font>
+                </para>
+              </td>
+              <td>
+                <para style="P3">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="P3">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P3">
+                  <font face="Helvetica" size="9.0">[[ page['partner'] ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="P3">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="P3">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P3">
+                  <font color="white"></font>
+                </para>
+              </td>
+              <td>
+                <para style="P3">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="P3">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P3">
+                  <font color="white"></font>
+                </para>
+              </td>
+              <td>
+                <para style="P3">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+          </blockTable>
         </td>
       </tr>
     </blockTable>
-    <para style="P2">
+    <para style="P1">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="568.0"  style="Table1">
-      <tr>
-        <td>
-          <blockTable colWidths="370.0,130.0,75.0" rowHeights="65.5,30" style="Table5">
-            <tr>
-              <td>
-                <para style="P9"></para>
-              </td>
-              <td>
-              </td>
-              <td>
-                <para style="P9">[[ voucher.journal_id.use_preprint_check and voucher.chk_seq or '' ]]</para>
-              </td>
-            </tr>
-            <tr>
-              <td>
-                <para style="P9"></para>
-              </td>
-              <td>
-                <para style="P9">[[ formatLang(voucher.date , date=True) or '' ]]</para>
-              </td>
-              <td>
-                <para style="P9">[[ formatLang (voucher.amount) ]]</para>
-              </td>
-            </tr>
-          </blockTable>
-          <blockTable colWidths="54.0,500.0" rowHeights="65" style="Table12">
-            <tr>
-              <td>
-                <para style="P3">
-                  <font color="white"> </font>
-                </para>
-              </td>
-              <td>
-                <para style="P15">[[ voucher.partner_id.name ]]</para>
-                <para style="P15">[[ display_address(voucher.partner_id) or removeParentNode('para') ]]</para>
-              </td>
-            </tr>
-          </blockTable>
-		<blockTable colWidths="550.0" rowHeights="93" style="Table5">
-            <tr>
-              <td>
-                <para style="P9">[[ fill_stars(voucher.amount_in_word) ]]</para>
-              </td>
-            </tr>
-          </blockTable>
-
-          <blockTable colWidths="25.0,500" style="Table12">
-            <tr>
-              <td>
-                <para style="P3">
-                  <font color="white"> </font>
-                </para>
-              </td>
-              <td>
-                <para style="P3">
-                  <font color="white"> </font>
-                </para>
-                <!--para style="P15">[[ voucher.name ]]</para-->
-              </td>
-            </tr>
-          </blockTable>
-          <para style="P3">
-            <font color="white"> </font>
-          </para>
-        </td>
-      </tr>
-    </blockTable>
   </story>
 </document>

=== modified file 'account_check_writing/report/check_print_bottom.sxw'
Binary files account_check_writing/report/check_print_bottom.sxw	2012-11-01 07:32:01 +0000 and account_check_writing/report/check_print_bottom.sxw	2013-11-19 00:05:44 +0000 differ
=== modified file 'account_check_writing/report/check_print_middle.rml'
--- account_check_writing/report/check_print_middle.rml	2012-11-29 22:26:45 +0000
+++ account_check_writing/report/check_print_middle.rml	2013-11-19 00:05:44 +0000
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595, 842)" title="Test" author="Martin Simon" allowSplitting="20">
-  <!-- Letter 612.0, 792.0 A4 595, 842 -->
+<document filename="Check (Middle).pdf">
+  <template pageSize="(612.0,792.0)" title="Check (Middle)" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="13.0" y1="0.0" width="567" height="785"/>
     </pageTemplate>
@@ -11,22 +10,6 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Table1">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table4">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table5">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table12">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
     <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -43,6 +26,14 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
     <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -62,30 +53,43 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" rightIndent="-1.0" leftIndent="0.0" fontName="Helvetica"/>
-    <paraStyle name="P2" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica"/>
-    <paraStyle name="P3" fontName="Helvetica"/>
-    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT"/>
-    <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="RIGHT"/>
-    <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="9.0" leading="11"/>
-    <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT"/>
-    <paraStyle name="P8" fontName="Helvetica" fontSize="9.0" leading="11"/>
-    <paraStyle name="P9" fontName="Helvetica" fontSize="10.0" leading="13"/>
-    <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="RIGHT"/>
-    <paraStyle name="P11" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="LEFT"/>
-    <paraStyle name="P12" fontName="Helvetica" fontSize="12.0" leading="15"/>
-    <paraStyle name="P13" fontName="Helvetica"/>
-    <paraStyle name="P14" fontName="Helvetica" fontSize="10.0" leading="13"/>
-    <paraStyle name="P15" fontName="Helvetica" fontSize="10.0" leading="13"/>
-    <paraStyle name="P16" fontName="Helvetica-Bold" fontSize="9.0" leading="11"/>
-    <paraStyle name="P17" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT"/>
-    <paraStyle name="P18" fontName="Helvetica" fontSize="9.0" leading="11"/>
-    <paraStyle name="P19" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
-    <paraStyle name="P20" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT"/>
-    <paraStyle name="P21" fontName="Helvetica" fontSize="8.0" leading="10"/>
-    <paraStyle name="P22" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/>
-    <paraStyle name="P23" fontName="Helvetica-Bold" fontSize="8.0" leading="10"/>
-    <paraStyle name="P24" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P1" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica"/>
+    <paraStyle name="P2" fontName="Helvetica"/>
+    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="8.0" leading="10"/>
+    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P5" fontName="Helvetica" fontSize="8.0" leading="10"/>
+    <paraStyle name="P6" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT"/>
+    <paraStyle name="P9" rightIndent="-1.0" leftIndent="0.0" fontName="Helvetica" fontSize="6.0" leading="8"/>
+    <paraStyle name="P10" fontName="Helvetica"/>
+    <paraStyle name="P11" fontName="Helvetica-Bold" fontSize="8.0" leading="10"/>
+    <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="8.0" leading="10"/>
+    <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="8.0" leading="10"/>
+    <paraStyle name="P14" fontName="Helvetica-Bold" fontSize="10.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P15" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P16" fontName="Helvetica-Bold" fontSize="8.0" leading="10"/>
+    <paraStyle name="P17" fontName="Helvetica-Bold" fontSize="10.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P18" fontName="Helvetica-Bold" fontSize="8.0" leading="10"/>
+    <paraStyle name="P19" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P20" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P21" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P22" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P23" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P24" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P25" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P26" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT"/>
+    <paraStyle name="P27" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT"/>
+    <paraStyle name="P28" fontName="Helvetica-Bold" fontSize="10.0" leading="11" alignment="RIGHT"/>
+    <paraStyle name="P29" fontName="Helvetica-Bold" fontSize="10.0" leading="13"/>
+    <paraStyle name="P30" fontName="Helvetica" fontSize="7.0" leading="9"/>
+    <paraStyle name="P31" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT"/>
+    <paraStyle name="P32" fontName="Helvetica" fontSize="10.0" leading="11" alignment="RIGHT"/>
+    <paraStyle name="P33" fontName="Helvetica" fontSize="9.0" leading="11"/>
+    <paraStyle name="P34" fontName="Helvetica" fontSize="9.0" leading="11"/>
+    <paraStyle name="P35" fontName="Helvetica" fontSize="11.0" leading="14"/>
+    <paraStyle name="P36" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT"/>
+    <paraStyle name="P37" fontName="Helvetica" fontSize="13.0" leading="10"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -97,166 +101,317 @@
     <images/>
   </stylesheet>
   <story>
-    <para style="P1">[[repeatIn(objects,'voucher')]]</para>
-    <blockTable colWidths="568.0" style="Table2" rowHeights="320">
+    <para style="P9">
+      <font face="Helvetica">[[repeatIn(get_data(objects),'page')]]</font>
+    </para>
+    <blockTable colWidths="568.0" style="Table2">
       <tr>
         <td>
-          <blockTable colWidths="485.0,67.0" style="Table6">
-            <tr>
-              <td>
-                <para style="P16"></para>
-              </td>
-              <td>
-                <para style="P14">[[ voucher.journal_id.use_preprint_check and voucher.chk_seq or '' ]]</para>
-              </td>
-            </tr>
-            <tr>
-              <td>
-                <para style="P16">[[voucher.partner_id.name]]</para>
-              </td>
-              <td>
-                <para style="P16">[[ formatLang(voucher.date , date=True) or '' ]]</para>
+          <blockTable colWidths="369.0,97.0,97.0" style="Table6">
+            <tr>
+              <td>
+                <para style="P12">
+                  <font face="Helvetica">[[ page['partner'] ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="P12">
+                  <font face="Helvetica">[[ formatLang(page['date'], date=True) or '' ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="P14">
+                  <font face="Helvetica">[[ not page['use_preprint_check'] and page['number'] or '' ]]</font>
+                </para>
               </td>
             </tr>
           </blockTable>
           <blockTable colWidths="81.0,186.0,83.0,81.0,54.0,78.0" style="Table10">
             <tr>
               <td>
-                <para style="P4">Due Date</para>
-              </td>
-              <td>
-                <para style="P4">Description</para>
-              </td>
-              <td>
-                <para style="P4">Original Amount</para>
-              </td>
-              <td>
-                <para style="P4">Balance Due</para>
-              </td>
-              <td>
-                <para style="P4">Discount</para>
-              </td>
-              <td>
-                <para style="P4">Payment</para>
-              </td>
-            </tr>
-            <tr>
-              <td>
-                <para style="P19">[[ repeatIn(get_lines(voucher.line_dr_ids),'l') ]] [[ formatLang(l['date_original'] ,date=True) or '' ]]</para>
-              </td>
-              <td>
-                <para style="P19">[[ l['name'] ]]</para>
-              </td>
-              <td>
-                <para style="P19">[[formatLang( l['amount_original']) ]]</para>
-              </td>
-              <td>
-                <para style="P19">[[ formatLang( l['amount_due']) ]]</para>
-              </td>
-              <td>
-                <para style="P19">
-                  <font color="white"> </font>
-                </para>
-              </td>
-              <td>
-                <para style="P19">[[ formatLang (l['amount']) ]]</para>
-              </td>
-            </tr>
-          </blockTable>
-          <blockTable colWidths="485.0,77.0" style="Table11">
-            <tr>
-              <td>
-                <para style="P24">Check Amount</para>
-              </td>
-              <td>
-                <para style="P23">[[ formatLang (voucher.amount) ]]</para>
-              </td>
-            </tr>
-          </blockTable>
-          <blockTable colWidths="485.0,77.0"  rowHeights="158,10" style="Table11">
-            <tr>
-              <td>
-              </td>
-              <td>
-              </td>
-            </tr>
-            <tr>
-              <td>
-              </td>
-              <td>
-                <para style="P14">[[ voucher.journal_id.use_preprint_check and voucher.chk_seq or '' ]]</para>
-              </td>
-            </tr>
-          </blockTable>
-          <para style="P3">
-            <font color="white"> </font>
-          </para>
-        </td>
-      </tr>
-    </blockTable>
-    <blockTable colWidths="550.0" rowHeights="10" style="Table5">
-            <tr>
-              <td>
-                <para style="P26">[[ str(fill_stars(voucher.amount_in_word)) ]]</para>
-              </td>
-            </tr>
-     </blockTable>
-    <blockTable colWidths="568.0"  style="Table1">
-      <tr>
-        <td>
-          <blockTable colWidths="370.0,130.0,55.0" rowHeights=".95cm" style="Table5">
-            <tr>
-              <td>
-                <para style="P9"></para>
-              </td>
-              <td>
-                <para style="P9"></para>
-              </td>
-              <td>
-                <para style="P9"></para>
-              </td>
-            </tr>
-            <tr>
-              <td>
-                <para style="P9"></para>
-              </td>
-              <td>
-                <para style="P9">[[ formatLang(voucher.date , date=True) or '' ]]</para>
-              </td>
-              <td>
-                <para style="P9">[[ formatLang (voucher.amount) ]]</para>
-              </td>
-            </tr>
-          </blockTable>
-          <blockTable colWidths="54.0,500.0" rowHeights="2.5cm" style="Table12">
-            <tr>
-              <td>
-                <para style="P3">
-                  <font color="white"> </font>
-                </para>
-              </td>
-              <td>
-                <para style="P15">[[ voucher.partner_id.name ]]</para>
-                <para style="P15">[[ display_address(voucher.partner_id) or removeParentNode('para') ]]</para>
-              </td>
-            </tr>
-          </blockTable>
-          <blockTable colWidths="25.0,500" rowHeights="30.5" style="Table12">
-            <tr>
-              <td>
-                <para style="P3">
-                  <font color="white"> </font>
-                </para>
-              </td>
-              <td>
-                <para style="P3">
-                  <font color="white"> </font>
-                </para>
-                <!--para style="P15">[[ voucher.name ]]</para-->
-              </td>
-            </tr>
-          </blockTable>
-          <para style="P3">
+                <para style="P26">Due Date</para>
+              </td>
+              <td>
+                <para style="P8">Description</para>
+              </td>
+              <td>
+                <para style="P8">Original Amount</para>
+              </td>
+              <td>
+                <para style="P8">Balance Due</para>
+              </td>
+              <td>
+                <para style="P8">Discount</para>
+              </td>
+              <td>
+                <para style="P8">Payment</para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="P20">
+                  <font face="Helvetica" size="2.0">[[ repeatIn(page['lines'],'l') ]]</font>
+                  <font face="Helvetica"> [[ formatLang(l['date_original'] ,date=True) or '' ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="P20">
+                  <font face="Helvetica">[[ l['name'] ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="P20">
+                  <font face="Helvetica">[[formatLang(l['amount_original']) ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="P20">
+                  <font face="Helvetica">[[ formatLang(l['amount_due']) ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P7">
+                  <font face="Helvetica">[[ formatLang(l['amount']) ]]</font>
+                </para>
+              </td>
+            </tr>
+          </blockTable>
+          <blockTable colWidths="485.0,78.0" style="Table11">
+            <tr>
+              <td>
+                <para style="P4">Check Amount</para>
+              </td>
+              <td>
+                <para style="P13">
+                  <font face="Helvetica">[[ formatLang(page['amount']) or 'VOID' ]]</font>
+                </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+          </blockTable>
+          <blockTable colWidths="56.0,420.0,86.0" style="Table4">
+            <tr>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P28">
+                  <font face="Helvetica">[[ not page['use_preprint_check'] and page['number'] or '' ]]</font>
+                </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P29">
+                  <font face="Helvetica">[[ page['amount_words'] or 'VOID'.ljust(70, '*') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P36">
+                  <font face="Helvetica">[[ formatLang(page['date'] , date=True) or '' ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="P32">
+                  <font face="Helvetica">[[ 'chk_amount' in page and formatLang(page['chk_amount']) or 'VOID' ]]</font>
+                </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="P37">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P37">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P37">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P3">
+                  <font face="Helvetica" size="9.0">[[ page['partner'] ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+          </blockTable>
+          <para style="P30">
             <font color="white"> </font>
           </para>
         </td>
@@ -265,91 +420,130 @@
     <blockTable colWidths="568.0" style="Table3">
       <tr>
         <td>
-          <blockTable colWidths="436.0,76.0,20.0" style="Table7">
-            <tr>
-              <td>
-                <para style="P16"></para>
-              </td>
-              <td>
-                 <para style="P14"></para>
-              </td>
-              <td>
-                 <para style="P14"></para>
-              </td>
-            </tr>
-            <tr>
-              <td>
-                <para style="P16">[[voucher.partner_id.name]]</para>
-              </td>
-              <td>
-                <para style="P16">[[ formatLang(voucher.date , date=True) or '' ]]</para>
-              </td>
-              <td>
-                <para style="P14">[[ voucher.journal_id.use_preprint_check and voucher.chk_seq or '' ]]</para>
+          <blockTable colWidths="370.0,96.0,96.0" style="Table7">
+            <tr>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="P16">
+                  <font face="Helvetica">[[ page['partner'] or '' ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="P16">
+                  <font face="Helvetica">[[ formatLang(page['date'] , date=True) or '' ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="P17">
+                  <font face="Helvetica">[[ not page['use_preprint_check'] and page['number'] or '' ]]</font>
+                </para>
               </td>
             </tr>
           </blockTable>
           <blockTable colWidths="82.0,185.0,89.0,76.0,52.0,78.0" style="Table8">
             <tr>
               <td>
-                <para style="P4">Due Date</para>
-              </td>
-              <td>
-                <para style="P4">Description</para>
-              </td>
-              <td>
-                <para style="P4">Original Amount</para>
-              </td>
-              <td>
-                <para style="P4">Balance Due</para>
-              </td>
-              <td>
-                <para style="P4">Discount</para>
-              </td>
-              <td>
-                <para style="P4">Payment</para>
+                <para style="P8">Due Date</para>
+              </td>
+              <td>
+                <para style="P8">Description</para>
+              </td>
+              <td>
+                <para style="P8">Original Amount</para>
+              </td>
+              <td>
+                <para style="P8">Balance Due</para>
+              </td>
+              <td>
+                <para style="P8">Discount</para>
+              </td>
+              <td>
+                <para style="P8">Payment</para>
               </td>
             </tr>
             <tr>
               <td>
-                <para style="P19">[[ repeatIn(get_lines(voucher.line_dr_ids),'l') ]] [[ formatLang(l['date_original'] ,date=True) or '' ]]</para>
-              </td>
-              <td>
-                <para style="P19">[[ l['name'] ]]</para>
-              </td>
-              <td>
-                <para style="P19">[[ formatLang (l['amount_original']) ]]</para>
-              </td>
-              <td>
-                <para style="P19">[[ formatLang (l['amount_due']) ]]</para>
-              </td>
-              <td>
-                <para style="P19">
+                <para style="P21">
+                  <font face="Helvetica" size="2.0">[[ repeatIn(page['lines'],'l') ]]</font>
+                  <font face="Helvetica"> [[ formatLang(l['date_original'] ,date=True) or '' ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="P22">
+                  <font face="Helvetica">[[ l['name'] ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="P23">
+                  <font face="Helvetica">[[formatLang(l['amount_original']) ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="P24">
+                  <font face="Helvetica">[[ formatLang(l['amount_due']) ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="Standard">
                   <font color="white"> </font>
                 </para>
               </td>
               <td>
-                <para style="P19">[[ formatLang (l['amount']) ]]</para>
+                <para style="P25">
+                  <font face="Helvetica">[[ formatLang(l['amount']) ]]</font>
+                </para>
               </td>
             </tr>
           </blockTable>
           <blockTable colWidths="485.0,77.0" style="Table9">
             <tr>
               <td>
-                <para style="P24">Check Amount</para>
+                <para style="P4">Check Amount</para>
               </td>
               <td>
-                <para style="P23">[[ formatLang (voucher.amount) ]]</para>
+                <para style="P18">
+                  <font face="Helvetica">[[ formatLang (page['amount']) or 'VOID' ]]</font>
+                </para>
               </td>
             </tr>
           </blockTable>
-          <para style="P3">
-            <font color="white"> </font>
-          </para>
         </td>
       </tr>
     </blockTable>
-    <para style="P2">
+    <para style="Standard">
       <font color="white"> </font>
     </para>
   </story>

=== modified file 'account_check_writing/report/check_print_middle.sxw'
Binary files account_check_writing/report/check_print_middle.sxw	2012-11-01 07:32:01 +0000 and account_check_writing/report/check_print_middle.sxw	2013-11-19 00:05:44 +0000 differ
=== modified file 'account_check_writing/report/check_print_top.rml'
--- account_check_writing/report/check_print_top.rml	2012-11-29 22:26:45 +0000
+++ account_check_writing/report/check_print_top.rml	2013-11-19 00:05:44 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595, 842)" title="Test" author="Martin Simon" allowSplitting="20">
+<document filename="Check (Top).pdf">
+  <template pageSize="(612.0,792.0)" title="Check (Top)" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="13.0" y1="0.0" width="567" height="841"/>
+      <frame id="first" x1="13.0" y1="0.0" width="567" height="785"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -22,10 +22,6 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Table12">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
     <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -61,31 +57,26 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" rightIndent="-1.0" leftIndent="0.0" fontName="Helvetica"/>
-    <paraStyle name="P2" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica"/>
-    <paraStyle name="P3" fontName="Helvetica"/>
-    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT"/>
-    <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="RIGHT"/>
-    <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="9.0" leading="11"/>
-    <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT"/>
-    <paraStyle name="P8" fontName="Helvetica" fontSize="9.0" leading="11"/>
-    <paraStyle name="P9" fontName="Helvetica" fontSize="10.0" leading="13"/>
-    <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="RIGHT"/>
-    <paraStyle name="P11" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="LEFT"/>
-    <paraStyle name="P12" fontName="Helvetica" fontSize="12.0" leading="15"/>
-    <paraStyle name="P13" fontName="Helvetica"/>
-    <paraStyle name="P14" fontName="Helvetica" fontSize="10.0" leading="13"/>
-    <paraStyle name="P15" fontName="Helvetica" fontSize="10.0" leading="13"/>
-    <paraStyle name="P16" fontName="Helvetica-Bold" fontSize="9.0" leading="11"/>
-    <paraStyle name="P17" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT"/>
-    <paraStyle name="P18" fontName="Helvetica" fontSize="9.0" leading="11"/>
-    <paraStyle name="P19" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
-    <paraStyle name="P20" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT"/>
-    <paraStyle name="P21" fontName="Helvetica" fontSize="8.0" leading="10"/>
-    <paraStyle name="P22" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/>
-    <paraStyle name="P23" fontName="Helvetica-Bold" fontSize="8.0" leading="10"/>
-    <paraStyle name="P24" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P1" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica"/>
+    <paraStyle name="P2" fontName="Helvetica"/>
+    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="8.0" leading="10"/>
+    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P6" fontName="Helvetica" fontSize="8.0" leading="10"/>
+    <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P9" fontName="Helvetica-Bold" fontSize="9.0" leading="11"/>
+    <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT"/>
+    <paraStyle name="P11" rightIndent="-1.0" leftIndent="0.0" fontName="Helvetica" fontSize="6.0" leading="8"/>
+    <paraStyle name="P12" fontName="Helvetica" fontSize="9.0" leading="11"/>
+    <paraStyle name="P13" fontName="Helvetica" fontSize="9.0" leading="11"/>
+    <paraStyle name="P14" fontName="Helvetica" fontSize="9.0" leading="11"/>
+    <paraStyle name="P15" fontName="Helvetica-Bold" fontSize="9.0" leading="11"/>
+    <paraStyle name="P16" fontName="Helvetica-Bold" fontSize="10.0" leading="11" alignment="RIGHT"/>
+    <paraStyle name="P16" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
+    <paraStyle name="P17" fontName="Helvetica" fontSize="9.0" leading="11"/>
+    <paraStyle name="P18" fontName="Helvetica" fontSize="14.0" leading="11"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -96,161 +87,295 @@
     <images/>
   </stylesheet>
   <story>
-    <para style="P1">[[repeatIn(objects,'voucher')]]</para>
-    <blockTable colWidths="568.0"  style="Table1">
+    <para style="P11">[[repeatIn(get_data(objects),'page')]]</para>
+    <blockTable colWidths="568.0" style="Table1">
       <tr>
         <td>
-          <blockTable colWidths="425.0,177.0" rowHeights="107.50,25.5" style="Table4">
-            <tr>
-              <td>
-                <para style="P6">
-                  <font color="white"> </font>
-                </para>
-              </td>
-              <td>
-                <para style="P6">
-                  <font color="white"> </font>
-                </para>
-              </td>
-            </tr>
-            <tr>
-              <td>
-                <para style="P6">
-                  <font color="white"> </font>
-                </para>
-              </td>
-              <td>
-                <para style="P9">[[ formatLang(voucher.date , date=True) or '' ]] [[ voucher.journal_id.use_preprint_check and voucher.chk_seq or '' ]]</para>
-              </td>
-            </tr>
-          </blockTable>
-          <blockTable colWidths="54.0,425.0,85.0" rowHeights="21.5" style="Table4">
-            <tr>
-              <td>
-                <para style="P6">
-                  <font color="white"> </font>
-                </para>
-              </td>
-              <td>
-                <para style="P9">[[ voucher.partner_id.name ]] </para>
-              </td>
-              <td>
-                <para style="P12">[[ formatLang (voucher.amount) ]]</para>
-              </td>
-            </tr>
-          </blockTable>
-          <blockTable colWidths="550.0" rowHeights="18" style="Table5">
-            <tr>
-              <td>
-                <para style="P9">[[ fill_stars(voucher.amount_in_word) ]]</para>
-              </td>
-            </tr>
-          </blockTable>
-          <blockTable colWidths="54.0,425.0,85.0" rowHeights="45.5" style="Table4">
-            <tr>
-              <td>
-                <para style="P6"></para>
-              </td>
-              <td>
-                <para style="P9">[[ voucher.partner_id.name ]] </para>
-                <para style="P15">[[ display_address(voucher.partner_id) or removeParentNode('para') ]]</para>
-              </td>
-              <td>
-                <para/>
-              </td>
-            </tr>
-          </blockTable>
-          <blockTable colWidths="25.0,350,150" rowHeights="10.5" style="Table12">
-            <tr>
-              <td>
-                <para style="P3">
-                  <font color="white"> </font>
-                </para>
-              </td>
-              <td>
-                <para style="P15">[[ voucher.name ]]</para>
-              </td>
-              <td>
-                <para style="P3">
-                  <font color="white"> </font>
-                </para>
-              </td>
-            </tr>
-          </blockTable>
-          <para style="P3">
+          <blockTable colWidths="56.0,428.0,78.0" style="Table4">
+            <tr>
+              <td>
+                <para style="Table Contents">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="Table Contents">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P16">[[ not page['use_preprint_check'] and page['number'] or '' ]]</para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="P18">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P18">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P18">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P14">[[ formatLang(page['date'] , date=True) or '' ]]</para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P12">[[ page['partner'] ]]</para>
+              </td>
+              <td>
+                <para style="P13">[[ 'chk_amount' in page and formatLang(page['chk_amount']) or 'VOID' ]]</para>
+              </td>
+            </tr>
+          </blockTable>
+          <blockTable colWidths="20.0,465.0,77.0" style="Table5">
+            <tr>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P15">[[ page['amount_words'] or 'VOID'.ljust(70, '*') ]]</para>
+              </td>
+              <td>
+                <para style="P10">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P17">[[ page['name'] or "" ]]</para>
+              </td>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+          </blockTable>
+          <para style="Standard">
+            <font color="white"> </font>
+          </para>
+          <para style="Standard">
+            <font color="white"> </font>
+          </para>
+          <para style="Standard">
+            <font color="white"> </font>
+          </para>
+          <para style="Standard">
             <font color="white"> </font>
           </para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="568.0" style="Table2" rowHeights="255">
+    <blockTable colWidths="568.0" style="Table2">
       <tr>
         <td>
-          <blockTable colWidths="445.0,117.0" style="Table6">
-            <tr>
-              <td>
-                <para style="P16">[[voucher.partner_id.name]]</para>
-              </td>
-              <td>
-                <para style="P16">[[ formatLang(voucher.date , date=True) or '' ]] [[ voucher.journal_id.use_preprint_check and voucher.chk_seq or '' ]]</para>
+          <blockTable colWidths="369.0,97.0,97.0" style="Table6">
+            <tr>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="P3">[[ page['partner'] ]]</para>
+              </td>
+              <td>
+                <para style="P3">[[ formatLang(page['date'], date=True) or '' ]]</para>
+              </td>
+              <td>
+                <para style="P16">[[ not page['use_preprint_check'] and page['number'] or '' ]]</para>
               </td>
             </tr>
           </blockTable>
-          <blockTable colWidths="82.0,185.0,89.0,76.0,52.0,78.0" style="Table10">
+          <blockTable colWidths="81.0,186.0,83.0,81.0,54.0,78.0" style="Table10">
             <tr>
               <td>
-                <para style="P4">Due Date</para>
-              </td>
-              <td>
-                <para style="P4">Description</para>
-              </td>
-              <td>
-                <para style="P4">Original Amount</para>
-              </td>
-              <td>
-                <para style="P4">Open Balance</para>
-              </td>
-              <td>
-                <para style="P4">Discount</para>
-              </td>
-              <td>
-                <para style="P4">Payment</para>
+                <para style="P10">Due Date</para>
+              </td>
+              <td>
+                <para style="P10">Description</para>
+              </td>
+              <td>
+                <para style="P10">Original Amount</para>
+              </td>
+              <td>
+                <para style="P10">Balance Due</para>
+              </td>
+              <td>
+                <para style="P10">Discount</para>
+              </td>
+              <td>
+                <para style="P10">Payment</para>
               </td>
             </tr>
             <tr>
               <td>
-                <para style="P19">[[ repeatIn(get_lines(voucher.line_dr_ids),'l') ]] [[ formatLang(l['date_due'] ,date=True) or '' ]]</para>
-              </td>
-              <td>
-                <para style="P19">[[ l['name'] ]]</para>
-              </td>
-              <td>
-                <para style="P19">[[formatLang( l['amount_original']) ]]</para>
-              </td>
-              <td>
-                <para style="P19">[[ formatLang( l['amount_unreconciled']) ]]</para>
-              </td>
-              <td>
-                <para style="P19">
+                <para style="P8">
+                  <font face="Helvetica" size="2.0">[[ repeatIn(page['lines'],'l') ]]</font>
+                  <font face="Helvetica"> [[ formatLang(l['date_original'] ,date=True) or '' ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="P8">[[ l['name'] ]]</para>
+              </td>
+              <td>
+                <para style="P8">[[formatLang(l['amount_original']) ]]</para>
+              </td>
+              <td>
+                <para style="P8">[[ formatLang(l['amount_due']) ]]</para>
+              </td>
+              <td>
+                <para style="P8">
                   <font color="white"> </font>
                 </para>
               </td>
               <td>
-                <para style="P19">[[ formatLang (l['amount']) ]]</para>
+                <para style="P5">[[ formatLang(l['amount']) ]]</para>
               </td>
             </tr>
           </blockTable>
           <blockTable colWidths="485.0,77.0" style="Table11">
             <tr>
               <td>
-                <para style="P24">Check Amount</para>
+                <para style="P4">Check Amount</para>
               </td>
               <td>
-                <para style="P23">[[ formatLang (voucher.amount) ]]</para>
+                <para style="P3">[[ formatLang(page['amount']) or 'VOID' ]]</para>
               </td>
             </tr>
           </blockTable>
-          <para style="P3">
+          <para style="P2">
             <font color="white"> </font>
           </para>
         </td>
@@ -259,77 +384,100 @@
     <blockTable colWidths="568.0" style="Table3">
       <tr>
         <td>
-          <blockTable colWidths="446.0,116.0" style="Table7">
-            <tr>
-              <td>
-                <para style="P16">[[voucher.partner_id.name]]</para>
-              </td>
-              <td>
-                <para style="P16">[[ formatLang(voucher.date , date=True) or '' ]] [[ voucher.journal_id.use_preprint_check and voucher.chk_seq or '' ]]</para>
+          <blockTable colWidths="370.0,96.0,96.0" style="Table7">
+            <tr>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="Standard">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="P3">[[ page['partner'] or '' ]]</para>
+              </td>
+              <td>
+                <para style="P3">[[ formatLang(page['date'] , date=True) or '' ]]</para>
+              </td>
+              <td>
+                <para style="P16">[[ not page['use_preprint_check'] and page['number'] or '' ]]</para>
               </td>
             </tr>
           </blockTable>
           <blockTable colWidths="82.0,185.0,89.0,76.0,52.0,78.0" style="Table8">
             <tr>
               <td>
-                <para style="P4">Due Date</para>
-              </td>
-              <td>
-                <para style="P4">Description</para>
-              </td>
-              <td>
-                <para style="P4">Original Amount</para>
-              </td>
-              <td>
-                <para style="P4">Open Balance</para>
-              </td>
-              <td>
-                <para style="P4">Discount</para>
-              </td>
-              <td>
-                <para style="P4">Payment</para>
+                <para style="P10">Due Date</para>
+              </td>
+              <td>
+                <para style="P10">Description</para>
+              </td>
+              <td>
+                <para style="P10">Original Amount</para>
+              </td>
+              <td>
+                <para style="P10">Balance Due</para>
+              </td>
+              <td>
+                <para style="P10">Discount</para>
+              </td>
+              <td>
+                <para style="P10">Payment</para>
               </td>
             </tr>
             <tr>
               <td>
-                <para style="P19">[[ repeatIn(get_lines(voucher.line_dr_ids),'l') ]] [[ formatLang(l['date_due'] ,date=True) or '' ]]</para>
-              </td>
-              <td>
-                <para style="P19">[[ l['name'] ]]</para>
-              </td>
-              <td>
-                <para style="P19">[[ formatLang (l['amount_original']) ]]</para>
-              </td>
-              <td>
-                <para style="P19">[[ formatLang (l['amount_unreconciled']) ]]</para>
-              </td>
-              <td>
-                <para style="P19">
+                <para style="P8">
+                  <font face="Helvetica" size="2.0">[[ repeatIn(page['lines'],'l') ]]</font>
+                  <font face="Helvetica"> [[ formatLang(l['date_original'] ,date=True) or '' ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="P8">[[ l['name'] ]]</para>
+              </td>
+              <td>
+                <para style="P8">[[formatLang(l['amount_original']) ]]</para>
+              </td>
+              <td>
+                <para style="P8">[[ formatLang(l['amount_due']) ]]</para>
+              </td>
+              <td>
+                <para style="Standard">
                   <font color="white"> </font>
                 </para>
               </td>
               <td>
-                <para style="P19">[[ formatLang (l['amount']) ]]</para>
+                <para style="P8">[[ formatLang(l['amount']) ]]</para>
               </td>
             </tr>
           </blockTable>
           <blockTable colWidths="485.0,77.0" style="Table9">
             <tr>
               <td>
-                <para style="P17">Check Amount</para>
+                <para style="P4">Check Amount</para>
               </td>
               <td>
-                <para style="P16">[[ formatLang (voucher.amount) ]]</para>
+                <para style="P3">[[ formatLang (page['amount']) or 'VOID' ]]</para>
               </td>
             </tr>
           </blockTable>
-          <para style="P3">
+          <para style="Standard">
             <font color="white"> </font>
           </para>
         </td>
       </tr>
     </blockTable>
-    <para style="P2">
+    <para style="Standard">
       <font color="white"> </font>
     </para>
   </story>

=== modified file 'account_check_writing/report/check_print_top.sxw'
Binary files account_check_writing/report/check_print_top.sxw	2012-11-01 07:32:01 +0000 and account_check_writing/report/check_print_top.sxw	2013-11-19 00:05:44 +0000 differ
=== added file 'account_check_writing/res_company.py'
--- account_check_writing/res_company.py	1970-01-01 00:00:00 +0000
+++ account_check_writing/res_company.py	2013-11-19 00:05:44 +0000
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import osv, fields
+
+
+class res_company(osv.Model):
+
+    _inherit = "res.company"
+
+    _columns = {
+        'check_layout': fields.selection([
+            ('top', 'Check on Top'),
+            ('middle', 'Check in middle'),
+            ('bottom', 'Check on bottom'),
+            ], "Choose Check layout",
+            help="Check on top is compatible with Quicken, QuickBooks and Microsoft Money. Check in middle is compatible with Peachtree, ACCPAC and DacEasy. Check on bottom is compatible with Peachtree, ACCPAC and DacEasy only"),
+        'credit_section': fields.boolean('Display Credits Separately', help="Invoices and credits will be displayed in their respective section on the check stubs."),
+        'suppress_unpaid': fields.boolean('Suppress Unpaid Items', help="Do not print unpaid items on the check stubs."),
+        'multi_stub': fields.boolean('Multi-Pages Check Stub', help="This option allows you to print check details (stub) on multiple pages."),
+        }
+
+    _defaults = {
+        'check_layout': lambda *a: 'top',
+    }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account_check_writing/res_company_view.xml'
--- account_check_writing/res_company_view.xml	1970-01-01 00:00:00 +0000
+++ account_check_writing/res_company_view.xml	2013-11-19 00:05:44 +0000
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <!--
+            check format option in company
+        -->
+
+        <record id="check_format_company" model="ir.ui.view">
+            <field name="name">res.company.check.format</field>
+            <field name="model">res.company</field>
+            <field name="priority">17</field>
+            <field name="inherit_id" ref="base.view_company_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//group[@name='account_grp']" position="after">
+                    <group name="write_check" string="Checks">
+                        <field name="check_layout"/>
+                        <field name="multi_stub"/>
+                        <field name="credit_section" />
+                        <field name="suppress_unpaid" />
+                    </group>
+                </xpath>
+            </field>
+       </record>
+       
+    </data>
+</openerp>

=== added directory 'account_check_writing/static'
=== added directory 'account_check_writing/static/description'
=== added file 'account_check_writing/static/description/icon.png'
Binary files account_check_writing/static/description/icon.png	1970-01-01 00:00:00 +0000 and account_check_writing/static/description/icon.png	2013-11-19 00:05:44 +0000 differ
=== added directory 'account_check_writing/static/src'
=== added directory 'account_check_writing/test'
=== added file 'account_check_writing/test/account_check_writing_report.yml'
--- account_check_writing/test/account_check_writing_report.yml	1970-01-01 00:00:00 +0000
+++ account_check_writing/test/account_check_writing_report.yml	2013-11-19 00:05:44 +0000
@@ -0,0 +1,79 @@
+-
+  In order to test the PDF reports defined on an invoice, we will validate the check first.
+-
+  I Validate checkl by clicking on Validate button
+-
+  !workflow {model: account.voucher, action: proforma_voucher, ref: account_checkvoucher_01}
+-
+   I check that check has been posted and in posted state.
+-
+  !assert {model: account.voucher, id: account_checkvoucher_01}:
+    - state == 'posted'
+-
+  I create a check printing wizard with next default check number.
+-
+  !record {model: account.check.write, id: account_check_write_top_01}:
+    check_number: 1
+    force_number: False
+    force_overwrite: False
+-
+  I execute the print check wizrd to assign nunber to the check and will pirnt the default(top) report return by the wizard action.
+-
+  !python {model: account.check.write}: |
+    context.update({'active_model': 'account.voucher', 'active_id':ref('account_checkvoucher_01'), 'active_ids': [ref('account_checkvoucher_01')]})
+    report = self.print_check_write(cr, uid, [ref('account_check_write_top_01')], context=context)
+    import os
+    import openerp.report
+    from openerp import tools
+    assert report.get('report_name') == "account.print.check.top", 'expected check has to be Top check(account.print.check.top).'
+    data, format = openerp.report.render_report(cr, uid, [ref('account_checkvoucher_01')], report.get('report_name'), {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'account-report_check_top.'+format), 'wb+').write(data)
+-
+  I verify that check has been assigned a number.
+-
+  !assert {model: account.voucher, id: account_checkvoucher_01}:
+    - check_number != False
+-
+  In order to test the print top check report,  I call Print Check Button of the check, which returns the report action using which will pirnt the default(top) report.
+-
+  !python {model: account.voucher}: |
+    context.update({'active_model': 'account.voucher', 'active_id':ref('account_checkvoucher_01'), 'active_ids': [ref('account_checkvoucher_01')]})
+    report = self.print_check(cr, uid, [ref("account_checkvoucher_01")], context)
+    assert report.get('report_name') == "account.print.check.top", 'expected check has to be Top check(account.print.check.top).'
+    from openerp import tools
+    data, format = openerp.report.render_report(cr, uid, [ref('account_checkvoucher_01')], report.get('report_name'), {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'account-report_check_top.'+format), 'wb+').write(data)
+-
+  I set the default company check layput to Check on middle.
+-
+  !python {model: res.company}: |
+    self.write(cr, uid, [ref("base.main_company")], {'check_layout': 'middle'})
+-
+  In order to test the print middle check report,  I call Print Check Button of the check, which returns the report action using which will pirnt the default(middle) report.
+-
+  !python {model: account.voucher}: |
+    context.update({'active_model': 'account.voucher', 'active_id':ref('account_checkvoucher_01'), 'active_ids': [ref('account_checkvoucher_01')]})
+    report = self.print_check(cr, uid, [ref("account_checkvoucher_01")], context)
+    assert report.get('report_name') == "account.print.check.middle", 'expected check has to be Middle check(account.print.check.middle).'
+    from openerp import tools
+    data, format = openerp.report.render_report(cr, uid, [ref('account_checkvoucher_01')], report.get('report_name'), {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'account-report_check_middle.'+format), 'wb+').write(data)
+-
+  I set the default company check layput to Check on bottom'.
+-
+  !python {model: res.company}: |
+    self.write(cr, uid, [ref("base.main_company")], {'check_layout': 'bottom'})
+-
+  In order to test the print bottom check report,  I call Print Check Button of the check, which returns the report action using which will pirnt the default(bottom) report.
+-
+  !python {model: account.voucher}: |
+    context.update({'active_model': 'account.voucher', 'active_id':ref('account_checkvoucher_01'), 'active_ids': [ref('account_checkvoucher_01')]})
+    report = self.print_check(cr, uid, [ref("account_checkvoucher_01")], context)
+    assert report.get('report_name') == "account.print.check.bottom", 'expected check has to be Bottom check(account.print.check.bottom).'
+    from openerp import tools
+    data, format = openerp.report.render_report(cr, uid, [ref('account_checkvoucher_01')], report.get('report_name'), {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'account-report_check_bottom.'+format), 'wb+').write(data)

=== modified file 'account_check_writing/wizard/account_check_batch_printing.py'
--- account_check_writing/wizard/account_check_batch_printing.py	2013-04-15 10:23:49 +0000
+++ account_check_writing/wizard/account_check_batch_printing.py	2013-11-19 00:05:44 +0000
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-Today OpenERP S.A. (<http://www.openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -19,68 +19,115 @@
 #
 ##############################################################################
 
+from openerp.osv import osv, fields
 from openerp.tools.translate import _
 
-from openerp.osv import fields, osv
-
-class account_check_write(osv.osv_memory):
+CHECK_LAYOUT = {
+    'top': 'account.print.check.top',
+    'middle': 'account.print.check.middle',
+    'bottom': 'account.print.check.bottom',
+}
+
+
+class account_check_write(osv.TransientModel):
+
     _name = 'account.check.write'
-    _description = 'Prin Check in Batch'
+    _description = 'Print Check in Batch'
 
     _columns = {
-        'check_number': fields.integer('Next Check Number', required=True, help="The number of the next check number to be printed."),
+        'check_number': fields.integer('Check Sequence Number', required=True,
+                help="This is the number of the first check in the batch-print."),
+        'force_number': fields.boolean('Overwrite Check Numbers',
+                help="If checked, it will reassign a new check number from given sequence to the check(s) even if check(s) already have a number."),
+        'force_overwrite': fields.boolean('Adjust Sequence',
+                help="Use this if the default check number above is different than the next paper check number.\n- If checked, it will consider the check number above as the new default sequence.\n- Uncheck this if you are printing an exceptional batch."),
     }
 
+    def _get_sequence(self, cr, uid, ids, tolerate_noid=False, context=None):
+        """
+        Generic Method to fetch ir.sequence from voucher journal.
+        also tolerate the no seuquence condition, if needed e.g. default_get
+        """
+        voucher_pool = self.pool.get('account.voucher')
+        sequence_id = False
+        journal_id = voucher_pool.browse(cr, uid, context['active_id'], context=context).journal_id
+        if journal_id.check_sequence_id:
+            sequence_id = journal_id.check_sequence_id.id
+        elif not journal_id and tolerate_noid:
+            #if journal has no sequence we can use generic check sequence.
+            ref, sequence_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account_check_writing', 'seq_check_number')
+        else:
+            raise osv.except_osv(_('Error!'), _("No check number sequence defined for the journal : %s") % (journal_id.name))
+        return sequence_id
+
     def _get_next_number(self, cr, uid, context=None):
-        dummy, sequence_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account_check_writing', 'sequence_check_number')
-        return self.pool.get('ir.sequence').read(cr, uid, sequence_id, ['number_next'])['number_next']
+        """
+        Method will generate new sequence form active_id journal sequence.
+        @return: next sequence number to be used.
+        """
+        num_next = False
+        if context == None:
+            context = {}
+        if context.get('active_id') and context.get('active_model'):
+            sequence_id = self._get_sequence(cr, uid, context.get('active_id'), tolerate_noid=True, context=context)
+            num_next = self.pool.get('ir.sequence').read(cr, uid, sequence_id, ['number_next'])['number_next']
+        return num_next
 
     _defaults = {
         'check_number': _get_next_number,
-   }
+        'force_overwrite': True,
+    }
+
+    def _check_journal(self, cr, uid, checks, context=None):
+        journals = [check.journal_id.id for check in checks]
+        for check in checks:
+            if check.journal_id.type != "bank":
+                raise osv.except_osv(_("Warning"), _("Cannot perform operation. Voucher Journal type has to be Bank and Cheques."))
+        if len(set(journals)) > 1:
+            raise osv.except_osv(_("Warning"), _("You cannot batch-print checks from different journals in order to respect each journals sequence."))
+        states = [check.state for check in checks]
+        if "draft" in states:
+            raise osv.except_osv(_("Warning"), _("You cannot print draft checks. You have to validate them first."))
+        return True
 
     def print_check_write(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
-        voucher_obj = self.pool.get('account.voucher')
-        ir_sequence_obj = self.pool.get('ir.sequence')
-
-        #update the sequence to number the checks from the value encoded in the wizard
-        dummy, sequence_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account_check_writing', 'sequence_check_number')
-        increment = ir_sequence_obj.read(cr, uid, sequence_id, ['number_increment'])['number_increment']
-        new_value = self.browse(cr, uid, ids[0], context=context).check_number
-        ir_sequence_obj.write(cr, uid, sequence_id, {'number_next': new_value})
-
-        #validate the checks so that they get a number
+        voucher_pool = self.pool.get('account.voucher')
+        sequence_pool = self.pool.get('ir.sequence')
+        transient_record = self.browse(cr, uid, ids[0], context=context)
+        new_value = transient_record.check_number
         voucher_ids = context.get('active_ids', [])
-        for check in voucher_obj.browse(cr, uid, voucher_ids, context=context):
-            new_value += increment
-            if check.number:
-                raise osv.except_osv(_('Error!'),_("One of the printed check already got a number."))
-        voucher_obj.proforma_voucher(cr, uid, voucher_ids, context=context)
-
-        #update the sequence again (because the assignation using next_val was made during the same transaction of
-        #the first update of sequence)
-        ir_sequence_obj.write(cr, uid, sequence_id, {'number_next': new_value})
-
-        #print the checks
-        check_layout_report = {
-            'top' : 'account.print.check.top',
-            'middle' : 'account.print.check.middle',
-            'bottom' : 'account.print.check.bottom',
-        }
-        check_layout = voucher_obj.browse(cr, uid, voucher_ids[0], context=context).company_id.check_layout
-        if not check_layout:
-            check_layout = 'top'
+        checks = voucher_pool.browse(cr, uid, voucher_ids, context=context)
+        self._check_journal(cr, uid, checks, context)
+        sequence = self._get_sequence(cr, uid, checks[0].id, context=context)
+        #save the current start of the squence needed in case of force number 
+        #and update back later when job is done, this to be consistant.
+        old_next_start = sequence_pool.read(cr, uid, sequence, ['number_next'], context)['number_next']
+        #update sequence with force number for consistant numbering.
+        sequence_pool.write(cr, uid, sequence, {'number_next': new_value}, context=context)
+        #again fetch the increment and next number to be used in check number assigment.
+        requence_rec = sequence_pool.read(cr, uid, sequence, ['number_next', 'number_increment'], context=context)
+        new_next_start, increment = requence_rec['number_next'], requence_rec['number_increment']
+        for check in checks:
+            new_value = sequence_pool.next_by_id(cr, uid, sequence, context)
+            if check.check_number and not transient_record.force_number:
+                raise osv.except_osv(_('Error!'), _("At least one of the checks in the batch already has a check number. If you want to overwrite their number in this batch-print, select the corresponding checkbox."))
+            else:
+                voucher_pool.write(cr, uid, [check.id], {"check_number": new_value, "check_done": True}, context=context)
+                new_next_start += increment
+        up_number = new_next_start if transient_record.force_overwrite else old_next_start
+        sequence_pool.write(cr, uid, sequence, {'number_next': up_number}, context=context)
+        check_layout = voucher_pool.browse(cr, uid, voucher_ids[0], context=context).company_id.check_layout or 'top'
         return {
-            'type': 'ir.actions.report.xml', 
-            'report_name':check_layout_report[check_layout],
+            'type': 'ir.actions.report.xml',
+            'report_name': CHECK_LAYOUT[check_layout],
             'datas': {
-                'model':'account.voucher',
+                'model': 'account.voucher',
                 'ids': voucher_ids,
                 'report_type': 'pdf'
-                },
+            },
             'nodestroy': True
-            }
-
-
+        }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account_check_writing/wizard/account_check_batch_printing_view.xml'
--- account_check_writing/wizard/account_check_batch_printing_view.xml	2012-12-06 11:18:25 +0000
+++ account_check_writing/wizard/account_check_batch_printing_view.xml	2013-11-19 00:05:44 +0000
@@ -1,28 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="0">
-
+    <data>
         <record id="view_account_check_write" model="ir.ui.view">
-            <field name="name">account.check.form</field>
+            <field name="name">Print Check(s) in Batch Form</field>
             <field name="model">account.check.write</field>
             <field name="arch" type="xml">
                 <form string="Check" version="7.0">
-                    <group col="4">
+                    <group>
                         <field name="check_number"/>
+                        <field name="force_number"/>
+                        <field name="force_overwrite"/>
                     </group>
                     <footer>
-                        <button name="print_check_write" string="Print Check" type="object" class="oe_highlight"/> or
+                        <button name="print_check_write" string="Print Check(s)" type="object" class="oe_highlight"/> or
                         <button string="Cancel" class="oe_link" special="cancel"/>
                     </footer>
                 </form>
             </field>
         </record>
 
+        <record id="action_view_account_check_write" model="ir.actions.act_window">
+            <field name="name">Print Check(s) in Batch</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.check.write</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_account_check_write"/>
+            <field name="context">{"print_single":True}</field>
+            <field name="target">new</field>
+        </record>
+
         <act_window id="action_account_check_write"
-            multi="True"
-            name="Print Check in Batch"
-            res_model="account.check.write" src_model="account.voucher"
-            view_mode="form" target="new" view_type="form" /> 
+                    name="Print Check(s) in Batch"
+                    res_model="account.check.write" 
+                    src_model="account.voucher"
+                    view_mode="form" 
+                    target="new" 
+                    view_type="form" 
+                    key2="client_print_multi"/> 
 
     </data>
 </openerp>