[MERGE]: merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2

bzr revid: atp@tinyerp.co.in-20100607085719-1zq10swn0bp4ajso

addons/account/__init__.py

@@ -32,5 +32,6 @@ import report
 import product
 import sequence
 import company
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

addons/account/__openerp__.py

@@ -121,6 +121,10 @@ module named account_voucherss
         'demo/account_minimal.xml',
         'account_unit_test.xml',
     ],
+    'test': [
+        'test/account_customer_invoice.yml',
+        'test/account_supplier_invoice.yml',
+    ],
     'installable': True,
     'active': False,
     'certificate': '0080331923549',

addons/account/account.py

@@ -124,10 +124,10 @@ class account_account_type(osv.osv):
         'sign': fields.selection([(-1, 'Negative'), (1, 'Positive')], 'Sign on Reports', required=True, help='Allows you to change the sign of the balance amount displayed in the reports, so that you can see positive figures instead of negative ones in expenses accounts.'),
         'report_type':fields.selection([
             ('none','/'),
-            ('income','Profilt & Loss (Income Accounts)'),
-            ('expanse','Profilt & Loss (Expanse Accounts)'),
+            ('income','Profit & Loss (Income Accounts)'),
+            ('expense','Profit & Loss (Expense Accounts)'),
             ('asset','Balance Sheet (Assets Accounts)'),
-            ('liabilities','Balance Sheet (Liabilities Accounts)')
+            ('liability','Balance Sheet (Liability Accounts)')
         ],'Type Heads', select=True, readonly=False, help="According value related accounts will be display on respective reports (Balance Sheet Profit & Loss Account)"),
         'parent_id':fields.many2one('account.account.type', 'Parent Type', required=False),
         'child_ids':fields.one2many('account.account.type', 'parent_id', 'Child Types', required=False),
@@ -171,6 +171,19 @@ class account_account(osv.osv):
     _description = "Account"
     _parent_store = True
 
+    def _get_children_and_consol(self, cr, uid, ids, context={}):
+        ids2=[]
+        temp=[]
+        read_data= self.read(cr, uid, ids,['id','child_id'], context)
+        for data in read_data:
+            ids2.append(data['id'])
+            if data['child_id']:
+                temp=[]
+                for x in data['child_id']:
+                    temp.append(x)
+                ids2 += self._get_children_and_consol(cr, uid, temp, context)
+        return ids2
+
     def search(self, cr, uid, args, offset=0, limit=None, order=None,
             context=None, count=False):
         if context is None:
@@ -297,6 +310,17 @@ class account_account(osv.osv):
 
         return result
 
+    def _get_level(self, cr, uid, ids, field_name, arg, context={}):
+        res={}
+        accounts = self.browse(cr, uid, ids)
+        for account in accounts:
+            level = 0
+            if account.parent_id :
+                obj = self.browse(cr, uid, account.parent_id.id)
+                level = obj.level + 1
+            res[account.id] = level
+        return res
+
     _columns = {
         'name': fields.char('Name', size=128, required=True, select=True),
         'currency_id': fields.many2one('res.currency', 'Secondary Currency', help="Forces all moves for this account to have this secondary currency."),
@@ -343,6 +367,7 @@ class account_account(osv.osv):
         'check_history': fields.boolean('Display History',
             help="Check this box if you want to print all entries when printing the General Ledger, "\
             "otherwise it will only print its balance."),
+        'level': fields.function(_get_level, string='Level', method=True, store=True, type='integer'),
     }
 
     def _default_company(self, cr, uid, context={}):
@@ -452,7 +477,7 @@ class account_account(osv.osv):
     def _check_moves(self, cr, uid, ids, method, context):
         line_obj = self.pool.get('account.move.line')
         account_ids = self.search(cr, uid, [('id', 'child_of', ids)])
-        
+
         if line_obj.search(cr, uid, [('account_id', 'in', account_ids)]):
             if method == 'write':
                 raise osv.except_osv(_('Error !'), _('You cannot deactivate an account that contains account moves.'))
@@ -486,7 +511,7 @@ class account_account(osv.osv):
             context = {}
         if 'active' in vals and not vals['active']:
             self._check_moves(cr, uid, ids, "write", context)
-        if 'type' in vals.keys(): 
+        if 'type' in vals.keys():
             self._check_allow_type_change(cr, uid, ids, vals['type'], context=context)
         return super(account_account, self).write(cr, uid, ids, vals, context=context)
 
@@ -534,7 +559,7 @@ class account_journal(osv.osv):
     _columns = {
         'name': fields.char('Journal Name', size=64, required=True, translate=True),
         'code': fields.char('Code', size=16),
-        'type': fields.selection([('sale', 'Sale'), ('purchase', 'Purchase'), ('cash', 'Cash'), ('general', 'General'), ('situation', 'Situation')], 'Type', size=32, required=True,
+        'type': fields.selection([('sale', 'Sale'), ('purchase', 'Purchase'), ('expense', 'Expense'), ('cash', 'Cash'), ('bank', 'Bank'), ('general', 'General'), ('situation', 'Situation')], 'Type', size=32, required=True,
                                  help="Select 'Sale' for Sale journal to be used at the time of making invoice."\
                                  " Select 'Purchase' for Purchase Journal to be used at the time of approving purchase order."\
                                  " Select 'Cash' to be used at the time of making payment."\
@@ -658,7 +683,7 @@ class account_fiscalyear(osv.osv):
             else:
                 return False
         return ids[0]
-    
+
     def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
         if args is None:
             args = []
@@ -670,7 +695,7 @@ class account_fiscalyear(osv.osv):
         if not ids:
             ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit)
         return self.name_get(cr, user, ids, context=context)
-    
+
 account_fiscalyear()
 
 class account_period(osv.osv):
@@ -746,7 +771,7 @@ class account_period(osv.osv):
                     cr.execute('update account_journal_period set state=%s where period_id=%s', (mode, id))
                     cr.execute('update account_period set state=%s where id=%s', (mode, id))
         return True
-    
+
     def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
         if args is None:
             args = []
@@ -892,7 +917,7 @@ class account_move(osv.osv):
         'to_check': fields.boolean('To Be Verified'),
         'partner_id': fields.related('line_id', 'partner_id', type="many2one", relation="res.partner", string="Partner"),
         'amount': fields.function(_amount_compute, method=True, string='Amount', digits_compute=dp.get_precision('Account'), type='float', fnct_search=_search_amount),
-        'date': fields.date('Date', required=True),
+        'date': fields.date('Date', required=True, states={'posted':[('readonly',True)]}),
         'type': fields.selection([
             ('pay_voucher','Cash Payment'),
             ('bank_pay_voucher','Bank Payment'),
@@ -902,7 +927,7 @@ class account_move(osv.osv):
             ('journal_sale_vou','Journal Sale'),
             ('journal_pur_voucher','Journal Purchase'),
             ('journal_voucher','Journal Voucher'),
-        ],'Type', readonly=True, select=True, states={'draft':[('readonly',False)]}),
+            ],'Entry Type', select=True , size=128, readonly=True, states={'draft':[('readonly',False)]}),
         'narration':fields.text('Narration', readonly=True, select=True, states={'draft':[('readonly',False)]}),
         'company_id': fields.related('journal_id','company_id',type='many2one',relation='res.company',string='Company',store=True),
     }
@@ -1350,7 +1375,7 @@ class account_tax_code(osv.osv):
                 return False
             level -= 1
         return True
-    
+
 
     def copy(self, cr, uid, id, default=None, context=None):
         if default is None:
@@ -1358,7 +1383,7 @@ class account_tax_code(osv.osv):
         default = default.copy()
         default.update({'line_ids': []})
         return super(account_tax_code, self).copy(cr, uid, id, default, context)
-    
+
     _constraints = [
         (_check_recursion, 'Error ! You can not create recursive accounts.', ['parent_id'])
     ]
@@ -1542,8 +1567,42 @@ class account_tax(osv.osv):
                 cur_price_unit+=amount2
         return res
 
-    def compute(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None):
+    def compute_all(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None):
+        """
+        RETURN: {
+                'total': 0.0,                # Total without taxes
+                'total_included: 0.0,        # Total with taxes
+                'taxes': []                  # List of taxes, see compute for the format
+            }
+        """
+        precision = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
+        totalin = totalex = round(price_unit * quantity, precision)
+        tin = []
+        tex = []
+        for tax in taxes:
+            if tax.price_include:
+                tin.append(tax)
+            else:
+                tex.append(tax)
+        tin = self.compute_inv(cr, uid, tin, price_unit, quantity, address_id=address_id, product=product, partner=partner)
+        for r in tin:
+            totalex -= r['amount']
+        tex = self._compute(cr, uid, tex, totalex/quantity, quantity, address_id=address_id, product=product, partner=partner)
+        for r in tex:
+            totalin += r['amount']
+        return {
+            'total': totalex,
+            'total_included': totalin,
+            'taxes': tin + tex
+        }
 
+    def compute(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None):
+        logger = netsvc.Logger()
+        logger.notifyChannel("warning", netsvc.LOG_WARNING,
+            "Deprecated, use compute_all(...)['taxes'] instead of compute(...) to manage prices with tax included")
+        return self._compute(cr, uid, taxes, price_unit, quantity, address_id, product, partner)
+
+    def _compute(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None):
         """
         Compute tax values for given PRICE_UNIT, QUANTITY and a buyer/seller ADDRESS_ID.
 
@@ -1560,7 +1619,6 @@ class account_tax(osv.osv):
             else:
                 r['amount'] = round(r['amount'] * quantity, self.pool.get('decimal.precision').precision_get(cr, uid, 'Account'))
                 total += r['amount']
-
         return res
 
     def _unit_compute_inv(self, cr, uid, taxes, price_unit, address_id=None, product=None, partner=None):
@@ -1940,13 +1998,12 @@ class account_add_tmpl_wizard(osv.osv_memory):
         if not tids or not tids[0]['parent_id']:
             return False
         ptids = tmpl_obj.read(cr, uid, [tids[0]['parent_id'][0]],['code'])
+        res = None
         if not ptids or not ptids[0]['code']:
             raise osv.except_osv(_('Error !'), _('Cannot locate parent code for template account!'))
             res = acc_obj.search(cr,uid,[('code','=',ptids[0]['code'])])
-        if res:
-            return res[0]
-        else:
-            return False
+
+        return res and res[0] or False
 
     _columns = {
         'cparent_id':fields.many2one('account.account', 'Parent target', help="Creates an account with the selected template under this existing parent.", required=True),

addons/account/account_analytic_line.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -43,22 +43,22 @@ class account_analytic_line(osv.osv):
     _defaults = {
         'date': lambda *a: time.strftime('%Y-%m-%d'),
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', context=c),
-    }
+                }
     _order = 'date'
-    
+
     def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
         if context is None:
             context = {}
 
         if context.get('from_date',False):
             args.append(['date', '>=',context['from_date']])
-            
+
         if context.get('to_date',False):
             args.append(['date','<=',context['to_date']])
-            
+
         return super(account_analytic_line, self).search(cr, uid, args, offset, limit,
                 order, context=context, count=count)
-        
+
     def _check_company(self, cr, uid, ids):
         lines = self.browse(cr, uid, ids)
         for l in lines:
@@ -68,7 +68,7 @@ class account_analytic_line(osv.osv):
     _constraints = [
 #        (_check_company, 'You can not create analytic line that is not in the same company than the account line', ['account_id'])
     ]
-    
+
     # Compute the cost based on the price type define into company
     # property_valuation_price_type property
     def on_change_unit_amount(self, cr, uid, id, prod_id, unit_amount,company_id,
@@ -90,7 +90,7 @@ class account_analytic_line(osv.osv):
                                 (prod.name, prod.id,))
             if not company_id:
                 company_id=company_obj._company_default_get(cr, uid, 'account.analytic.line', context)
-      
+
             # Compute based on pricetype
             pricetype=self.pool.get('product.price.type').browse(cr,uid,company_obj.browse(cr,uid,company_id).property_valuation_price_type.id)
             # Take the company currency as the reference one
@@ -164,10 +164,10 @@ timesheet_invoice()
 class res_partner(osv.osv):
     """ Inherits partner and adds contract information in the partner form """
     _inherit = 'res.partner'
-    
+
     _columns = {
                 'contract_ids': fields.one2many('account.analytic.account', \
-                                                    'partner_id', 'Contracts', readonly=True), 
+                                                    'partner_id', 'Contracts', readonly=True),
                 }
 
 res_partner()

addons/account/account_invoice_view.xml

@@ -63,6 +63,7 @@
                             <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)]" name="account_analytic_id" groups="base.group_user,base.group_extended"/>
                             <newline/>
                             <field name="price_subtotal"/>
+
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             <field colspan="4" name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]"/>
                         </page>
@@ -141,11 +142,12 @@
             <field name="priority">2</field>
             <field name="arch" type="xml">
                 <form string="Supplier invoice">
-                    <group col="6" colspan="4">
+                    <group col="8" colspan="4">
                         <field domain="[('type', '=', 'purchase')]" name="journal_id"/>
                         <field name="number" readonly="1"/>
                         <field name="type" invisible="1"/>
-                        <field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)"/>
+                        <field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
+                        <button name="%(action_account_change_currency)d" type="action" icon="gtk-apply" string="Change"/>
                         <newline/>
                         <field name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank,company_id)" context="{'default_customer': 0}"/>
                         <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
@@ -201,9 +203,11 @@
                                 <field name="residual"/>
                                 <group col="3" colspan="4">
                                     <button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-apply"/>
+                                    <button name="%(action_account_invoice_pay)d" type='action' string='Pay Invoice' states='open' icon="gtk-ok"/>
                                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
                                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
                                     <button name="%(action_account_state_open)d" type='action' string='Re-Open' states='paid' icon="gtk-convert"/>
+                                    <button name="%(action_account_invoice_refund)d" type='action' string='Credit Note' states='paid' icon="gtk-execute"/>
                                 </group>
                             </group>
                         </page>
@@ -247,22 +251,22 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Invoice">
-                    <group colspan="4" col="6">
-                        <field name="journal_id" groups="base.group_user"/>
-                        <field name="number"/>
-                        <field name="type" invisible="1"/>
-                        <field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)"/>
-                        <newline/>
-                        <field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank,company_id)" groups="base.group_user"/>
-                        <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
-                        <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
-                        <newline/>
-
-                        <field name="date_invoice"/>
-                        <field name="period_id" groups="base.group_user"/>
-                        <group colspan="2" col="1" groups="base.group_user">
-                            <label align="0.0" string="(keep empty to use the current period)"/>
-                        </group>
+                    <group colspan="4" col="8">
+                    <field name="journal_id" groups="base.group_user"/>
+                    <field name="number"/>
+                    <field name="type" invisible="1"/>
+                    <field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
+                    <button name="%(action_account_change_currency)d" type="action" icon="gtk-apply" string="Change Currency"/>
+                    <newline/>
+                    <field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank,company_id)" groups="base.group_user"/>
+                    <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
+                    <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
+                    <newline/>
+                    <field name="date_invoice"/>
+                    <field name="period_id" groups="base.group_user"/>
+                    <group colspan="2" col="1" groups="base.group_user">
+                        <label align="0.0" string="(keep empty to use the current period)"/>
+                    </group>
                     </group>
                     <notebook colspan="4">
                         <page string="Invoice">
@@ -290,12 +294,14 @@
                                 <field name="amount_total"/>
                                 <field name="state"/>
                                 <field name="residual"/>
-                                <group col="3" colspan="4" groups="base.group_user">
+                                <group col="4" colspan="4" groups="base.group_user">
                                     <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="gtk-print"/>
                                     <button name="invoice_open" states="draft,proforma2" string="Create" icon="gtk-execute"/>
+                                    <button name="%(action_account_invoice_pay)d" type='action' string='Pay Invoice' states='open' icon="gtk-ok"/>
                                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
                                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
                                     <button name='%(action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert"/>
+                                    <button name="%(action_account_invoice_refund)d" type='action' string='Credit Note' states='paid' icon="gtk-execute"/>
                                 </group>
                             </group>
                         </page>
@@ -478,8 +484,23 @@
         <act_window domain="[('journal_id','=',active_id),('state','!=','draft'),('reconciled','=',False)]" id="act_account_journal_2_account_invoice_opened" name="Unpaid invoices" res_model="account.invoice" src_model="account.journal"/>
 
         <act_window domain="[('account_analytic_id', '=', active_id)]" id="act_account_analytic_account_2_account_invoice_line" name="Invoice lines" res_model="account.invoice.line" src_model="account.analytic.account"/>
-		
-		<act_window domain="[('partner_id', '=', partner_id), ('account_id.type', 'in', ['receivable', 'payable']), ('reconcile_id','=',False)]" id="act_account_invoice_account_move_unreconciled" name="Unreconciled Receivables &amp; Payables" res_model="account.move.line" src_model="account.invoice"/>
 
+        <act_window domain="[('partner_id', '=', partner_id), ('account_id.type', 'in', ['receivable', 'payable']), ('reconcile_id','=',False)]" id="act_account_invoice_account_move_unreconciled" name="Unreconciled Receivables &amp; Payables" res_model="account.move.line" src_model="account.invoice"/>
+
+        <!--  Partners inherited form -->
+
+        <record id="view_invoice_partner_info_form" model="ir.ui.view">
+            <field name="name">res.partner.invoice.info.inherit</field>
+            <field name="model">res.partner</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="arch" type="xml">
+                <notebook position="inside">
+                    <page string="Account Info">
+                        <field name="invoice_ids" colspan="4" nolabel="1" context="{'group_by':'product_id'}"/>
+                    </page>
+                </notebook>
+            </field>
+        </record>
     </data>
 </openerp>

addons/account/account_report.xml

@@ -23,21 +23,30 @@
         <report auto="False" id="account_intracom" menu="False" model="account.move.line" name="account.intracom" string="IntraCom"/>
 
         <report id="account_move_line_list" model="account.tax.code" name="account.tax.code.entries" rml="account/report/account_tax_code.rml" string="All Entries"/>
-
+        
         <report
-        	auto="False"
-        	id="account_vat_declaration"
-        	menu="False"
-        	model="account.tax.code"
-        	name="account.vat.declaration"
-        	rml="account/report/tax_report.rml"
-        	string="Taxes Report"/>
-
+            auto="False"
+            id="account_vat_declaration"
+            menu="False"
+            model="account.tax.code"
+            name="account.vat.declaration"
+            rml="account/report/tax_report.rml"
+            string="Taxes Report"/>
+        
+        <report id="report_account_voucher_new"
+            string="Print Voucher"
+            model="account.move"
+            name="account.move.voucher"
+            rml="account/report/voucher_print.rml"
+            auto="False"
+            header = "False"
+            menu="True"/>
+        
         <menuitem
             id="menu_tax_report"
             name="Taxes"
             parent="account.menu_finance_generic_reporting" sequence="3"/>
-
+        
 <!--        <wizard
             id="wizard_vat_declaration"
             menu="False"
@@ -68,20 +77,20 @@
 
 
         <report id="account_account_balance_compare"
-			string="Account balance"
-			model="account.account"
-			name="account.balance.account.balance"
-			rml="account/report/compare_account_balance.rml"
-			auto="False"
-			menu="False"/>
+            string="Account balance"
+            model="account.account"
+            name="account.balance.account.balance"
+            rml="account/report/compare_account_balance.rml"
+            auto="False"
+            menu="False"/>
 
-		<report id="account_account_balance_landscape"
-			string="Account balance"
-			model="account.account"
-			name="account.account.balance.landscape"
-			rml="account/report/account_balance_landscape.rml"
-			auto="False"
-			menu="False"/>
+        <report id="account_account_balance_landscape"
+            string="Account balance"
+            model="account.account"
+            name="account.account.balance.landscape"
+            rml="account/report/account_balance_landscape.rml"
+            auto="False"
+            menu="False"/>
 
         <!--
 

addons/account/account_view.xml

@@ -135,8 +135,10 @@
                             <field name="check_history"/>
                             <field name="type" select="1"/>
                             <newline/>
-                            <field colspan="4" name="tax_ids" domain="[('parent_id','=',False)]"/>
-                            <field name="child_consol_ids" colspan="4" attrs="{'readonly':[('type','!=','consolidation')]}"/>
+                            <separator string="Default Taxes" colspan="4"/>
+                            <field colspan="4" name="tax_ids" nolabel="1" domain="[('parent_id','=',False)]"/>
+                            <separator string="Consolidated Children" colspan="4"/>
+                            <field name="child_consol_ids" colspan="4" nolabel="1" attrs="{'readonly':[('type','!=','consolidation')]}"/>
                         </page>
                         <page string="Notes">
                             <field colspan="4" name="note" nolabel="1"/>
@@ -146,7 +148,7 @@
             </field>
         </record>
 
-		<record id="view_account_search" model="ir.ui.view">
+        <record id="view_account_search" model="ir.ui.view">
             <field name="name">account.account.search</field>
             <field name="model">account.account</field>
             <field name="type">search</field>
@@ -239,7 +241,7 @@
             <field name="arch" type="xml">
                 <form string="Journal View">
                     <field colspan="4" name="name" select="1"/>
-                    <field colspan="4" name="columns_id" widget="one2many_list"/>
+                    <field colspan="4" name="columns_id" nolabel="1" widget="one2many_list"/>
                 </form>
             </field>
         </record>
@@ -277,20 +279,41 @@
 
                     <notebook colspan="4">
                         <page string="General Information">
-                            <field name="view_id"/>
-                            <field name="currency"/>
-                            <field name="sequence_id"/>
-                            <field name="invoice_sequence_id"/>
-                            <field name="default_debit_account_id" attrs="{'required':[('type','=','cash')]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                            <field name="default_credit_account_id" attrs="{'required':[('type','=','cash')]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                            <field name="user_id" groups="base.group_extended"/>
-                            <field name="allow_date" groups="base.group_extended"/>
-                            <field name="company_id" groups="base.group_multi_company"/>
-                            <newline/>
-                            <field name="centralisation"/>
-                            <field name="group_invoice_lines"/>
-                            <field name="update_posted"/>
-                            <field name="entry_posted"/>
+                            <group colspan="2" col="2">
+                                <separator string="Journal View" colspan="4"/>
+                                <field name="view_id"/>
+                            </group>
+
+                            <group colspan="2" col="2">
+                                <separator string="Sequence" colspan="4"/>
+                                <field name="sequence_id"/>
+                                <field name="invoice_sequence_id"/>
+                            </group>
+
+                            <group colspan="2" col="2">
+                                <separator string="Accounts" colspan="4"/>
+                                <field name="default_debit_account_id" attrs="{'required':[('type','=','cash')]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                                <field name="default_credit_account_id" attrs="{'required':[('type','=','cash')]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                            </group>
+
+                            <group colspan="2" col="2">
+                                <separator string="Validations" colspan="4"/>
+                                <field name="allow_date" groups="base.group_extended"/>
+                            </group>
+
+                            <group colspan="2" col="2">
+                                <separator string="Company" colspan="4"/>
+                                <field name="company_id" groups="base.group_multi_company"/>
+                                <field name="user_id" groups="base.group_extended"/>
+                                <field name="currency"/>
+                            </group>
+                            <group colspan="2" col="2">
+                                <separator string="Other Configuration" colspan="4"/>
+                                <field name="centralisation"/>
+                                <field name="group_invoice_lines"/>
+                                <field name="update_posted"/>
+                                <field name="entry_posted"/>
+                            </group>
                         </page>
                         <page string="Entry Controls">
                             <separator colspan="4" string="Accounts Type Allowed (empty for no control)"/>
@@ -342,7 +365,7 @@
                     <group colspan="2" col="3">
 <!--                        <button name="%(action_view_account_statement_from_invoice)d"-->
 <!--                            string="Import Invoice" type="action" attrs="{'invisible':[('state','=','confirm')]}" icon="gtk-open"/>-->
-                    	<button name="button_import_invoice" string="Import Invoice" attrs="{'invisible':[('state','=','confirm')]}" type="object" icon="gtk-apply"/>
+                        <button name="button_import_invoice" string="Import Invoice" attrs="{'invisible':[('state','=','confirm')]}" type="object" icon="gtk-apply"/>
                     </group>
                     <newline/>
                     <field name="balance_start"/>
@@ -600,7 +623,7 @@
             <field name="arch" type="xml">
                 <tree string="Account Tax">
                     <field name="name"/>
-                    <field name="price_include"/>
+                    <field name="price_include" groups="base.group_extended"/>
                     <field name="description"/>
                 </tree>
             </field>
@@ -806,7 +829,7 @@
             </field>
         </record>
 
-		<record id="view_account_move_line_filter" model="ir.ui.view">
+        <record id="view_account_move_line_filter" model="ir.ui.view">
             <field name="name">Entry Lines</field>
             <field name="model">account.move.line</field>
             <field name="type">search</field>
@@ -860,6 +883,7 @@
                     <field name="ref"/>
                     <field name="journal_id"/>
                     <field name="period_id"/>
+                    <field name="type" invisible=" not context.get('set_visible',True)"/>
                     <field name="partner_id"/>
                     <field name="line_id"/>
                     <field name="to_check" groups="base.group_extended"/>
@@ -874,72 +898,76 @@
             <field name="model">account.move</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Account Entry">
+                <form string="Journal Entries">
                     <group colspan="4" col="6">
-                    <field name="name" select="1" readonly="True"/>
-                    <field name="period_id"/>
-                    <field name="journal_id" select="1"/>
-                    <field name="company_id" required="1" groups="base.group_multi_company"/>
-                    <field name="date" select="1"/>
-                    <field name="ref" select="1"/>
-                    <field name="to_check"/>
-                    <field name="type" groups="base.group_extended"/>
+                        <field name="name" select="1" colspan="4" readonly="True"/>
+                        <field name="journal_id" select="1"/>
+                        <field name="period_id"/>
+                        <field name="type"/>
+                        <field name="ref" select="1"/>
                     </group>
-                    <field name="partner_id" invisible="1" select="1"/>
-                    <field name="amount" invisible="1" select="1"/>
+                    <notebook colspan="4">
+                        <page string="Journal Entries Lines">
+                            <field colspan="4" height="200" name="line_id" nolabel="1" widget="one2many_list" default_get="{'lines':line_id ,'journal':journal_id }">
+                                <form string="Account Entry Line">
+                                    <separator colspan="4" string="General Information"/>
+                                    <field name="name" select="1"/>
+                                    <field name="account_id" domain="[('journal_id','=',parent.journal_id)]"/>
+                                    <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,parent.date,parent.journal_id)"/>
 
-                    <field colspan="4" height="250" name="line_id" nolabel="1" widget="one2many_list" default_get="{'lines':line_id ,'journal':journal_id }">
-                        <form string="Account Entry Line">
-                            <separator colspan="4" string="General Information"/>
-                            <field name="name" select="1"/>
-                            <field name="account_id" domain="[('journal_id','=',parent.journal_id)]"/>
-                            <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,parent.date,parent.journal_id)"/>
+                                    <field name="debit" select="1"/>
+                                    <field name="credit" select="1"/>
+                                    <field name="date" select="1"/>
 
-                            <field name="debit" select="1"/>
-                            <field name="credit" select="1"/>
-                            <field name="date" select="1"/>
+                                    <separator colspan="4" string="Optional Information"/>
+                                    <field name="currency_id"/>
+                                    <field name="amount_currency"/>
+                                    <field name="quantity" select="1"/>
+                                    <newline/>
+                                    <field name="date_maturity"/>
+                                    <field name="date_created"/>
 
-                            <separator colspan="4" string="Optional Information"/>
-                            <field name="currency_id"/>
-                            <field name="amount_currency"/>
-                            <field name="quantity" select="1"/>
-                            <newline/>
-                            <field name="date_maturity"/>
-                            <field name="date_created"/>
-
-                            <separator colspan="4" string="State"/>
-                            <field name="reconcile_id"/>
-                            <field name="reconcile_partial_id"/>
-                            <field name="statement_id"/>
-                            <field name="state"/>
-                        </form>
-                        <tree editable="top" string="Account Entry Line">
-                            <field name="ref"/>
-                            <field name="invoice"/>
-                            <field name="name"/>
-                            <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,parent.date,parent.journal_id)"/>
-                            <field name="account_id" domain="[('journal_id','=',parent.journal_id)]"/>
-                            <field name="date_maturity"/>
-                            <field name="debit" sum="Total Debit"/>
-                            <field name="credit" sum="Total Credit"/>
-                            <field name="analytic_account_id"/>
-                            <field name="amount_currency" groups="base.group_extended"/>
-                            <field name="currency_id" groups="base.group_extended"/>
-                            <field name="tax_code_id"/>
-                            <field name="tax_amount"/>
-                            <field name="state"/>
-                            <field name="reconcile_id"/>
-                            <field name="reconcile_partial_id" groups="base.group_extended"/>
-                        </tree>
-                    </field>
-                    <separator colspan="4" string="Narration"/>
-                    <field name="narration" colspan="4" nolabel="1"/>
-                    <separator colspan="4" string="State"/>
-                    <field name="state" select="1"/>
-                    <group col="2" colspan="2">
-                        <button name="button_validate" states="draft" string="Validate" type="object" icon="gtk-execute"/>
-                        <button name="button_cancel" states="posted" string="Cancel" type="object" icon="gtk-cancel"/>
-                    </group>
+                                    <separator colspan="4" string="State"/>
+                                    <field name="reconcile_id"/>
+                                    <field name="reconcile_partial_id"/>
+                                    <field name="statement_id"/>
+                                    <field name="state"/>
+                                </form>
+                                <tree editable="top" string="Account Entry Line">
+                                    <field name="ref"/>
+                                    <field name="invoice"/>
+                                    <field name="name"/>
+                                    <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,parent.date,parent.journal_id)"/>
+                                    <field name="account_id" domain="[('journal_id','=',parent.journal_id)]"/>
+                                    <field name="date_maturity"/>
+                                    <field name="debit" sum="Total Debit"/>
+                                    <field name="credit" sum="Total Credit"/>
+                                    <field name="analytic_account_id"/>
+                                    <field name="amount_currency" groups="base.group_extended"/>
+                                    <field name="currency_id" groups="base.group_extended"/>
+                                    <field name="tax_code_id"/>
+                                    <field name="tax_amount"/>
+                                    <field name="state"/>
+                                    <field name="reconcile_id"/>
+                                    <field name="reconcile_partial_id" groups="base.group_extended"/>
+                                </tree>
+                            </field>
+                            <separator colspan="4" string="Narration"/>
+                            <field name="narration" colspan="4" nolabel="1"/>
+                            <field name="state" select="1"/>
+                            <group col="2" colspan="2">
+                                <button name="button_validate" states="draft" string="Validate" type="object" icon="gtk-execute"/>
+                                <button name="button_cancel" states="posted" string="Cancel" type="object" icon="gtk-cancel"/>
+                            </group>
+                        </page>
+                        <page string="Other Information">
+                            <field name="company_id" required="1" groups="base.group_multi_company"/>
+                            <field name="date" select="1" groups="base.group_extended"/>
+                            <field name="to_check" groups="base.group_extended"/>
+                            <field name="partner_id" invisible="1" select="1"/>
+                            <field name="amount" invisible="1" select="1"/>
+                        </page>
+                    </notebook>
                 </form>
             </field>
         </record>
@@ -959,6 +987,13 @@
                         <field name="journal_id" select='1'/>
                         <field name="partner_id" select='1'/>
                     </group>
+                    <newline/>
+                    <group expand="1" string="Group By..." colspan="12" col="10">
+                        <filter string="Journal" icon="terp-account" domain="[]" context="{'group_by':'journal_id'}"/>
+                        <filter string="Period" icon="terp-account" domain="[]" context="{'group_by':'period_id'}"/>
+                        <filter string="Type" icon="terp-account" domain="[]" context="{'group_by':'type', 'set_visible':True}"/>
+                        <filter string="States" icon="terp-account" domain="[]" context="{'group_by':'state'}"/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -975,7 +1010,7 @@
         <menuitem action="action_move_line_form" id="menu_action_move_line_form" parent="next_id_29"/>
 
         <record id="action_move_line_form_encode_by_move" model="ir.actions.act_window">
-            <field name="name">Entries by Move</field>
+            <field name="name">Journal Entries</field>
             <field name="res_model">account.move</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -1085,8 +1120,8 @@
 
 <!--  bank reconsilation  -->
         <menuitem action="action_account_bank_reconcile_tree"
-        	id="menu_action_account_bank_reconcile_check_tree"
-        	parent="account.next_id_30" />
+            id="menu_action_account_bank_reconcile_check_tree"
+            parent="account.next_id_30" />
 
 
         <act_window
@@ -1460,7 +1495,7 @@
         <act_window domain="[('partner_id', '=', active_id), ('account_id.type', 'in', ['receivable', 'payable']), ('reconcile_id','=',False)]" id="act_account_partner_account_move_unreconciled" name="Unreconciled Receivables &amp; Payables" res_model="account.move.line" src_model="res.partner"/>
 
         <act_window domain="[('partner_id', '=', active_id), ('account_id.type', 'in', ['receivable', 'payable'])]" id="act_account_partner_account_move_all" name="Receivables &amp; Payables" res_model="account.move.line" src_model="res.partner"/>
-		
+
 		<act_window domain="[('partner_id', '=', active_id)]" id="act_account_partner_account_move" name="All Account Entries" res_model="account.move.line" src_model="res.partner"/>
 
         <record id="view_account_addtmpl_wizard_form" model="ir.ui.view">

addons/account/i18n/ca.po

@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-04-18 09:39+0000\n"
-"Last-Translator: Albert Cervera i Areny - http://www.NaN-tic.com <albert@nan-"
-"tic.com>\n"
+"PO-Revision-Date: 2010-06-04 09:39+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-21 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-06-05 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -61,12 +61,12 @@ msgstr "Nom de model no vàlid en la definició de l'acció."
 #. module: account
 #: help:account.journal,currency:0
 msgid "The currency used to enter statement"
-msgstr "La moneda utilitzada per introduir assentaments"
+msgstr "La divisa utilitzada per introduir assentaments"
 
 #. module: account
 #: wizard_view:account_use_models,init_form:0
 msgid "Select Message"
-msgstr "Selecciona missatge"
+msgstr "Seleccioneu missatge"
 
 #. module: account
 #: help:product.category,property_account_income_categ:0
@@ -189,7 +189,7 @@ msgstr "Plans comptables"
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_move_line_select
 msgid "Move line select"
-msgstr "Selecciona línia moviment"
+msgstr "Seleccioneu línia moviment"
 
 #. module: account
 #: rml:account.journal.period.print:0
@@ -202,7 +202,7 @@ msgstr "Ref. assentament"
 #. module: account
 #: model:ir.model,name:account.model_account_model_line
 msgid "Account Model Entries"
-msgstr "Línia de model d'assentament"
+msgstr "Líniees de model d'assentament"
 
 #. module: account
 #: field:account.tax.code,sum_period:0
@@ -315,7 +315,7 @@ msgstr "Pagaments fora de termini"
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
 #: wizard_view:account.vat.declaration,init:0
 msgid "Select period"
-msgstr "Selecciona període"
+msgstr "Seleccioneu període"
 
 #. module: account
 #: field:account.invoice,origin:0
@@ -457,7 +457,7 @@ msgstr "Estat"
 #: model:ir.actions.act_window,name:account.action_invoice_tree13
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree13
 msgid "Unpaid Supplier Refunds"
-msgstr "Factures d'abonament de proveïdor sense pagar"
+msgstr "Factures rectificatives (abonament) de proveïdor sense pagar"
 
 #. module: account
 #: view:account.tax:0
@@ -710,7 +710,7 @@ msgstr "Informació addicional"
 #. module: account
 #: selection:account.invoice,type:0
 msgid "Customer Refund"
-msgstr "Factura d'abonament de client"
+msgstr "Factura rectificativa (abonament) de client"
 
 #. module: account
 #: wizard_view:account.analytic.account.chart,init:0
@@ -909,7 +909,7 @@ msgstr "Diari de desajust"
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
 msgid "Amount Currency"
-msgstr "Import canvi"
+msgstr "Import divisa"
 
 #. module: account
 #: field:account.chart.template,property_account_expense_categ:0
@@ -938,7 +938,7 @@ msgstr "Exercici fiscal per obrir"
 #. module: account
 #: view:account.config.wizard:0
 msgid "Select Chart of Accounts"
-msgstr "Selecciona pla comptable"
+msgstr "Seleccioneu un pla comptable"
 
 #. module: account
 #: field:account.analytic.account,quantity:0
@@ -1242,7 +1242,7 @@ msgstr ""
 #. module: account
 #: field:account.account,company_currency_id:0
 msgid "Company Currency"
-msgstr "Moneda de la companyia"
+msgstr "Divisa de la companyia"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
@@ -1353,7 +1353,7 @@ msgstr "Missatge"
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaymentorder0
 msgid "Select invoices you want to pay and manages advances"
-msgstr "Selecciona factures que es volen pagar i gestiona avançaments"
+msgstr "Seleccioneu les factures que voleu pagar i gestionar avançaments"
 
 #. module: account
 #: selection:account.account,type:0
@@ -1887,7 +1887,7 @@ msgstr "Data inicial"
 #. module: account
 #: model:account.journal,name:account.refund_expenses_journal
 msgid "x Expenses Credit Notes Journal"
-msgstr "x Diari factures d'abonament de despeses"
+msgstr "x Diari factures rectificatives (abonament) de despeses"
 
 #. module: account
 #: field:account.analytic.journal,type:0
@@ -1914,7 +1914,7 @@ msgstr "Base imposable"
 #: field:account.tax,account_collected_id:0
 #: field:account.tax.template,account_collected_id:0
 msgid "Invoice Tax Account"
-msgstr "Compte impostos de factura"
+msgstr "Compte impostos de factures"
 
 #. module: account
 #: view:account.move.line:0
@@ -2026,7 +2026,7 @@ msgstr "Informe analític de diari"
 #: model:ir.actions.act_window,name:account.action_invoice_tree3
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree3
 msgid "Customer Refunds"
-msgstr "Factures d'abonament de client"
+msgstr "Factures rectificatives (abonament) de client"
 
 #. module: account
 #: rml:account.vat.declaration:0
@@ -2047,7 +2047,7 @@ msgstr "Nom diari-període"
 #: field:account.tax.code,name:0
 #: field:account.tax.code.template,name:0
 msgid "Tax Case Name"
-msgstr "Nom impost del cas"
+msgstr "Nom codi d'impost"
 
 #. module: account
 #: help:account.journal,entry_posted:0
@@ -2057,7 +2057,7 @@ msgid ""
 "manual validation."
 msgstr ""
 "Marqueu aquesta casella si no voleu que els nous assentaments passin per "
-"l'estat 'esborrany' i vagin directament a l'estat 'fixat' sense validar-se "
+"l'estat 'Esborrany' i vagin directament a l'estat 'Fixat' sense validar-los "
 "manualment."
 
 #. module: account
@@ -2144,7 +2144,7 @@ msgstr "Anterior"
 #: field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
-msgstr "Moneda"
+msgstr "Divisa"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
@@ -2179,7 +2179,8 @@ msgid "Analytic Entry"
 msgstr "Assentament analític"
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr "Missatge de pagaments fora de termini"
 
@@ -2285,7 +2286,7 @@ msgstr "Diari assentaments d'obertura"
 #. module: account
 #: view:account.config.wizard:0
 msgid "Create a Fiscal Year"
-msgstr "Crea un exercici fiscal"
+msgstr "Creeu un exercici fiscal"
 
 #. module: account
 #: field:product.template,taxes_id:0
@@ -2320,7 +2321,8 @@ msgstr "2"
 #: wizard_view:account.chart,init:0
 msgid "(If you do not select Fiscal year it will take all open fiscal years)"
 msgstr ""
-"(Si no es selecciona cap any fiscal s'utilitzen tots els anys fiscals oberts)"
+"(Si no es selecciona cap exercici fiscal s'utilitzen tots els exercicis "
+"fiscals oberts)"
 
 #. module: account
 #: help:account.invoice.tax,base_code_id:0
@@ -2467,7 +2469,7 @@ msgstr "Data final"
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
 msgid "Entry Lines"
-msgstr "Línies de l'extracte"
+msgstr "Apunts"
 
 #. module: account
 #: view:account.tax:0
@@ -2526,7 +2528,7 @@ msgstr "Assentaments conciliats"
 #. module: account
 #: help:account.bank.statement.reconcile,total_second_amount:0
 msgid "The amount in the currency of the journal"
-msgstr "La quantitat en la moneda del diari"
+msgstr "La quantitat en la divisa del diari"
 
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,landscape:0
@@ -2836,7 +2838,7 @@ msgstr "Companyies que es refereixen a l'empresa"
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
-msgstr "Data vigència"
+msgstr "Data"
 
 #. module: account
 #: help:account.tax.template,sequence:0
@@ -2961,7 +2963,7 @@ msgstr "1cm 27.7cm 20cm 27.7cm"
 #: model:ir.actions.act_window,name:account.action_invoice_tree12
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree12
 msgid "Draft Supplier Refunds"
-msgstr "Factures d'abonament de proveïdor esborrany"
+msgstr "Factures rectificatives (abonament) de proveïdor esborrany"
 
 #. module: account
 #: model:process.node,name:account.process_node_accountingstatemententries0
@@ -3048,7 +3050,7 @@ msgstr "Taxa de divises de sortida"
 #: model:ir.actions.act_window,name:account.action_invoice_tree10
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree10
 msgid "Draft Customer Refunds"
-msgstr "Factures d'abonament de client esborrany"
+msgstr "Factures rectificatives (abonament) de client esborrany"
 
 #. module: account
 #: field:account.journal.column,readonly:0
@@ -3606,7 +3608,7 @@ msgstr "Impressió"
 #: model:ir.actions.act_window,name:account.action_invoice_tree4_new
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree4_new
 msgid "New Supplier Refund"
-msgstr "Nova factura d'abonament de proveïdor"
+msgstr "Nova factura rectificativa (abonament) de proveïdor"
 
 #. module: account
 #: view:account.model:0
@@ -3616,7 +3618,7 @@ msgstr "Model d'assentament"
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,amount_currency:0
 msgid "With Currency"
-msgstr "Amb moneda"
+msgstr "Mostra divisa"
 
 #. module: account
 #: view:account.account:0
@@ -3721,12 +3723,12 @@ msgstr "Codificació extracte"
 #: wizard_view:account.invoice.refund,init:0
 #: model:ir.actions.wizard,name:account.wizard_invoice_refund
 msgid "Credit Note"
-msgstr "Factura d'abonament"
+msgstr "Factura rectificativa (abonament)"
 
 #. module: account
 #: model:ir.actions.todo,note:account.config_fiscalyear
 msgid "Define Fiscal Years and Select Charts of Account"
-msgstr "Defineix exercicis fiscals i selecciona pla comptable"
+msgstr "Definiu els exercicis fiscals i seleccioneu el pla comptable"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,addendum,period_id:0
@@ -3736,7 +3738,7 @@ msgstr "Període de desajust"
 #. module: account
 #: selection:account.config.wizard,period:0
 msgid "3 Months"
-msgstr "3 mesos"
+msgstr "Trimestral"
 
 #. module: account
 #: wizard_view:account.move.journal,init:0
@@ -3800,7 +3802,7 @@ msgstr "Data inicial"
 #. module: account
 #: wizard_view:account.general.ledger.report,account_selection:0
 msgid "Select Chart"
-msgstr "Selecciona pla comptable"
+msgstr "Seleccioneu un pla comptable"
 
 #. module: account
 #: selection:account.chart,init,target_move:0
@@ -3867,7 +3869,7 @@ msgstr "Seqüència de l'assentament"
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
 msgid "Closed"
-msgstr "Tancat"
+msgstr "Tancament"
 
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
@@ -4022,7 +4024,7 @@ msgstr "Propietats de comptabilitat del client"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Select entries"
-msgstr "Selecciona les entrades"
+msgstr "Seleccioneu les entrades"
 
 #. module: account
 #: selection:account.chart,init,target_move:0
@@ -4048,7 +4050,7 @@ msgstr "Compte a pagar"
 #: field:account.account,currency_id:0
 #: field:account.account.template,currency_id:0
 msgid "Secondary Currency"
-msgstr "Moneda secundària"
+msgstr "Divisa secundària"
 
 #. module: account
 #: field:account.account,credit:0
@@ -4083,7 +4085,7 @@ msgstr ""
 #: field:account.tax,account_paid_id:0
 #: field:account.tax.template,account_paid_id:0
 msgid "Refund Tax Account"
-msgstr "Compte impostos de devolucions"
+msgstr "Compte impostos de reintegraments"
 
 #. module: account
 #: field:account.tax.code,child_ids:0
@@ -4186,7 +4188,7 @@ msgstr "Seqüències de diaris separades"
 #. module: account
 #: help:account.bank.statement.reconcile,total_second_currency:0
 msgid "The currency of the journal"
-msgstr "La moneda del diari"
+msgstr "La divisa del diari"
 
 #. module: account
 #: view:account.journal.column:0
@@ -4429,7 +4431,7 @@ msgstr "Fixat"
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Credit Notes"
-msgstr "Factures d'abonament"
+msgstr "Factures rectificatives (abonament)"
 
 #. module: account
 #: field:account.config.wizard,date2:0
@@ -4621,7 +4623,7 @@ msgstr "Per data"
 #: model:ir.actions.act_window,name:account.action_invoice_tree4
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree4
 msgid "Supplier Refunds"
-msgstr "Factures d'abonament de proveïdor"
+msgstr "Factures rectificatives (abonament) de proveïdor"
 
 #. module: account
 #: help:account.model.line,date:0
@@ -4951,7 +4953,7 @@ msgstr "Confirmat"
 #. module: account
 #: wizard_view:account.account.balance.report,account_selection:0
 msgid "Select parent account"
-msgstr "Selecciona compte pare"
+msgstr "Seleccioneu el compte pare"
 
 #. module: account
 #: field:account.account.template,parent_id:0
@@ -5126,7 +5128,7 @@ msgstr "Compte d'ingressos en plantilla producte"
 #: help:account.account.template,currency_id:0
 msgid "Force all moves for this account to have this secondary currency."
 msgstr ""
-"Força a tots els moviments d'aquest compte que tinguin aquesta moneda "
+"Força a tots els moviments d'aquest compte que tinguin aquesta divisa "
 "secundària."
 
 #. module: account
@@ -5140,7 +5142,7 @@ msgstr "_Cancel·la"
 #: wizard_view:account.partner.balance.report,init:0
 #: wizard_view:account.third_party_ledger.report,init:0
 msgid "Select Date-Period"
-msgstr "Selecciona data-període"
+msgstr "Seleccioneu data-període"
 
 #. module: account
 #: rml:account.analytic.account.inverted.balance:0
@@ -5169,7 +5171,7 @@ msgstr "Grup de l'impost"
 #: model:ir.actions.act_window,name:account.action_invoice_tree3_new
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree3_new
 msgid "New Customer Refund"
-msgstr "Nova factura d'abonament de client"
+msgstr "Nova factura rectificativa (abonament) de client"
 
 #. module: account
 #: help:wizard.multi.charts.accounts,seq_journal:0
@@ -5343,7 +5345,7 @@ msgstr "Filtrat per data"
 #. module: account
 #: wizard_view:populate_statement_from_inv,init:0
 msgid "Choose Journal and Payment Date"
-msgstr "Selecciona diari i data de pagament"
+msgstr "Seleccioneu diari i data de pagament"
 
 #. module: account
 #: selection:account.analytic.account,state:0
@@ -5367,7 +5369,7 @@ msgstr "Pagat"
 #: model:ir.actions.act_window,name:account.action_invoice_tree11
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree11
 msgid "Unpaid Customer Refunds"
-msgstr "Factures d'abonament de client sense pagar"
+msgstr "Factures rectificatives (abonament) de client sense pagar"
 
 #. module: account
 #: help:account.invoice,residual:0
@@ -5524,7 +5526,7 @@ msgstr "Fi del període"
 #: view:account.move:0
 #: model:ir.model,name:account.model_account_move
 msgid "Account Entry"
-msgstr "Assentament de compte"
+msgstr "Assentament comptable"
 
 #. module: account
 #: rml:account.general.journal:0
@@ -5555,7 +5557,7 @@ msgstr "Saldo pendent"
 #. module: account
 #: rml:account.invoice:0
 msgid "Refund"
-msgstr "Factura d'abonament"
+msgstr "Factura rectificativa (abonament)"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_tax
@@ -5792,7 +5794,7 @@ msgstr ""
 #: field:account.tax.code,code:0
 #: field:account.tax.code.template,code:0
 msgid "Case Code"
-msgstr "Codi cas"
+msgstr "Codi"
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
@@ -5916,7 +5918,7 @@ msgstr "Deixeu-lo buit per a tots els exercicis fiscals oberts"
 #: rml:account.invoice:0
 #: selection:account.invoice,type:0
 msgid "Supplier Refund"
-msgstr "Factura d'abonament de proveïdor"
+msgstr "Factura rectificativa (abonament) de proveïdor"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_entriesreconcile0
@@ -6072,3 +6074,6 @@ msgstr ""
 #: wizard_button:account.subscription.generate,init,generate:0
 msgid "Compute Entry Dates"
 msgstr "Calcula les dates de l'assentament"
+
+#~ msgid "account.config.wizard"
+#~ msgstr "account.config.assistent"

addons/account/i18n/de.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-04-16 09:47+0000\n"
+"PO-Revision-Date: 2010-06-03 20:09+0000\n"
 "Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-21 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-06-04 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -272,10 +272,6 @@ msgid ""
 "in which order. You can create your own view for a faster encoding in each "
 "journal."
 msgstr ""
-"zeigt die Ansicht des Journalberichtes. Open ERP wird gezeigt welche Felder "
-"sichtbar sein sollen, welche erforderlich sind oder keine Schreibrechte habe "
-"und in der Reihenfolge der Auftragsnummern. Sie können einen eigenen View "
-"für eine schnellere Buchungsbearbeitung herstellen."
 
 #. module: account
 #: help:account.invoice,date_due:0
@@ -2176,7 +2172,8 @@ msgid "Analytic Entry"
 msgstr "Buchung Analysekonto"
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr "Text Zahlungserinnerung"
 
@@ -3314,7 +3311,9 @@ msgstr "Buchen OP Ausgleich"
 #. module: account
 #: wizard_view:account.wizard_paid_open,init:0
 msgid "(Invoice should be unreconciled if you want to open it)"
-msgstr "(Rechnungen müssen ausgeglichen werden)"
+msgstr ""
+"(Rechnungen dürfen nicht ausgeglichen sein, wenn diese wieder geöffnet "
+"werden sollen)"
 
 #. module: account
 #: view:account.invoice:0
@@ -5314,7 +5313,7 @@ msgstr "Benutze Buchungsvorlage"
 #. module: account
 #: wizard_button:account.wizard_paid_open,init,end:0
 msgid "No"
-msgstr "Nummer"
+msgstr "Nein"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move
@@ -6062,3 +6061,6 @@ msgstr "Aktivieren, wenn Benutzer das Konto ausgleichen dürfen."
 #: wizard_button:account.subscription.generate,init,generate:0
 msgid "Compute Entry Dates"
 msgstr "Berechne eingegebene Daten"
+
+#~ msgid "account.config.wizard"
+#~ msgstr "account.config.wizard"

addons/account/i18n/it.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-05-13 14:03+0000\n"
-"Last-Translator: Carlo - didotech.com <Unknown>\n"
+"PO-Revision-Date: 2010-06-04 16:42+0000\n"
+"Last-Translator: eLBati - albatos.com <lorenzo.battistini@albatos.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-14 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-06-05 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -3047,7 +3047,7 @@ msgstr ""
 #. module: account
 #: field:account.invoice.line,uos_id:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Unità di misura"
 
 #. module: account
 #: field:account.chart.template,property_account_receivable:0
@@ -3107,7 +3107,7 @@ msgstr "Imposta come bozza"
 #: help:account.invoice,origin:0
 #: help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
-msgstr ""
+msgstr "Riferimento al documento che ha prodotto questa fattura."
 
 #. module: account
 #: selection:account.account,type:0
@@ -3608,7 +3608,7 @@ msgstr "Manuale"
 #. module: account
 #: view:account.invoice:0
 msgid "Compute Taxes"
-msgstr ""
+msgstr "Calcola tasse"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,code_digits:0
@@ -4596,7 +4596,7 @@ msgstr ""
 #. module: account
 #: field:account.tax,price_include:0
 msgid "Tax Included in Price"
-msgstr ""
+msgstr "Tassa compresa nel prezzo"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree2

addons/account/i18n/nl_BE.po

@@ -7,30 +7,30 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-04-24 15:00+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-06-02 08:19+0000\n"
+"Last-Translator: jan@synkronized.be <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-06-03 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
-msgstr ""
+msgstr "Interne naam"
 
 #. module: account
 #: view:account.tax.code:0
 msgid "Account Tax Code"
-msgstr ""
+msgstr "Belasting code"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree9
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree9
 msgid "Unpaid Supplier Invoices"
-msgstr ""
+msgstr "Onbetaalde inkoopfacturen"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_entries
@@ -50,12 +50,12 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.account_type_asset
 msgid "Asset"
-msgstr ""
+msgstr "Activa"
 
 #. module: account
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Ongeldige modelnaam in de actie-definitie."
 
 #. module: account
 #: help:account.journal,currency:0
@@ -65,7 +65,7 @@ msgstr ""
 #. module: account
 #: wizard_view:account_use_models,init_form:0
 msgid "Select Message"
-msgstr ""
+msgstr "Kies bericht"
 
 #. module: account
 #: help:product.category,property_account_income_categ:0
@@ -82,19 +82,19 @@ msgstr ""
 #. module: account
 #: wizard_view:account.automatic.reconcile,reconcile:0
 msgid "Reconciliation result"
-msgstr ""
+msgstr "Afletterresultaat"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 msgid "Unreconciled entries"
-msgstr ""
+msgstr "Niet afgeletterde boekingen"
 
 #. module: account
 #: field:account.invoice.tax,base_code_id:0
 #: field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
-msgstr ""
+msgstr "Basiscode"
 
 #. module: account
 #: view:account.account:0
@@ -2132,7 +2132,8 @@ msgid "Analytic Entry"
 msgstr ""
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 

addons/account/invoice.py

@@ -333,6 +333,7 @@ class account_invoice(osv.osv):
                 raise orm.except_orm(_('Configuration Error!'),
                      _('There is no Accounting Journal of type Sale/Purchase defined!'))
             else:
+                raise
                 raise orm.except_orm(_('UnknownError'), str(e))
 
     def confirm_paid(self, cr, uid, ids, context=None):
@@ -862,7 +863,6 @@ class account_invoice(osv.osv):
             # make the invoice point to that move
             self.write(cr, uid, [inv.id], {'move_id': move_id,'period_id':period_id, 'move_name':new_move_name})
             self.pool.get('account.move').post(cr, uid, [move_id])
-        self._log_event(cr, uid, ids)
         return True
 
     def line_get_convert(self, cr, uid, x, part, date, context=None):
@@ -916,6 +916,7 @@ class account_invoice(osv.osv):
                         'WHERE account_move_line.move_id = %s ' \
                             'AND account_analytic_line.move_id = account_move_line.id',
                             (ref, move_id))
+                self._log_event(cr, uid, ids)
         return True
 
     def action_cancel(self, cr, uid, ids, *args):
@@ -951,7 +952,17 @@ class account_invoice(osv.osv):
         return taxes.values()
 
     def _log_event(self, cr, uid, ids, factor=1.0, name='Open Invoice'):
-        #TODO: implement messages system
+        for (invoice_id,number) in self.name_get(cr, uid, ids):
+                invoice = self.browse(cr,uid,invoice_id)
+                message = ("%s %s %s %s %s %s %s") % (
+                    _('Invoice'),
+                    _("INV/"),
+                    number.split('/')[-1],
+                    _("Opened,"),
+                    _('journal entries'),
+                    invoice.move_id.name,
+                    _("Created"))
+                self.log(cr, uid, invoice_id, message)
         return True
 
     def name_get(self, cr, uid, ids, context=None):
@@ -1131,17 +1142,17 @@ account_invoice()
 class account_invoice_line(osv.osv):
     def _amount_line(self, cr, uid, ids, prop, unknow_none,unknow_dict):
         res = {}
-        cur_obj=self.pool.get('res.currency')
+        tax_obj = self.pool.get('account.tax')
+        cur_obj = self.pool.get('res.currency')
         for line in self.browse(cr, uid, ids):
+            price = line.price_unit * (1-(line.discount or 0.0)/100.0)
+            taxes = tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, price, line.quantity)
+            res[line.id] = taxes['total']
             if line.invoice_id:
-                res[line.id] = line.price_unit * line.quantity * (1-(line.discount or 0.0)/100.0)
                 cur = line.invoice_id.currency_id
                 res[line.id] = cur_obj.round(cr, uid, cur, res[line.id])
-            else:
-                res[line.id] = round(line.price_unit * line.quantity * (1-(line.discount or 0.0)/100.0),self.pool.get('decimal.precision').precision_get(cr, uid, 'Account'))
         return res
 
-
     def _price_unit_default(self, cr, uid, context=None):
         if context is None:
             context = {}
@@ -1155,7 +1166,7 @@ class account_invoice_line(osv.osv):
                     taxes = l[2].get('invoice_line_tax_id')
                     if len(taxes[0]) >= 3 and taxes[0][2]:
                         taxes = tax_obj.browse(cr, uid, taxes[0][2])
-                        for tax in tax_obj.compute(cr, uid, taxes, p,l[2].get('quantity'), context.get('address_invoice_id', False), l[2].get('product_id', False), context.get('partner_id', False)):
+                        for tax in tax_obj.compute_all(cr, uid, taxes, p,l[2].get('quantity'), context.get('address_invoice_id', False), l[2].get('product_id', False), context.get('partner_id', False))['taxes']:
                             t = t - tax['amount']
             return t
         return 0
@@ -1170,7 +1181,8 @@ class account_invoice_line(osv.osv):
         'product_id': fields.many2one('product.product', 'Product', ondelete='set null'),
         'account_id': fields.many2one('account.account', 'Account', required=True, domain=[('type','<>','view'), ('type', '<>', 'closed')], help="The income or expense account related to the selected product."),
         'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Account')),
-        'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal',store=True, type="float", digits_compute= dp.get_precision('Account')),
+        'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', type="float",
+            digits_compute= dp.get_precision('Account'), store=True),
         'quantity': fields.float('Quantity', required=True),
         'discount': fields.float('Discount (%)', digits_compute= dp.get_precision('Account')),
         'invoice_line_tax_id': fields.many2many('account.tax', 'account_invoice_line_tax', 'invoice_line_id', 'tax_id', 'Taxes', domain=[('parent_id','=',False)]),
@@ -1339,10 +1351,10 @@ class account_invoice_line(osv.osv):
                 continue
             res.append(mres)
             tax_code_found= False
-            for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id,
+            for tax in tax_obj.compute_all(cr, uid, line.invoice_line_tax_id,
                     (line.price_unit * (1.0 - (line['discount'] or 0.0) / 100.0)),
                     line.quantity, inv.address_invoice_id.id, line.product_id,
-                    inv.partner_id):
+                    inv.partner_id)['taxes']:
 
                 if inv.type in ('out_invoice', 'in_invoice'):
                     tax_code_id = tax['base_code_id']
@@ -1445,7 +1457,7 @@ class account_invoice_tax(osv.osv):
         company_currency = inv.company_id.currency_id.id
 
         for line in inv.invoice_line:
-            for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, (line.price_unit* (1-(line.discount or 0.0)/100.0)), line.quantity, inv.address_invoice_id.id, line.product_id, inv.partner_id):
+            for tax in tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, (line.price_unit* (1-(line.discount or 0.0)/100.0)), line.quantity, inv.address_invoice_id.id, line.product_id, inv.partner_id)['taxes']:
                 val={}
                 val['invoice_id'] = inv.id
                 val['name'] = tax['name']
@@ -1507,11 +1519,7 @@ account_invoice_tax()
 class res_partner(osv.osv):
     """ Inherits partner and adds invoice information in the partner form """
     _inherit = 'res.partner'
-
     _columns = {
-                'invoice_ids': fields.one2many('account.invoice.line', 'partner_id', 'Invoices', readonly=True),
-                }
-
+        'invoice_ids': fields.one2many('account.invoice.line', 'partner_id', 'Invoices', readonly=True),
+    }
 res_partner()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/partner_view.xml

@@ -133,11 +133,7 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//notebook[last()]" position="after">
-	                <notebook colspan="4">
-	                    <page string="Project">
-	                        <field name="contract_ids" colspan="4" nolabel="1" />
-	                    </page>
-	                </notebook>
+                    <field name="contract_ids" colspan="4" nolabel="1" />
                 </xpath>
             </field>
         </record>

addons/account/report/__init__.py

@@ -39,5 +39,6 @@ import account_analytic_report
 import account_account_report
 import account_entries_report
 import account_analytic_entries_report
+import voucher_print
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

addons/account/report/account_balance.py

@@ -22,9 +22,15 @@
 import xml
 import copy
 from operator import itemgetter
-import time
 import datetime
 from report import report_sxw
+import xml.dom.minidom
+import os, time
+import osv
+import re
+import tools
+import pooler
+import sys
 
 class account_balance(report_sxw.rml_parse):
         _name = 'report.account.account.balance'
@@ -44,6 +50,10 @@ class account_balance(report_sxw.rml_parse):
             })
             self.context = context
 
+        def _add_header(self, node, header=1):
+            if header==0:
+                self.rml_header = "" 
+            return True
         def get_fiscalyear(self, form):
             res=[]
             if form.has_key('fiscalyear'):
@@ -56,16 +66,14 @@ class account_balance(report_sxw.rml_parse):
 
         def get_periods(self, form):
             result=''
-            if form.has_key('periods') and form['periods'][0][2]:
-                period_ids = form['periods'][0][2]
-                self.cr.execute("select name from account_period where id =ANY(%s)" ,(period_ids))
-                res = self.cr.fetchall()
-                len_res = len(res)
-                for r in res:
-                    if (r == res[len_res-1]):
-                        result+=r[0]+". "
+            if form.has_key('periods') and form['periods']:
+                period_ids = form['periods']
+                per_ids = self.pool.get('account.period').browse(self.cr,self.uid,form['periods'])
+                for r in per_ids:
+                    if r == per_ids[len(per_ids)-1]:
+                        result+=r.name+". "
                     else:
-                        result+=r[0]+", "
+                        result+=r.name+", "
             else:
                 fy_obj = self.pool.get('account.fiscalyear').browse(self.cr,self.uid,form['fiscalyear'])
                 res = fy_obj.period_ids
@@ -172,5 +180,8 @@ class account_balance(report_sxw.rml_parse):
         def _sum_debit(self):
             return self.sum_debit
 
-report_sxw.report_sxw('report.account.account.balance', 'account.account', 'addons/account/report/account_balance.rml', parser=account_balance, header=False)
+
+            
+
+report_sxw.report_sxw('report.account.account.balance', 'account.account', 'addons/account/report/account_balance.rml', parser=account_balance, header=0)
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/report/account_balance.rml

@@ -66,6 +66,27 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
+        <blockTableStyle id="Table3a">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+    </blockTableStyle>
+
     <blockTableStyle id="Table4">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -95,6 +116,8 @@
     <paraStyle name="P9b" fontName="Helvetica" fontSize="9" leftIndent="0.0" alignment="LEFT"/>
     <paraStyle name="P9b" fontName="Helvetica" fontSize="8" leftIndent="-5.0" alignment="LEFT"/>
     <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="8.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="P12a" fontName="Helvetica-Bold" fontSize="8.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P12b" fontName="Helvetica-Bold" fontSize="8.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P14" rightIndent="17.0" leftIndent="-0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -141,14 +164,46 @@
 <para style="P2">
 <font color="white"> </font>
 </para>
-<blockTable colWidths="527.00" style="Table4" repeatRows="1">
+
+    <blockTable colWidths="78.0,108.0,108.0,108.0,138" style="Table3a">
       <tr>
         <td>
-  		  <para style="P9a">[[ get_fiscalyear(data['form']) or removeParentNode('para') ]]:</para>
-          <para style="P9b"><i> [[ get_periods(data['form']) or removeParentNode('para') ]]</i></para>
+          <para style="terp_tblheader_General_Centre">Fiscal Year</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">End Date</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Start Date</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Display Account</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Periods</para>
         </td>
       </tr>
-</blockTable>
+    </blockTable>
+    <blockTable colWidths="78.0,108.0,108.0,108.0,138" style="Table3a">
+      <tr>
+        <td>
+          <para style="terp_default_Centre_8">[[ get_fiscalyear(data['form']) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ data['form']['date_from'] ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ data['form']['date_to'] ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or  (data['form']['display_account']=='bal_mouvement' and 'With movements') or 'With balance is not equal to 0']]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8"> [[data['form']['periods'] and get_periods(data['form']) or '']]</para>
+        </td>
+      </tr>
+    </blockTable>
+
 
 <para style="P2">
 <font color="white"> </font>

addons/account/report/rml_parse.py

@@ -153,14 +153,11 @@ class rml_parse(report_sxw.rml_parse):
             return Stringer
 
     def _add_header(self, node, header=1):
-        if self.name == 'account.account.balance.landscape':
-            if header==2:
-                rml_head =  self.rml_header2
-            else:
-                rml_head =  self.rml_header
-            rml_head =  rml_head.replace('<pageGraphics>','''<pageGraphics> <image x="10" y="26cm" height="770.0" width="1120.0" >[[company.logo]] </image> ''')
+        if header==2:
+            rml_head =  self.rml_header2
         else:
-            return super(rml_parse, self)._add_header(node, header)
+            rml_head =  self.rml_header
+        rml_head =  rml_head.replace('<pageGraphics>','''<pageGraphics> <image x="10" y="26cm" height="770.0" width="1120.0" >[[company.logo]] </image> ''')
         return True
 
     # def _add_header(self, node):

addons/account/report/voucher_print.py

@@ -0,0 +1,62 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import time
+from report import report_sxw
+from tools import amount_to_text_en
+
+class report_voucher_move(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(report_voucher_move, self).__init__(cr, uid, name, context)
+        self.localcontext.update({
+            'time': time,
+            'convert':self.convert,
+            'debit':self.debit,
+            'credit':self.credit,
+            #'get_ref' : self._get_ref
+        })
+ 	self.user=uid
+     
+    def convert(self,amount):
+    	user_id = self.pool.get('res.users').browse(self.cr, self.user,[self.user])[0]
+    	cur = user_id.company_id.currency_id.name
+        amt_en = amount_to_text_en.amount_to_text(amount,'en',cur);
+        return amt_en
+    
+    def debit(self, move_ids):
+        debit = 0.0
+        for move in move_ids:
+            debit +=move.debit
+        return debit
+    
+    def credit(self, move_ids):
+        credit = 0.0
+        for move in move_ids:
+            credit +=move.credit
+        return credit
+    
+report_sxw.report_sxw(
+    'report.account.move.voucher',
+    'account.move',
+    'addons/account/report/voucher_print.rml',
+    parser=report_voucher_move,header=False
+)

addons/account/report/voucher_print.rml

@@ -0,0 +1,436 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Heading1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="last_info">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,6" stop="0,6"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,6" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,6" stop="1,6"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,6" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,6" stop="2,6"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Helvetica"/>
+    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="13.0" leading="16" alignment="CENTER"/>
+    <paraStyle name="P3" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P4" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="22.0" leading="27" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P7" fontName="Helvetica" fontSize="11.0" leading="14" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P8" fontName="Helvetica" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P9" fontName="Helvetica-Bold" fontSize="11.0" leading="14" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P11" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P12" fontName="Helvetica-Bold" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P13" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P14" fontName="Helvetica-Bold" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="P15" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P16" fontName="Helvetica-Bold" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P17" fontName="Helvetica-Bold" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P18" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P19" fontName="Helvetica" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="P20" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P21" fontName="Helvetica-Bold" fontSize="13.0" leading="16" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P22" rightIndent="0.0" leftIndent="35.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P23" rightIndent="0.0" leftIndent="35.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="P24" rightIndent="0.0" leftIndent="35.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="P25" rightIndent="0.0" leftIndent="35.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P26" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P27" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="P28" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <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"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Footer" fontName="Helvetica"/>
+    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Drawing" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Header" fontName="Helvetica"/>
+    <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Helvetica" fontSize="10.0" leading="13"/>
+    <paraStyle name="Addressee" fontName="Helvetica" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="Signature" fontName="Helvetica"/>
+    <paraStyle name="Heading 8" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 7" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 6" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 5" fontName="Helvetica-Bold" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 4" fontName="Helvetica-BoldOblique" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 1" fontName="Helvetica-Bold" fontSize="115%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 10" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Salutation" fontName="Helvetica"/>
+    <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_9_30" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <images/>
+  </stylesheet>
+  <story>
+    <para style="P5">[[ repeatIn(objects,'voucher') ]]</para>
+    <para style="P6">[[ company.name ]]</para>
+    <para style="P8">[[ company.partner_id.address and company.partner_id.address[0].street ]]</para>
+    <para style="P8">[[ company.partner_id.address and company.partner_id.address[0].zip ]] [[ company.partner_id.address and company.partner_id.address[0].city ]] - [[ company.partner_id.address and company.partner_id.address[0].country_id and company.partner_id.address[0].country_id.name ]]</para>
+    <para style="P8">[[ company.partner_id.address and company.partner_id.address[0].phone ]]</para>
+    <para style="P8">[[ company.partner_id.address and company.partner_id.address[0].email ]]</para>
+    <para style="P7">
+      <font color="white"> </font>
+    </para>
+    <para style="P21">Cash Receipt Voucher [[ (voucher.type == 'rec_voucher' or removeParentNode('para')) and '' ]]</para>
+    <para style="P2">Cash Payment Voucher [[ (voucher.type == 'pay_voucher' or removeParentNode('para')) and '' ]]</para>
+    <para style="P21">Bank Receipt Voucher [[ (voucher.type == 'bank_rec_voucher' or removeParentNode('para')) and '' ]]</para>
+    <para style="P2">Bank Payment Voucher [[ (voucher.type == 'bank_pay_voucher' or removeParentNode('para')) and '' ]]</para>
+    <para style="P2">Contra Voucher [[ (voucher.type == 'cont_voucher' or removeParentNode('para')) and '' ]]</para>
+    <para style="P2">Journal Sale Voucher [[ (voucher.type == 'journal_sale_vou' or removeParentNode('para')) and '' ]]</para>
+    <para style="P2">Journal Purchase Voucher [[ (voucher.type == 'journal_pur_voucher' or removeParentNode('para')) and '' ]]</para>
+    <para style="P2">Journal Voucher [[ (voucher.type == 'journal_voucher' or removeParentNode('para')) and '' ]]</para>
+    <para style="P20">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="49.0,143.0,116.0,69.0,106.0" style="Table1">
+      <tr>
+        <td>
+          <para style="P12">Name:</para>
+        </td>
+        <td>
+          <para style="P13">[[ voucher.name ]]</para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P12">Dated :</para>
+        </td>
+        <td>
+          <para style="P13">[[ time.strftime('%d %B,%Y', time.strptime(voucher.date , '%Y-%m-%d')) or '' ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P12">State :</para>
+        </td>
+        <td>
+          <para style="P3">PRO-FORMA [[ ((voucher.state == 'proforma') or removeParentNode('para')) and '' ]]</para>
+          <para style="P3">Draft[[ ((voucher.state == 'draft') or removeParentNode('para')) and '' ]]</para>
+          <para style="P3">Canceled [[ ((voucher.state == 'cancel') or removeParentNode('para')) and '' ]]</para>
+          <para style="P3">Posted [[ ((voucher.state == 'posted') or removeParentNode('para')) and '' ]]</para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P12">Ref. :</para>
+        </td>
+        <td>
+          <para style="P13">[[ voucher.ref]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P15">
+      <font color="white"> </font>
+    </para>
+    <para style="P15">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="275.0,106.0,102.0" style="Heading1">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Particulars</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Debit</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Credit</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_1">
+      <font color="white"> </font>
+    </para>
+    <section>
+      <para style="terp_default_8">[[ repeatIn(voucher.line_id,'line_id') ]]</para>
+      <blockTable colWidths="274.0,106.0,102.0" style="Table2">
+        <tr>
+          <td>
+            <para style="terp_default_Bold_9">[[ (line_id.partner_id and line_id.partner_id.name) or 'Account']]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9_Bold">[[ formatLang(line_id.debit) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9_Bold">[[ formatLang(line_id.credit) ]]</para>
+          </td>
+        </tr>
+        <tr>
+          <td>
+            <para style="terp_default_9_30">[[ line_id.account_id.name ]] </para>
+          </td>
+          <td>
+            <para style="terp_default_9">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_9">
+              <font color="white"> </font>
+            </para>
+          </td>
+        </tr>
+        <tr>
+          <td>
+            <para style="terp_default_9_30">[[ line_id.name ]]-[[voucher.ref]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_9">
+              <font color="white"> </font>
+            </para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_1">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="275.0,106.0,102.0" style="last_info">
+      <tr>
+        <td>
+          <para style="P16">Through : </para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P22">[[ voucher.narration or '']]</para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P16">On Account of : </para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P25">[[ voucher.line_id and voucher.line_id.name and voucher.line_id.name[1] or removeParentNode('para') ]]</para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P16">Amount (in words) : </para>
+        </td>
+        <td>
+          <para style="P16">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P16">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P26">[[ convert(voucher.amount) ]]</para>
+        </td>
+        <td>
+          <para style="P15">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P15">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P17">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(debit(voucher.line_id))]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(credit(voucher.line_id)) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P18">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="142.0,99.0,105.0,136.0" style="Table3">
+      <tr>
+        <td>
+          <para style="P9">
+            <font color="white"> </font>
+          </para>
+          <para style="P9">
+            <font color="white"> </font>
+          </para>
+          <para style="P9">
+            <font color="white"> </font>
+          </para>
+          <para style="P9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P10">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P11">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P20">Receiver's Signature</para>
+        </td>
+        <td>
+          <para style="P20">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P20">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P20">Authorised Signatory</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P1">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>

addons/account/test/account_customer_invoice.yml

@@ -0,0 +1,143 @@
+-
+  In order to test account invoice i create a new customer invoice
+-
+  Creating a account.invoice record
+-
+  !record {model: account.invoice, id: account_invoice_0}:
+    account_id: account.a_recv
+    address_contact_id: base.res_partner_address_zen
+    address_invoice_id: base.res_partner_address_zen
+    company_id: base.main_company
+    currency_id: base.EUR
+    date_invoice: '2010-05-26'
+    invoice_line:
+      - account_id: account.a_sale
+        name: '[PC3] Medium PC'
+        price_unit: 900.0
+        quantity: 10.0
+        product_id: product.product_product_pc3
+        uos_id: product.product_uom_unit
+    journal_id: account.sales_journal
+    partner_id: base.res_partner_3
+    reference_type: none
+-
+  I check that Initially customer invoice is in the draft state
+-
+  !assert {model: account.invoice, id: account_invoice_0}:
+    - state == 'draft'
+-
+  I change the state of invoice to proforma2 by clicking PRO-FORMA button
+-
+  Performing a workflow action invoice_proforma2 on module account.invoice
+-
+  !workflow {model: account.invoice, action: invoice_proforma2, ref: account_invoice_0}
+-
+  I check that the invoice state is now proforma2
+-
+  !assert {model: account.invoice, id: account_invoice_0}:
+    - state == 'proforma2'
+-
+  I create invoice by clicking on Create button
+-
+  Performing a workflow action invoice_open on module account.invoice
+-
+  !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_0}
+-
+  I check that the invoice state is now open
+-
+  !assert {model: account.invoice, id: account_invoice_0}:
+    - state == 'open'
+-
+  I make a partial payment of 1000 by clicking on Pay Invoice button
+-
+  Creating a account.invoice.pay record
+-
+  !record {model: account.invoice.pay, id: account_invoice_pay_first0}:
+    amount: 1000.0
+    date: '2010-05-26'
+    journal_id: account.sales_journal
+    name: First payment for [PC3] Medium PC to Distrib PC
+    period_id: account.period_5
+
+
+-
+  Performing an osv_memory action pay_and_reconcile on module account.invoice.pay
+-
+  !python {model: account.invoice.pay}: |
+    self.pay_and_reconcile(cr, uid, [ref("account_invoice_pay_first0")], {"lang":
+      'en_US', "active_model": "account.invoice", "tz": False, "record_id": 3, "active_ids":
+      [ref("account_invoice_0")], "type": "out_invoice", "active_id": ref("account_invoice_0"),
+      })
+-
+  I check that the invoice state is still open
+-
+  !assert {model: account.invoice, id: account_invoice_0}:
+    - state == 'open'
+-
+  I make second partial payment of 6000 by clicking on Pay Invoice button
+-
+  Creating a account.invoice.pay record
+-
+  !record {model: account.invoice.pay, id: account_invoice_pay_second0}:
+    amount: 6000.0
+    date: '2010-05-28'
+    journal_id: account.sales_journal
+    name: Second payment for [PC3] Medium PC to Distrib PC
+    period_id: account.period_5
+
+-
+  Performing an osv_memory action pay_and_reconcile on module account.invoice.pay
+-
+  !python {model: account.invoice.pay}: |
+    self.pay_and_reconcile(cr, uid, [ref("account_invoice_pay_second0")], {"lang":
+      'en_US', "active_model": "account.invoice", "tz": False, "record_id": 3, "active_ids":
+      [ref("account_invoice_0")], "type": "out_invoice", "active_id": ref("account_invoice_0"),
+      })
+-
+  I make final partial payment of 2000 by clicking on Pay Invoice button
+-
+  Creating a account.invoice.pay record
+-
+  !record {model: account.invoice.pay, id: account_invoice_pay_final0}:
+    amount: 2000.0
+    date: '2010-05-30'
+    journal_id: account.sales_journal
+    name: Final payment for [PC3] Medium PC to Distrib PC
+    period_id: account.period_5
+
+
+-
+  Performing an osv_memory action pay_and_reconcile on module account.invoice.pay
+-
+  !python {model: account.invoice.pay}: |
+    self.pay_and_reconcile(cr, uid, [ref("account_invoice_pay_final0")], {"lang":
+      'en_US', "active_model": "account.invoice", "tz": False, "record_id": 3, "active_ids":
+      [ref("account_invoice_0")], "type": "out_invoice", "active_id": ref("account_invoice_0"),
+      })
+
+-
+  I check that the invoice state is now Done
+-
+  !assert {model: account.invoice, id: account_invoice_0}:
+    - state == 'paid'
+-
+  I check that an payment entry gets created in the account.move.line
+-
+  !python {model: account.invoice}: |
+    acc_id=self.browse(cr, uid, ref("account_invoice_0"))
+    assert(acc_id.move_id)
+#-
+#  I refund the invoice
+#-
+#  Creating a account.invoice.refund record
+#-
+#  !record {model: account.invoice.refund, id: account_invoice_refund_0}:
+#    description: Refund
+#
+#-
+#  Performing an osv_memory action invoice_refund on module account.invoice.refund
+#-
+#  !python {model: account.invoice.refund}: |
+#    self.invoice_refund(cr, uid, [ref("account_invoice_refund_0")], {"lang": 'en_US', "tz": False, "active_model": "account.invoice", "active_ids": [ref("account.account_invoice_0")], "type": "out_invoice", "active_id": ref("account.account_invoice_0"), })
+#    return self.compute_refund(cr, uid, [ref("account_invoice_refund_0")], "refund" {"lang": 'en_US',"tz": False, "active_model": "account.invoice", "active_ids": [ref("account.account_invoice_0")], "type": "out_invoice", "active_id": ref("account.account_invoice_0"), })
+

addons/account/test/account_supplier_invoice.yml

@@ -0,0 +1,117 @@
+-
+  In order to test account invoice i create a new supplier invoice
+-
+  Creating a account.invoice record
+-
+  !record {model: account.invoice, id: account_invoice_1}:
+    account_id: account.a_pay
+    address_contact_id: base.res_partner_address_3000
+    address_invoice_id: base.res_partner_address_3000
+    check_total: 3000.0
+    company_id: base.main_company
+    currency_id: base.EUR
+    invoice_line:
+      - account_id: account.a_expense
+        name: '[PC1] Basic PC'
+        price_unit: 300.0
+        product_id: product.product_product_pc1
+        quantity: 10.0
+        uos_id: product.product_uom_unit
+    journal_id: account.expenses_journal
+    partner_id: base.res_partner_desertic_hispafuentes
+    reference_type: none
+    type: in_invoice
+-
+  I check that Initially supplier invoice is in the draft state
+-
+  !assert {model: account.invoice, id: account_invoice_1}:
+    - state == 'draft'
+-
+  I change the state of invoice to open by clicking Validate button
+-
+  Performing a workflow action invoice_open on module account.invoice
+-
+  !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_1}
+-
+  I check that the invoice state is now open
+-
+  !assert {model: account.invoice, id: account_invoice_1}:
+    - state == 'open'
+-
+  I make a partial payment of 2000 by clicking on Pay Invoice button
+-
+  Creating a account.invoice.pay record
+-
+  !record {model: account.invoice.pay, id: account_invoice_pay_firstpaymenttoaxelorforbasicpc0}:
+    amount: 2000.0
+    date: '2010-05-29'
+    journal_id: account.sales_journal
+    name: First Payment to Axelor for Basic PC
+    period_id: account.period_5
+
+-
+  Performing an osv_memory action pay_and_reconcile on module account.invoice.pay
+-
+  !python {model: account.invoice.pay}: |
+    self.pay_and_reconcile(cr, uid, [ref("account_invoice_pay_firstpaymenttoaxelorforbasicpc0")],
+      {"lang": 'en_US', "active_model": "account.invoice", "tz": False, "record_id":
+      25, "active_ids": [ref("account_invoice_1")], "type": "in_invoice", "active_id":
+      ref("account_invoice_1"), })
+-
+  I check that the invoice state is still open
+-
+  !assert {model: account.invoice, id: account_invoice_1}:
+    - state == 'open'
+-
+  I make final partial payment of 1000 by clicking on Pay Invoice button
+-
+  Creating a account.invoice.pay record
+-
+  !record {model: account.invoice.pay, id: account_invoice_pay_finalpaymenttoaxelorforbasicpc0}:
+    amount: 1000.0
+    date: '2010-06-17'
+    journal_id: account.sales_journal
+    name: Final Payment to Axelor for Basic PC
+    period_id: account.period_5
+
+
+-
+  Performing an osv_memory action pay_and_reconcile on module account.invoice.pay
+-
+  !python {model: account.invoice.pay}: |
+    self.pay_and_reconcile(cr, uid, [ref("account_invoice_pay_finalpaymenttoaxelorforbasicpc0")],
+      {"lang": 'en_US', "active_model": "account.invoice", "tz": False, "record_id":
+      25, "active_ids": [ref("account_invoice_1")], "type": "in_invoice", "active_id":
+      ref("account_invoice_1"), })
+
+-
+  I check that the invoice state is now Done
+-
+  !assert {model: account.invoice, id: account_invoice_1}:
+    - state == 'paid'
+-
+  I check that an payment entry gets created in the account.move.line
+-
+  !python {model: account.invoice}: |
+    acc_id=self.browse(cr, uid, ref("account_invoice_1"))
+    assert(acc_id.move_id)
+#-
+#  I refund the invoice
+#-
+#  Creating a account.invoice.refund record
+#-
+#  !record {model: account.invoice.refund, id: account_invoice_refund_0}:
+#    date: '2010-06-22'
+#    description: 'Refund By Axelor '
+#
+#
+#-
+#  Performing an osv_memory action invoice_refund on module account.invoice.refund
+#-
+#  !python {model: account.invoice.refund}: |
+#    self.invoice_refund(cr, uid, [ref("account_invoice_refund_0")], {"lang": 'en_US',
+#      "tz": False, "active_model": "account.invoice", "active_ids": [ref("account_invoice_1")],
+#      "type": "in_invoice", "active_id": ref("account_invoice_1"), })
+
+
+

addons/account/wizard/account_change_currency.py

@@ -48,27 +48,24 @@ class account_change_currency(osv.osv_memory):
         data = self.read(cr, uid, ids)[0]
         new_currency = data['currency_id']
 
-        for invoice in obj_inv.browse(cr, uid, context['active_ids'], context=context):
-            if invoice.currency_id.id == new_currency:
-                continue
+        invoice = obj_inv.browse(cr, uid, context['active_id'], context=context)
+        if invoice.currency_id.id == new_currency:
+            return {}
+        rate = obj_currency.browse(cr, uid, new_currency).rate
+        for line in invoice.invoice_line:
+            new_price = 0
+            if invoice.company_id.currency_id.id == invoice.currency_id.id:
+                new_price = line.price_unit * rate
 
-            for line in invoice.invoice_line:
-                rate = obj_currency.browse(cr, uid, new_currency).rate
-                new_price = 0
-                if invoice.company_id.currency_id.id == invoice.currency_id.id:
-                    new_price = line.price_unit * rate
+            if invoice.company_id.currency_id.id != invoice.currency_id.id and invoice.company_id.currency_id.id == new_currency:
+                old_rate = invoice.currency_id.rate
+                new_price = line.price_unit / old_rate
 
-                if invoice.company_id.currency_id.id != invoice.currency_id.id and invoice.company_id.currency_id.id == new_currency:
-                    old_rate = invoice.currency_id.rate
-                    new_price = line.price_unit / old_rate
-
-                if invoice.company_id.currency_id.id != invoice.currency_id.id and invoice.company_id.currency_id.id != new_currency:
-                    old_rate = invoice.currency_id.rate
-                    new_price = (line.price_unit / old_rate ) * rate
-
-                obj_inv_line.write(cr, uid, [line.id], {'price_unit' : new_price})
-                invoice_ids.append(invoice.id)
-        obj_inv.write(cr, uid, invoice_ids, {'currency_id' : new_currency}, context=context)
+            if invoice.company_id.currency_id.id != invoice.currency_id.id and invoice.company_id.currency_id.id != new_currency:
+                old_rate = invoice.currency_id.rate
+                new_price = (line.price_unit / old_rate ) * rate
+            obj_inv_line.write(cr, uid, [line.id], {'price_unit' : new_price})
+        obj_inv.write(cr, uid, [invoice.id], {'currency_id' : new_currency}, context=context)
         return {}
 
 account_change_currency()

addons/account/wizard/account_change_currency_view.xml

@@ -8,6 +8,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 			<form string="Invoice Currency">
+					<separator colspan="4" string="This wizard will change the currency of the invoice"/>
 				    <field name="currency_id"/>
 				    <separator colspan="4"/>
               		<group colspan="2" col="4">
@@ -29,15 +30,6 @@
             <field name="target">new</field>
     	</record>
 
-    	<record model="ir.values" id="account_change_currency">
-            <field name="model_id" ref="account.model_account_invoice" />
-            <field name="object" eval="1" />
-            <field name="name">Change Currency</field>
-            <field name="key2">client_action_multi</field>
-            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_change_currency'))"/>
-            <field name="key">action</field>
-            <field name="model">account.invoice</field>
-        </record>
 
     </data>
-</openerp>
+</openerp>

addons/account/wizard/account_invoice_refund.py

@@ -18,10 +18,11 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+import time
+
 from osv import fields, osv
 from tools.translate import _
 import netsvc
-import time
 
 class account_invoice_refund(osv.osv_memory):
 
@@ -30,16 +31,15 @@ class account_invoice_refund(osv.osv_memory):
     _name = "account.invoice.refund"
     _description = "Invoice Refund"
     _columns = {
-       'date': fields.date('Operation date', required=False, help='This date will be used as the invoice date for Refund Invoice and Period will be chosen accordingly!'),
-       'period': fields.many2one('account.period', 'Force period', required=False),
-       'description': fields.char('Description', size=150, required=True),
+       'date': fields.date('Operation date', help='This date will be used as the invoice date for Refund Invoice and Period will be chosen accordingly!'),
+       'period': fields.many2one('account.period', 'Force period'),
+       'description': fields.char('Description', size=128, required=True),
     }
-    
     _defaults = {
         'date': time.strftime('%Y-%m-%d'),
-    }
+                }
 
-    def compute_refund(self, cr, uid, ids, mode, context=None):
+    def compute_refund(self, cr, uid, ids, mode='refund', context=None):
         """
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
@@ -51,6 +51,7 @@ class account_invoice_refund(osv.osv_memory):
         account_m_line_obj = self.pool.get('account.move.line')
         mod_obj = self.pool.get('ir.model.data')
         act_obj = self.pool.get('ir.actions.act_window')
+        wf_service = netsvc.LocalService('workflow')
 
         if context is None:
             context = {}
@@ -77,21 +78,20 @@ class account_invoice_refund(osv.osv_memory):
                             result_query = cr.fetchone()
                             if result_query:
                                 cr.execute("""SELECT id
-                                          from account_period where date('%s')
+                                          from account_period where date(%s)
                                           between date_start AND  date_stop \
                                           and company_id = %s limit 1 """,
-                                          (form['date'], self.pool.get('res.users').browse(cr, uid, uid,context=context).company_id.id,))
+                                          (date, self.pool.get('res.users').browse(cr, uid, uid,context=context).company_id.id,))
                             else:
                                 cr.execute("""SELECT id
-                                        from account_period where date('%s')
+                                        from account_period where date(%s)
                                         between date_start AND  date_stop  \
-                                        limit 1 """, (form['date'],))
+                                        limit 1 """, (date,))
                             res = cr.fetchone()
                             if res:
                                 period = res[0]
                 else:
                     date = inv.date_invoice
-
                 if form['description'] :
                     description = form['description']
                 else:
@@ -116,7 +116,6 @@ class account_invoice_refund(osv.osv_memory):
                             to_reconcile_ids[line.account_id.id] = [line.id]
                         if type(line.reconcile_id) != osv.orm.browse_null :
                             reconcile_obj.unlink(cr, uid, line.reconcile_id.id)
-                    wf_service = netsvc.LocalService('workflow')
                     wf_service.trg_validate(uid, 'account.invoice', \
                                         refund.id, 'invoice_open', cr)
                     refund = inv_obj.browse(cr, uid, refund_id[0],context=context)
@@ -129,7 +128,7 @@ class account_invoice_refund(osv.osv_memory):
                                         writeoff_journal_id=inv.journal_id.id,
                                         writeoff_acc_id=inv.account_id.id
                                         )
-                    if mode == 'modify' :
+                    if mode == 'modify':
                         invoice = inv_obj.read(cr, uid, [inv.id],
                                     ['name', 'type', 'number', 'reference',
                                     'comment', 'date_due', 'partner_id',

addons/account/wizard/account_invoice_refund_view.xml

@@ -8,6 +8,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Credit Note">
+                	<separator string="This wizard is used to refund the invoice" colspan="4"/>
                 	<group colspan="4" >
                     	 <label string="Are you sure you want to refund this invoice ?" colspan="2"/>
                     	 <newline/>
@@ -15,7 +16,7 @@
                     	 <field name="period"/>
                     	 <field name="description"/>
                     </group>
-                       	<separator string="" colspan="4" />
+                       	<separator colspan="4"/>
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
                     	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
@@ -36,10 +37,6 @@
            <field name="target">new</field>
         </record>
 
-        <act_window id="action_account_invoice_refund"
-    		key2 = "client_action_multi"   name="Credit Note"
-    		res_model="account.invoice.refund"  src_model="account.invoice"
-    		view_mode="form" target="new"  view_type="form" />
 
     </data>
-</openerp>
+</openerp>

addons/account/wizard/account_invoice_state.py

@@ -37,11 +37,11 @@ class account_invoice_confirm(osv.osv_memory):
             context = {}
         pool_obj = pooler.get_pool(cr.dbname)
         data_inv = pool_obj.get('account.invoice').read(cr, uid, context['active_ids'], ['state'], context=context)
-        
+
         for record in data_inv:
             if record['state'] not in ('draft','proforma','proforma2'):
                 raise osv.except_osv(_('Warning'), _("Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-Forma' state!"))
-            wf_service.trg_validate(uid, 'account.invoice', id, 'invoice_open', cr)
+            wf_service.trg_validate(uid, 'account.invoice', record['id'], 'invoice_open', cr)
         return {}
 
 account_invoice_confirm()
@@ -61,7 +61,7 @@ class account_invoice_cancel(osv.osv_memory):
         wf_service = netsvc.LocalService('workflow')
         pool_obj = pooler.get_pool(cr.dbname)
         data_inv = pool_obj.get('account.invoice').read(cr, uid, context['active_ids'], ['state'], context=context)
-        
+
         for record in data_inv:
             if record['state'] in ('cancel','paid'):
                 raise osv.except_osv(_('Warning'), _("Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' or 'Done' state!"))

addons/account/wizard/account_pay_invoice.py

@@ -58,7 +58,7 @@ class account_invoice_pay(osv.osv_memory):
         'amount': fields.float('Amount paid', required=True, digits_compute = dp.get_precision('Account')),
         'name': fields.char('Entry Name', size=64, required=True),
         'date': fields.date('Date payment', required=True),
-        'journal_id': fields.many2one('account.journal', 'Journal/Payment Mode', required=True),
+        'journal_id': fields.many2one('account.journal', 'Journal/Payment Mode', required=True, domain=[('type','=','cash')]),
         'period_id': fields.many2one('account.period', 'Period', required=True),
         }
 
@@ -188,4 +188,4 @@ class account_invoice_pay(osv.osv_memory):
 
 account_invoice_pay()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/wizard/account_pay_invoice_view.xml

@@ -25,14 +25,17 @@
             </field>
         </record>
 
+		<record id="action_account_invoice_pay" model="ir.actions.act_window">
+            <field name="name">Pay Invoice</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.invoice.pay</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_account_invoice_pay"/>
+	        <field name="context">{'record_id' : active_id}</field>
+            <field name="target">new</field>
+    	</record>
 
-		<act_window name="Pay Invoice"
-				res_model="account.invoice.pay"
-				src_model="account.invoice"
-				view_mode="form"
-				target="new"
-				key2="client_action_multi"
-			id="action_view_account_invoice_pay"/>
 
 		<record id="view_account_invoice_pay_writeoff" model="ir.ui.view">
             <field name="name">account.invoice.pay.writeoff.form</field>
@@ -59,4 +62,4 @@
 
 
 	</data>
-</openerp>
+</openerp>

addons/account/wizard/account_unreconcile.py

@@ -29,7 +29,7 @@ class account_unreconcile(osv.osv_memory):
         obj_move_reconcile = self.pool.get('account.move.reconcile')
         if context is None:
             context = {}
-        recs = pool.get('account.move.line').read(cr, uid, data['ids'], ['reconcile_id','reconcile_partial_id'])
+        recs = obj_move_line.read(cr, uid, context['active_ids'], ['reconcile_id','reconcile_partial_id'])
         unlink_ids = []
         full_recs = filter(lambda x: x['reconcile_id'], recs)
         rec_ids = [rec['reconcile_id'][0] for rec in full_recs]
@@ -37,9 +37,9 @@ class account_unreconcile(osv.osv_memory):
         part_rec_ids = [rec['reconcile_partial_id'][0] for rec in part_recs]
         unlink_ids += rec_ids
         unlink_ids += part_rec_ids
-    
+
         if len(unlink_ids):
-            pooler.get_pool(cr.dbname).get('account.move.reconcile').unlink(cr, uid, unlink_ids)
+            self.pool.get('account.move.reconcile').unlink(cr, uid, unlink_ids)
         return {}
 
 account_unreconcile()

addons/account_budget/crossovered_budget_view.xml

@@ -178,12 +178,33 @@
             </field>
         </record>
 
+        <record id="view_crossovered_budget_search" model="ir.ui.view">
+           <field name="name">crossovered.budget.search</field>
+           <field name="model">crossovered.budget</field>
+           <field name="type">search</field>
+           <field name="arch" type="xml">
+               <search string="Budget">
+                   <group col="20" colspan="4">
+                       <filter string="Draft" domain="[('state','=','draft')]" help="Draft Budgets"  default="1"/>
+                       <filter string="To Validate" domain="[('state','=','validate')]" help="To Validate Budgets" />
+                       <separator orientation="vertical"/>
+                       <field name="name" select="1"/>
+                       <field name="code" select="1" />
+                       <field name="state"/>
+                       <field name="date_from"/>
+                       <field name="date_to"/>
+                   </group>
+               </search>
+           </field>
+        </record>
+
         <record model="ir.actions.act_window" id="act_crossovered_budget_view">
             <field name="name">Budget</field>
             <field name="res_model">crossovered.budget</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="crossovered_budget_view_tree"/>
+            <field name="search_view_id" ref="view_crossovered_budget_search"/>
         </record>
         <menuitem parent="next_id_31"
             id="menu_act_crossovered_budget_view"

addons/account_invoice_layout/account_invoice_layout.py

@@ -170,6 +170,7 @@ class account_invoice_line(osv.osv):
 
     _defaults = {
         'state': lambda *a: 'article',
+        'sequence': lambda *a : 0,
 #       'account_id': _default_account
     }
 account_invoice_line()

addons/account_payment/i18n/zh_CN.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 07:13+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
+"PO-Revision-Date: 2010-06-04 13:32+0000\n"
+"Last-Translator: Eleanor Chen <chenyueg@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-06-05 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
@@ -251,12 +251,12 @@ msgstr "无效XML视图结构!"
 #: wizard_button:populate_payment,search,end:0
 #: wizard_button:populate_statement,init,end:0
 msgid "_Cancel"
-msgstr "取消"
+msgstr "取消(_C)"
 
 #. module: account_payment
 #: field:payment.line,create_date:0
 msgid "Created"
-msgstr "创建"
+msgstr "已创建"
 
 #. module: account_payment
 #: view:payment.line:0

addons/account_report_india/__init__.py

@@ -0,0 +1,3 @@
+
+import report
+import wizard

addons/account_report_india/__openerp__.py

@@ -0,0 +1,47 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 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/>.     
+#
+##############################################################################
+
+{
+    "name" : "Accounting Reports",
+    "version" : "1.0",
+    "depends" : [
+        "account"
+    ],
+    "author" : "Tiny ERP",
+    "description": """Accounting Reports 
+Modules gives the 2 most Important Reports for the Accounting
+* Profit and Loss Account
+* Balance Sheet
+    """,
+    "website" : "http://tinyerp.com/module_account.html",
+    "category" : "Generic Modules/Accounting",
+    "init_xml" : [
+    ],
+    "demo_xml" : [
+                   
+    ],
+    "update_xml" : [
+        "wizard/account_pl_report_view.xml",
+        "wizard/account_bs_report_view.xml"
+    ],
+    "active": False,
+    "installable": True
+}

addons/account_report_india/report/__init__.py

@@ -0,0 +1,3 @@
+
+import report_bs
+import report_pl

addons/account_report_india/report/report_balance_sheet.rml

@@ -0,0 +1,245 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Heading">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Company_Name">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Date_from_To">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Account_Line_Title">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,0" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table5">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Net_Profit_Loss">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,0" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica" fontSize="9.0" leading="11"/>
+    <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
+    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+  </stylesheet>
+  <images/>
+  <story>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="539.0" style="Table_Heading">
+      <tr>
+        <td>
+          <para style="terp_header_Centre">[[ get_company(data['form']) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="539.0" style="Table_Company_Name">
+      <tr>
+        <td>
+          <para style="terp_header_Centre">Balance Sheet</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="539.0" style="Table_Date_from_To">
+      <tr>
+        <td>
+          <para style="terp_header_Centre">From : [[ formatLang(data['form']['date_from'],date=True) ]] To: [[ formatLang(data['form']['date_to'], date=True) ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_8">[[ get_data(data['form']) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="100.0,326.0,113.0" style="Table_Account_Line_Title" repeatRows="1">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Code</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">Liabilities</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Total Amount([[ get_currency(data['form']) ]])</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines_another('liability'), 'a') ]]</font>[[ a['code'] ]]<font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]]</font></para>
+        </td>
+        <td>
+          <para style="terp_default_9"><font color="white">[[  '. '*(a['level']-1) ]]</font><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]][[ a['name'] ]]</font></para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(abs(a['balance'])) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="426.0,113.0" style="Table_Net_Profit_Loss">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Balance:([[ get_currency(data['form']) ]])</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_dr()) ]]</u></para>
+        </td>
+      </tr>
+    </blockTable>
+    <condPageBreak height="20cm"/>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="100.0,326.0,113.0" style="Table1" repeatRows="1">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Code</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">Assets</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Total Amount([[ get_currency(data['form']) ]])</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines_another('asset'), 'a') ]]</font>[[ a['code'] ]]<font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]]</font></para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ a['code'] ]]<font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]][[ a['name'] ]]</font></para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(abs(a['balance'])) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="426.0,113.0" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Balance:([[ get_currency(data['form']) ]])</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_cr()) ]]</u></para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>

addons/account_report_india/report/report_balance_sheet_horizontal.rml

@@ -0,0 +1,234 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(1120.0,770.0)" title="Test" author="Martin Simon" allowSplitting="20" >
+    <pageTemplate id="first">
+      <frame id="first" x1="22.0" y1="15.0" width="1080" height="680"/>
+			<pageGraphics>
+				<setFont name="Helvetica-Bold" size="9"/>
+				<!--COL 1-->
+				<drawString x="1.3cm" y="25.50cm">[[ get_company(data['form']) ]]</drawString>
+				<!--COL 2-->
+				<setFont name="Helvetica" size="9"/>
+				<drawString x="1.3cm" y="0.50cm"> [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]]</drawString>
+				<drawString x="37.20cm" y="0.50cm">Page <pageNumber/></drawString>
+
+			    <lineMode width="0.7"/>
+				<lines>1.3cm 24.9cm 38.3cm 24.9cm</lines>
+				<setFont name="Helvetica" size="8"/>
+			  </pageGraphics>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Heading">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Company_Name">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Date_from_To">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Account_Line_Title">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="6,0" stop="6,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,0" stop="6,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="7,0" stop="7,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="7,0" stop="7,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,0" stop="7,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Main_Content">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Liability_side">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Asset_Side_Content">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Net_Profit_Loss">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="6,0" stop="6,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="7,0" stop="7,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="7,0" stop="7,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P3" rightIndent="0.0" leftIndent="1.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P4" rightIndent="121.0" leftIndent="-1.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica" fontSize="9.0" leading="11"/>
+    <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
+    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+  </stylesheet>
+  <images/>
+  <story>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="1049.0" style="Table_Company_Name">
+      <tr>
+        <td>
+          <para style="terp_header_Centre">Balance Sheet </para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="1049.0" style="Table_Date_from_To">
+      <tr>
+        <td>
+          <para style="terp_header_Centre">From : [[ formatLang(data['form']['date_from'],date=True) ]] To: [[ formatLang(data['form']['date_to'], date=True) ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_8">[[ get_data(data['form']) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="100.0,308.16,116.32,100.0,308.16,116.32" style="Table_Account_Line_Title" repeatRows="1">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Code</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">Liabilities</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Total Amount([[ get_currency(data['form']) ]])</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">Code</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">Assets</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Total Amount([[ get_currency(data['form']) ]])</para>
+        </td>
+      </tr>
+	  <tr>
+	      <td>
+	        <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines(), 'a') ]]</font> <font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]]</font><font>[[ a['code'] ]]</font></para>
+	      </td>
+	      <td>
+	        <para style="terp_default_9"><font color="white">[[  '. '*(a['level']-1) ]]</font><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]][[ a['name'] ]]</font></para>
+	      </td>
+	      <td>
+	        <para style="terp_default_Right_9_Bold">[[ formatLang(abs(a['balance'])) ]]</para>
+	      </td>
+	      <td>
+	        <para style="terp_default_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]]</font><font>[[ a['code1'] ]]</font></para>
+	      </td>
+	      <td>
+	        <para style="terp_default_9"><font color="white">[[  '. '*(a['level1']-1) ]]</font><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]][[ a['name1'] ]]</font></para>
+	      </td>
+	      <td>
+	        <para style="terp_default_Right_9_Bold">[[ formatLang(abs(a['balance1'])) ]]</para>
+	      </td>
+	   </tr>
+      </blockTable>
+    <blockTable colWidths="408.16,116.32,408.16,116.32" style="Table_Net_Profit_Loss">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Balance:([[ get_currency(data['form']) ]])</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr())) ]]</u></para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">Balance:([[ get_currency(data['form']) ]])</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr())) ]]</u></para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_Right_9">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
+

addons/account_report_india/report/report_bs.py

@@ -0,0 +1,203 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 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/>.     
+#
+##############################################################################
+
+import pooler
+import time
+import mx.DateTime
+import rml_parse
+from report import report_sxw
+from account_report_india.report import report_pl
+
+class report_balancesheet_horizontal(rml_parse.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(report_balancesheet_horizontal, self).__init__(cr, uid, name, context)
+        self.obj_pl=report_pl.report_pl_account_horizontal(cr, uid, name, context)
+        self.result_sum_dr=0.0
+        self.result_sum_cr=0.0
+        self.result = {}
+        self.res_pl={}
+        self.result_temp=[]
+        self.localcontext.update({
+            'time': time,
+            'get_lines' : self.get_lines,
+            'get_lines_another' : self.get_lines_another,
+            'get_company': self.get_company,
+            'get_currency': self._get_currency,
+            'sum_dr' : self.sum_dr,
+            'sum_cr' : self.sum_cr,
+            'get_data':self.get_data,
+            'get_pl_balance':self.get_pl_balance,
+            
+        })
+        self.context = context
+        
+    def sum_dr(self):
+        if self.res_pl['type'] == 'Net Profit':
+            self.result_sum_dr += self.res_pl['balance']
+        return self.result_sum_dr or 0.0
+     
+    def sum_cr(self):
+        if self.res_pl['type'] == 'Net Loss':
+            self.result_sum_cr += self.res_pl['balance']
+        return self.result_sum_cr or 0.0
+
+    def get_pl_balance(self):
+        return self.res_pl or 0.0
+    
+    def get_data(self,form):
+        cr, uid = self.cr, self.uid
+        db_pool = pooler.get_pool(self.cr.dbname)
+        
+        #Getting Profit or Loss Balance from profit and Loss report
+        result_pl=self.obj_pl.get_data(form)
+        self.res_pl=self.obj_pl.final_result()
+        
+        type_pool = db_pool.get('account.account.type')
+        account_pool = db_pool.get('account.account')
+        year_pool = db_pool.get('account.fiscalyear')
+
+        types = [
+            'liability',
+            'asset'
+        ]
+
+        ctx = self.context.copy()
+        ctx['state'] = form['context'].get('state','all')
+        ctx['fiscalyear'] = form['fiscalyear']
+        if form['state']=='byperiod' :
+            ctx['periods'] = form['periods']
+        elif form['state']== 'bydate':
+            ctx['date_from'] = form['date_from']
+            ctx['date_to'] =  form['date_to']
+        elif form['state'] == 'all' :
+            ctx['periods'] = form['periods']
+            ctx['date_from'] = form['date_from']
+            ctx['date_to'] =  form['date_to']
+
+        cal_list={}
+        pl_dict = {}
+        account_dict = {}
+        account_id = [form['Account_list']]
+        account_ids = account_pool._get_children_and_consol(cr, uid, account_id, context=ctx)
+        accounts = account_pool.browse(cr, uid, account_ids, context=ctx)
+
+        if self.res_pl['type'] == 'Net Profit C.F.B.L.':
+            self.res_pl['type'] = 'Net Profit'
+        else:
+            self.res_pl['type'] = 'Net Loss'
+        pl_dict  = {
+            'code' : False,
+            'name' : self.res_pl['type'],
+            'level': False,
+            'balance':self.res_pl['balance'],
+        }
+        for typ in types:
+            accounts_temp = []
+            for account in accounts:
+                if (account.user_type.report_type) and (account.user_type.report_type == typ):
+                    account_dict = {
+                        'id'   : account.id,
+                        'code' : account.code,
+                        'name' : account.name,
+                        'level': account.level,
+                        'balance':account.balance,
+                    }
+                    if typ == 'liability' and account.type <> 'view' and (account.debit <> account.credit):
+                        self.result_sum_dr += abs(account.debit - account.credit)
+                    if typ == 'asset' and account.type <> 'view' and (account.debit <> account.credit):
+                        self.result_sum_cr += abs(account.debit - account.credit)
+                    if form['display_account'] == 'bal_mouvement':
+                        if account.credit > 0 or account.debit > 0 or account.balance > 0 :
+                            accounts_temp.append(account_dict)
+                    elif form['display_account'] == 'bal_solde':
+                        if  account.balance != 0:
+                            accounts_temp.append(account_dict)
+                    else:
+                        accounts_temp.append(account_dict)
+                    if account.id == form['reserve_account_id']:
+                        pl_dict['level'] = account['level'] + 1
+                        accounts_temp.append(pl_dict)
+                        
+            self.result[typ] = accounts_temp
+            cal_list[typ]=self.result[typ]
+
+        if cal_list:
+            temp={}
+            for i in range(0,max(len(cal_list['liability']),len(cal_list['asset']))):
+                if i < len(cal_list['liability']) and i < len(cal_list['asset']):
+                    temp={
+                          'code' : cal_list['liability'][i]['code'],
+                          'name' : cal_list['liability'][i]['name'],
+                          'level': cal_list['liability'][i]['level'],
+                          'balance':cal_list['liability'][i]['balance'],
+                          'code1' : cal_list['asset'][i]['code'],
+                          'name1' : cal_list['asset'][i]['name'],
+                          'level1': cal_list['asset'][i]['level'],
+                          'balance1':cal_list['asset'][i]['balance'],
+                          }
+                    self.result_temp.append(temp)
+                else:
+                    if i < len(cal_list['asset']):
+                        temp={
+                              'code' : '',
+                              'name' : '',
+                              'level': False,
+                              'balance':False,
+                              'code1' : cal_list['asset'][i]['code'],
+                              'name1' : cal_list['asset'][i]['name'],
+                              'level1': cal_list['asset'][i]['level'],
+                              'balance1':cal_list['asset'][i]['balance'],
+                          }
+                        self.result_temp.append(temp)
+                    if  i < len(cal_list['liability']): 
+                        temp={
+                              'code' : cal_list['liability'][i]['code'],
+                              'name' : cal_list['liability'][i]['name'],
+                              'level': cal_list['liability'][i]['level'],
+                              'balance':cal_list['liability'][i]['balance'],
+                              'code1' : '',
+                              'name1' : '',
+                              'level1': False,
+                              'balance1':False,
+                          }
+                        self.result_temp.append(temp)
+        return None
+    
+    def get_lines(self):
+        return self.result_temp
+
+    def get_lines_another(self, group):
+        return self.result.get(group, [])
+    
+    def _get_currency(self, form):
+        return pooler.get_pool(self.cr.dbname).get('res.company').browse(self.cr, self.uid, form['company_id']).currency_id.code
+
+    def get_company(self,form):
+        comp_obj=pooler.get_pool(self.cr.dbname).get('res.company').browse(self.cr,self.uid,form['company_id'])
+        return comp_obj.name 
+
+report_sxw.report_sxw('report.account.balancesheet.horizontal', 'account.account',
+    'addons/account_report_india/report/report_balance_sheet_horizontal.rml',parser=report_balancesheet_horizontal,
+    header=False)
+
+report_sxw.report_sxw('report.account.balancesheet', 'account.account',
+    'addons/account_report_india/report/report_balance_sheet.rml',parser=report_balancesheet_horizontal,
+    header=False)

addons/account_report_india/report/report_pl.py

@@ -0,0 +1,177 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 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/>.     
+#
+##############################################################################
+
+import pooler
+import time
+import mx.DateTime
+import rml_parse
+from report import report_sxw
+
+class report_pl_account_horizontal(rml_parse.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(report_pl_account_horizontal, self).__init__(cr, uid, name, context)
+        self.result_sum_dr=0.0
+        self.result_sum_cr=0.0
+        self.res_pl ={}
+        self.result = {}
+        self.result_temp=[]
+        self.localcontext.update( {
+            'time': time,
+            'get_lines' : self.get_lines,
+            'get_lines_another' : self.get_lines_another,
+            'get_company': self.get_company,
+            'get_currency': self._get_currency,
+            'get_data': self.get_data,
+            'sum_dr' : self.sum_dr,
+            'sum_cr' : self.sum_cr,
+            'final_result' : self.final_result,
+        })
+        self.context = context
+        
+    def final_result(self):
+        return self.res_pl
+    
+    def sum_dr(self):
+        if self.res_pl['type'] == 'Net Profit C.F.B.L.':
+            self.result_sum_dr += self.res_pl['balance']
+        return self.result_sum_dr or 0.0
+     
+    def sum_cr(self):
+        if self.res_pl['type'] == 'Net Loss C.F.B.L.':
+            self.result_sum_cr += self.res_pl['balance']
+        return self.result_sum_cr or 0.0
+
+    def get_data(self,form):
+        cr, uid = self.cr, self.uid
+        db_pool = pooler.get_pool(self.cr.dbname)
+        
+        type_pool = db_pool.get('account.account.type')
+        account_pool = db_pool.get('account.account')
+        year_pool = db_pool.get('account.fiscalyear')
+
+        types = [
+            'expense',
+            'income'
+        ]
+
+        ctx = self.context.copy()
+        ctx['state'] = form['context'].get('state','all')
+        ctx['fiscalyear'] = form['fiscalyear']
+        if form['state']=='byperiod' :
+            ctx['periods'] = form['periods']
+        elif form['state']== 'bydate':
+            ctx['date_from'] = form['date_from']
+            ctx['date_to'] =  form['date_to']
+        elif form['state'] == 'all' :
+            ctx['periods'] = form['periods']
+            ctx['date_from'] = form['date_from']
+            ctx['date_to'] =  form['date_to']
+
+        cal_list={}
+        account_id = [form['Account_list']]
+        account_ids = account_pool._get_children_and_consol(cr, uid, account_id, context=ctx)
+        accounts = account_pool.browse(cr, uid, account_ids, context=ctx)
+        
+        for typ in types:
+            accounts_temp = []
+            for account in accounts:
+                if (account.user_type.report_type) and (account.user_type.report_type == typ):
+                    if typ == 'expense' and account.type <> 'view' and (account.debit <> account.credit):
+                        self.result_sum_dr += abs(account.debit - account.credit)
+                    if typ == 'income' and account.type <> 'view' and (account.debit <> account.credit):
+                        self.result_sum_cr += abs(account.debit - account.credit)
+                    if form['display_account'] == 'bal_mouvement':
+                        if account.credit > 0 or account.debit > 0 or account.balance > 0 :
+                            accounts_temp.append(account)
+                    elif form['display_account'] == 'bal_solde':
+                        if  account.balance != 0:
+                            accounts_temp.append(account)
+                    else:
+                        accounts_temp.append(account)
+            if self.result_sum_dr > self.result_sum_cr:
+                self.res_pl['type'] = 'Net Loss C.F.B.L.'
+                self.res_pl['balance'] = (self.result_sum_dr - self.result_sum_cr)
+            else:
+                self.res_pl['type'] = 'Net Profit C.F.B.L.'
+                self.res_pl['balance'] = (self.result_sum_cr - self.result_sum_dr)
+            self.result[typ] = accounts_temp
+            cal_list[typ]=self.result[typ]
+        if cal_list:   
+            temp={}
+            for i in range(0,max(len(cal_list['expense']),len(cal_list['income']))):
+                if i < len(cal_list['expense']) and i < len(cal_list['income']):
+                    temp={
+                          'code' : cal_list['expense'][i].code,
+                          'name' : cal_list['expense'][i].name,
+                          'level': cal_list['expense'][i].level,
+                          'balance':cal_list['expense'][i].balance,
+                          'code1' : cal_list['income'][i].code,
+                          'name1' : cal_list['income'][i].name,
+                          'level1': cal_list['income'][i].level,
+                          'balance1':cal_list['income'][i].balance,
+                          }
+                    self.result_temp.append(temp)
+                else:
+                    if i < len(cal_list['income']):
+                        temp={
+                              'code' : '',
+                              'name' : '',
+                              'level': False,
+                              'balance':False,
+                              'code1' : cal_list['income'][i].code,
+                              'name1' : cal_list['income'][i].name,
+                              'level1': cal_list['income'][i].level,
+                              'balance1':cal_list['income'][i].balance,
+                              }
+                        self.result_temp.append(temp)
+                    if  i < len(cal_list['expense']): 
+                        temp={
+                              'code' : cal_list['expense'][i].code,
+                              'name' : cal_list['expense'][i].name,
+                              'level': cal_list['expense'][i].level,
+                              'balance':cal_list['expense'][i].balance,
+                              'code1' : '',
+                              'name1' : '',
+                              'level1': False,
+                              'balance1':False,
+                              }
+                        self.result_temp.append(temp)
+        return None
+
+    def get_lines(self):
+        return self.result_temp
+
+    def get_lines_another(self, group):
+        return self.result.get(group, [])
+    
+    def _get_currency(self, form):
+        return pooler.get_pool(self.cr.dbname).get('res.company').browse(self.cr, self.uid, form['company_id']).currency_id.code
+
+    def get_company(self,form):
+        comp_obj=pooler.get_pool(self.cr.dbname).get('res.company').browse(self.cr,self.uid,form['company_id'])
+        return comp_obj.name
+
+report_sxw.report_sxw('report.pl.account.horizontal', 'account.account',
+    'addons/account_report_india/report/report_pl_account_horizontal.rml',parser=report_pl_account_horizontal, header=False)
+
+report_sxw.report_sxw('report.pl.account', 'account.account',
+    'addons/account_report_india/report/report_pl_account.rml',parser=report_pl_account_horizontal, header=False)
+

addons/account_report_india/report/report_pl_account.rml

@@ -0,0 +1,293 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Heading">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Company_Name">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Date_from_To">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Account_Line_Title">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,0" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Net_Profit_Loss">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,0" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Final_Result">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" rightIndent="2.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica" fontSize="9.0" leading="11"/>
+    <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
+    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+  </stylesheet>
+  <images/>
+  <story>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="539.0" style="Table_Heading">
+      <tr>
+        <td>
+          <para style="terp_header_Centre">[[ get_company(data['form']) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="539.0" style="Table_Company_Name">
+      <tr>
+        <td>
+          <para style="terp_header_Centre">Profit And Loss Account</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="539.0" style="Table_Date_from_To">
+      <tr>
+        <td>
+          <para style="terp_header_Centre">From : [[ formatLang(data['form']['date_from'],date=True) ]] To: [[ formatLang(data['form']['date_to'], date=True) ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P2">[[ get_data(data['form']) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="100.0,326.0,113.0" style="Table_Account_Line_Title" repeatRows="1">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Code</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">Expenses</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Total Amount([[ get_currency(data['form']) ]])</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_9">
+            <font face="Times-Roman">[[ repeatIn(get_lines_another('expense'),'a' ) ]] </font>[[ a.code ]]<font>[[ a.level&lt;3 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]]</font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_9">
+            <font color="white">[[  '. '*(a.level-1) ]]</font><font>[[ a.level&lt;3 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]][[ a.name ]]</font>
+          </para>
+        </td>
+         <td>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(abs(a.balance)) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="100.0,326.0,113.0" style="Table_Net_Profit_Loss">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9"></para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Profit C.F.B.L.' and final_result()['type'] or removeParentNode('blockTable') ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9_Bold">[[ final_result()['type'] == 'Net Profit C.F.B.L.' and  formatLang(abs(final_result()['balance'])) or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="426.0,113.0" style="Table_Net_Profit_Loss">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Total:([[ get_currency(data['form']) ]])</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr())) ]]</u></para>
+        </td>
+      </tr>
+    </blockTable>
+     <condPageBreak height="20cm"/>
+    <para style="terp_default_Right_9_Bold">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="100.0,326.0,113.0" style="Table2" repeatRows="1">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Code</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">Incomes</para>
+        </td>
+        <td>
+          <para style="P1">Total Amount([[ get_currency(data['form']) ]])</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_9">
+            <font face="Times-Roman">[[ repeatIn(get_lines_another('income'),'a') ]] </font>[[ a.code ]]<font>[[ a.level&lt;3 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]]</font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_9">
+            <font color="white">[[  '. '*(a.level-1) ]]</font><font>[[ a.level&lt;3 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]][[ a.name ]]</font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(abs(a.balance)) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="100.0,326.0,113.0" style="Table4">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9"></para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Loss C.F.B.L.' and final_result()['type'] or removeParentNode('blockTable') ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9_Bold">[[ final_result()['type'] == 'Net Loss C.F.B.L.' and  formatLang(abs(final_result()['balance'])) or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="426.0,113.0" style="Table4">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Total:([[ get_currency(data['form']) ]])</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr())) ]]</u></para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_Right_9_Bold">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>

addons/account_report_india/report/report_pl_account_horizontal.rml

@@ -0,0 +1,278 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(1120.0,770.0)" title="Test" author="Martin Simon" allowSplitting="20" >
+    <pageTemplate id="first">
+      <frame id="first" x1="22.0" y1="15.0" width="1080" height="680"/>
+			<pageGraphics>
+				<setFont name="Helvetica-Bold" size="9"/>
+				<!--COL 1-->
+				<drawString x="1.3cm" y="25.50cm">[[ get_company(data['form']) ]]</drawString>
+				<!--COL 2-->
+				<setFont name="Helvetica" size="9"/>
+				<drawString x="1.3cm" y="0.50cm"> [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]]</drawString>
+				<drawString x="37.20cm" y="0.50cm">Page <pageNumber/></drawString>
+
+			    <lineMode width="0.7"/>
+				<lines>1.3cm 24.9cm 38.3cm 24.9cm</lines>
+				<setFont name="Helvetica" size="8"/>
+			  </pageGraphics>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Heading">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Company_Name">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Date_from_To">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_debit_credit">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Account_Line_Title">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="6,0" stop="6,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,0" stop="6,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="7,0" stop="7,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="7,0" stop="7,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,0" stop="7,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Main_Content">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Expense_Content">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Income_Content">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Net_Profit_Loss">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="6,0" stop="6,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="7,0" stop="7,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="7,0" stop="7,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Final_Result">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" rightIndent="2.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica" fontSize="9.0" leading="11"/>
+    <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
+    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+  </stylesheet>
+  <images/>
+  <story>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="1049.0" style="Table_Company_Name">
+      <tr>
+        <td>
+          <para style="terp_header_Centre">Profit And Loss Account </para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="1049.0" style="Table_Date_from_To">
+      <tr>
+        <td>
+          <para style="terp_header_Centre">From : [[ formatLang(data['form']['date_from'],date=True) ]] To: [[ formatLang(data['form']['date_to'], date=True) ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_9">[[ get_data(data['form']) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="100.0,308.16,116.32,100.0,308.16,116.32" style="Table_Account_Line_Title" repeatRows="1">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Code</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">Perticular</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Total Amount([[ get_currency(data['form'])]])</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">Code</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">Perticular</para>
+        </td>
+        <td>
+          <para style="P1">Total Amount([[ get_currency(data['form'])]])</para>
+        </td>
+      </tr>
+        <tr>
+          <td>
+            <para style="terp_default_9">
+              <font face="Times-Roman">[[ repeatIn(get_lines(),'a' ) ]] </font>[[ a['code'] ]]<font>[[ a['level']&lt;3 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]]</font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_9">
+              <font color="white">[[  '. '*(a['level']-1) ]]</font><font>[[ a['level']&lt;3 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]][[ a['name'] ]]</font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9_Bold">[[ formatLang(abs(a['balance'])) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9">
+              [[ a['code1'] ]]<font>[[ a['level1']&lt;3 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]]</font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_9">
+              <font color="white">[[  '. '*(a['level1']-1) ]]</font><font>[[ a['level1']&lt;3 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]][[ a['name1'] ]]</font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9_Bold">[[ formatLang(abs(a['balance1'])) ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+    <blockTable colWidths="100.0,308.16,116.32,100.0,308.16,116.32" style="Table_Net_Profit_Loss">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9"></para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Profit C.F.B.L.' and final_result()['type'] or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9_Bold">[[ final_result()['type'] == 'Net Profit C.F.B.L.' and  formatLang(abs(final_result()['balance'])) or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9"></para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Loss C.F.B.L.' and final_result()['type'] or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9_Bold">[[ final_result()['type'] == 'Net Loss C.F.B.L.' and  formatLang(abs(final_result()['balance'])) or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+
+    <blockTable colWidths="408.16,116.32,408.16,116.32" style="Table_Net_Profit_Loss">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Total:([[ get_currency(data['form']) ]])</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr())) ]]</u></para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">Total:([[ get_currency(data['form']) ]])</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr())) ]]</u></para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
+

addons/account_report_india/report/rml_parse.py

@@ -0,0 +1,165 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 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 report import report_sxw
+import xml.dom.minidom
+import os, time
+import osv
+import re
+import tools
+import pooler
+import re
+import sys
+
+
+class rml_parse(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(rml_parse, self).__init__(cr, uid, name, context=None)
+        self.localcontext.update({
+            'comma_me': self.comma_me,
+            'format_date': self._get_and_change_date_format_for_swiss,
+            'strip_name' : self._strip_name,
+            'explode_name' : self._explode_name,
+        })
+
+    def comma_me(self,amount):
+        #print "#" + str(amount) + "#"
+        if not amount:
+            amount = 0.0
+        if  type(amount) is float :
+            amount = str('%.2f'%amount)
+        else :
+            amount = str(amount)
+        if (amount == '0'):
+             return ' '
+        orig = amount
+        new = re.sub("^(-?\d+)(\d{3})", "\g<1>'\g<2>", amount)
+        if orig == new:
+            return new
+        else:
+            return self.comma_me(new)
+        
+    def _ellipsis(self, string, maxlen=100, ellipsis = '...'):
+        ellipsis = ellipsis or ''
+        try:
+            return string[:maxlen - len(ellipsis) ] + (ellipsis, '')[len(string) < maxlen]
+        except Exception, e:
+            return False
+        
+    def _strip_name(self, name, maxlen=50):
+        return self._ellipsis(name, maxlen, '...')
+
+    def _get_and_change_date_format_for_swiss (self,date_to_format):
+        date_formatted=''
+        if date_to_format:
+            date_formatted = strptime (date_to_format,'%Y-%m-%d').strftime('%d.%m.%Y')
+        return date_formatted
+
+    def _explode_name(self,chaine,length):
+        # We will test if the size is less then account
+        full_string = ''
+        if (len(str(chaine)) <= length):
+            return chaine
+        #
+        else:
+            chaine = unicode(chaine,'utf8').encode('iso-8859-1')
+            rup = 0
+            for carac in chaine:
+                rup = rup + 1
+                if rup == length:
+                    full_string = full_string + '\n'
+                    full_string = full_string + carac
+                    rup = 0
+                else:
+                    full_string = full_string + carac
+
+        return full_string
+
+    def makeAscii(self,str):
+        try:
+            Stringer = str.encode("utf-8")
+        except UnicodeDecodeError:
+            try:
+                Stringer = str.encode("utf-16")
+            except UnicodeDecodeError:
+                print "UTF_16 Error"
+                Stringer = str
+            else:
+                return Stringer
+        else:
+            return Stringer
+        return Stringer
+    
+    def explode_this(self,chaine,length):
+        #chaine = self.repair_string(chaine)
+        chaine = rstrip(chaine)
+        ast = list(chaine)
+        i = length
+        while i <= len(ast):
+            ast.insert(i,'\n')
+            i = i + length
+        chaine = str("".join(ast))
+        return chaine
+    
+    def repair_string(self,chaine):
+        ast = list(chaine)
+        UnicodeAst = []
+        _previouslyfound = False
+        i = 0
+        #print str(ast)
+        while i < len(ast):
+            elem = ast[i]
+            try:
+                Stringer = elem.encode("utf-8")
+            except UnicodeDecodeError:
+                to_reencode = elem + ast[i+1]
+                print str(to_reencode)
+                Good_char = to_reencode.decode('utf-8')
+                UnicodeAst.append(Good_char)
+                i += i +2
+            else:
+                UnicodeAst.append(elem)
+                i += i + 1
+        return "".join(UnicodeAst)
+
+    def ReencodeAscii(self,str):
+        print sys.stdin.encoding
+        try:
+            Stringer = str.decode("ascii")
+        except UnicodeEncodeError:
+            print "REENCODING ERROR"
+            return str.encode("ascii")
+        except UnicodeDecodeError:
+            print "DECODING ERROR"
+            return str.encode("ascii")
+        else:
+            print Stringer
+            return Stringer
+
+    def _add_header(self, node, header=1):
+        if header==2:
+            rml_head =  self.rml_header2
+        else:
+            rml_head =  self.rml_header
+        rml_head =  rml_head.replace('<pageGraphics>','''<pageGraphics> <image x="10" y="26cm" height="770.0" width="1120.0" >[[company.logo]] </image> ''')
+        return True
+
+
+

addons/account_report_india/wizard/__init__.py

@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 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/>.     
+#
+##############################################################################
+
+import account_bs_report
+import account_pl_report

addons/account_report_india/wizard/account_bs_report.py

@@ -0,0 +1,158 @@
+# -*- 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/>.
+#
+##############################################################################
+import time
+
+from osv import osv, fields
+from tools.translate import _
+
+class account_bs_report(osv.osv_memory):
+    """
+    This wizard will provide the account balance sheet report by periods, between any two dates.
+    """
+    _name = 'account.bs.report'
+    _description = 'Account Balance Sheet Report'
+    _columns = {
+        'Account_list': fields.many2one('account.account', 'Chart account',
+                                required=True, domain = [('parent_id','=',False)]),
+        'company_id': fields.many2one('res.company', 'Company', required=True),
+        'display_account': fields.selection([('bal_movement','With movements'),
+                                             ('bal_solde','With balance is not equal to 0'),
+                                             ('bal_all','All'),
+                                             ],'Display accounts'),
+        'display_type': fields.boolean("Landscape Mode"),
+        'reserve_account_id': fields.many2one('account.account', 'Reserve & Surplus Account',required = True,
+                                      help='This Account is used for trasfering Profit/Loss(If It is Profit : Amount will be added, Loss : Amount will be duducted.), Which is calculated from Profilt & Loss Report', domain = [('type','=','payable')]),
+        'fiscalyear': fields.many2one('account.fiscalyear', 'Fiscal year', help='Keep empty for all open fiscal year'),
+        'state': fields.selection([('bydate','By Date'),
+                                 ('byperiod','By Period'),
+                                 ('all','By Date and Period'),
+                                 ('none','No Filter')
+                                 ],'Date/Period Filter'),
+        'periods': fields.many2many('account.period', 'period_account_balance_rel',
+                                    'report_id', 'period_id', 'Periods',
+                                    help='Keep empty for all open fiscal year'),
+        'date_from': fields.date('Start date', required=True),
+        'date_to': fields.date('End date', required=True),
+        }
+
+    def _get_company(self, cr, uid, context=None):
+        user_obj = self.pool.get('res.users')
+        company_obj = self.pool.get('res.company')
+        user = user_obj.browse(cr, uid, uid, context=context)
+        if user.company_id:
+            return user.company_id.id
+        else:
+            return company_obj.search(cr, uid, [('parent_id', '=', False)])[0]
+
+    _defaults={
+        'state' : 'none',
+        'date_from' : time.strftime('%Y-01-01'),
+        'date_to' : time.strftime('%Y-%m-%d'),
+        'company_id' : _get_company,
+        'fiscalyear' : False,
+        'display_account': 'bal_all',
+        'display_type': True,
+        }
+
+    def next_view(self, cr, uid, ids, context=None):
+        obj_model = self.pool.get('ir.model.data')
+        if context is None:
+            context = {}
+        data = self.read(cr, uid, ids, [])[0]
+        context.update({'Account_list': data['Account_list'],'reserve_account_id':data['reserve_account_id']})
+        model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','account_bs_report_view')])
+        resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'])[0]['res_id']
+        return {
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'account.bs.report',
+            'views': [(resource_id,'form')],
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'context': context
+        }
+
+    def check_state(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        data={}
+        data['ids'] = context['active_ids']
+        data['form'] = self.read(cr, uid, ids, ['date_from',  'company_id',  'state', 'periods', 'date_to',  'display_account',  'display_type', 'fiscalyear'])[0]
+        data['form']['Account_list'] = context.get('Account_list',[])
+        data['form']['reserve_account_id'] = context.get('reserve_account_id',[])
+        data['form']['context'] = context
+        if data['form']['Account_list']:
+            data['model'] = 'ir.ui.menu'
+        else:
+            data['model'] = 'account.account'
+
+        if data['form']['state'] == 'bydate'  :
+           return self._check_date(cr, uid, data, context)
+        elif data['form']['state'] == 'byperiod':
+            if not data['form']['periods']:
+                raise  osv.except_osv(_('Warning'),_('Please Enter Periods ! '))
+        if data['form']['display_type']:
+            return {
+                'type': 'ir.actions.report.xml',
+                'report_name': 'account.balancesheet.horizontal',
+                'datas': data,
+                'nodestroy':True,
+                }
+        else:
+            return {
+                'type': 'ir.actions.report.xml',
+                'report_name': 'account.balancesheet',
+                'datas': data,
+                'nodestroy':True,
+                }
+            
+    def _check_date(self, cr, uid, data, context=None):
+        if context is None:
+            context = {}
+        sql = """
+            SELECT f.id, f.date_start, f.date_stop FROM account_fiscalyear f  Where %s between f.date_start and f.date_stop """
+        cr.execute(sql,(data['form']['date_from'],))
+        res = cr.dictfetchall()
+        if res:
+
+            if (data['form']['date_to'] > res[0]['date_stop'] or data['form']['date_to'] < res[0]['date_start']):
+                raise  osv.except_osv(_('UserError'),_('Date to must be set between %s and %s') % (res[0]['date_start'], res[0]['date_stop']))
+            else:
+                if data['form']['display_type']:
+                    return {
+                        'type': 'ir.actions.report.xml',
+                        'report_name': 'account.balancesheet.horizontal',
+                        'datas': data,
+                        'nodestroy':True,
+                        }
+                else:
+                    return {
+                        'type': 'ir.actions.report.xml',
+                        'report_name': 'account.balancesheet',
+                        'datas': data,
+                        'nodestroy':True,
+                        }
+        else:
+            raise osv.except_osv(_('UserError'),_('Date not in a defined fiscal year'))
+
+account_bs_report()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_report_india/wizard/account_bs_report_view.xml

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+     <data>
+
+        <record id="account_bs_report_view" model="ir.ui.view">
+             <field name="name">Select period</field>
+             <field name="model">account.bs.report</field>
+             <field name="type">form</field>
+             <field name="arch" type="xml">
+              	<form string="Select period">
+				    <field name="company_id"/>
+				    <field name="display_account" required = "True"/>
+				    <newline/>
+				    <field name="fiscalyear"/>
+				    <label colspan="2" string="(Keep empty for all open fiscal years)" align="0.0"/>
+				    <field name="display_type"/>
+				    <newline/>
+				    <separator string="Filters" colspan="4"/>
+				    <field name="state" required="True"/>
+				    <newline/>
+				    <group attrs="{'invisible':[('state','=','none')]}" colspan="4">
+				        <group attrs="{'invisible':[('state','=','byperiod')]}" colspan="4">
+				            <separator string="Date Filter" colspan="4"/>
+				            <field name="date_from"/>
+				            <field name="date_to"/>
+				        </group>
+				        <group attrs="{'invisible':[('state','=','bydate')]}" colspan="4">
+				            <separator string="Filter on Periods" colspan="4"/>
+				            <field name="periods" colspan="4" nolabel="1"/>
+				        </group>
+				    </group>
+				    <newline/>
+     				<group colspan="4" col="6">
+                       	<label string ="" colspan="2"/>
+     					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+               			<button name="check_state" string="Print" type="object" icon="gtk-print" default_focus="1"/>
+ 					</group>
+				</form>
+             </field>
+ 		</record>
+
+ 		<record id="action_account_bs_report" model="ir.actions.act_window">
+             <field name="name">Account Balance Sheet</field>
+             <field name="res_model">account.bs.report</field>
+             <field name="type">ir.actions.act_window</field>
+             <field name="view_type">form</field>
+             <field name="view_mode">form</field>
+             <field name="view_id" ref="account_bs_report_view"/>
+             <field name="target">new</field>
+       </record>
+
+		<record id="account_bs_report_account_view" model="ir.ui.view">
+            <field name="name">Account Chart</field>
+             <field name="model">account.bs.report</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+		        <form string="Select Chart">
+		        	<field name="Account_list" />
+		        	<field name="reserve_account_id"/>
+		        	<separator colspan="4"/>
+	            	<button icon="gtk-cancel" special="cancel" string="Cancel" colspan="2"/>
+		            <button name="next_view" string="Next" type="object" icon="gtk-go-forward" default_focus="1" colspan="2"/>
+		        </form>
+            </field>
+        </record>
+
+        <record id="action_bs_balance_account_report" model="ir.actions.act_window">
+             <field name="name">Select Account</field>
+             <field name="res_model">account.bs.report</field>
+             <field name="type">ir.actions.act_window</field>
+             <field name="view_type">form</field>
+             <field name="view_mode">tree,form</field>
+             <field name="view_id" ref="account_bs_report_account_view"/>
+             <field name="context">{'record_id':active_id}</field>
+             <field name="target">new</field>
+       </record>
+
+ 	   <menuitem icon="STOCK_PRINT"
+ 	   		name="Balance Sheet"
+ 	   		action="action_bs_balance_account_report"
+ 			id="menu_account_bs_report"
+ 			parent="final_accounting_reports"/>
+
+	</data>
+</openerp>

addons/account_report_india/wizard/account_pl_report.py

@@ -0,0 +1,155 @@
+# -*- 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/>.
+#
+##############################################################################
+import time
+
+from osv import osv, fields
+from tools.translate import _
+
+class account_pl_report(osv.osv_memory):
+    """
+    This wizard will provide the account profit and loss report by periods, between any two dates.
+    """
+    _name = 'account.pl.report'
+    _description = 'Account Profit And Loss Report'
+    _columns = {
+        'Account_list': fields.many2one('account.account', 'Chart account',
+                                required=True, domain = [('parent_id','=',False)]),
+        'company_id': fields.many2one('res.company', 'Company', required=True),
+        'display_account': fields.selection([('bal_movement','With movements'),
+                                             ('bal_solde','With balance is not equal to 0'),
+                                             ('bal_all','All'),
+                                             ],'Display accounts'),
+        'display_type': fields.boolean("Landscape Mode"),
+        'fiscalyear': fields.many2one('account.fiscalyear', 'Fiscal year', help='Keep empty for all open fiscal year'),
+        'state': fields.selection([('bydate','By Date'),
+                                 ('byperiod','By Period'),
+                                 ('all','By Date and Period'),
+                                 ('none','No Filter')
+                                 ],'Date/Period Filter'),
+        'periods': fields.many2many('account.period', 'period_account_balance_rel',
+                                    'report_id', 'period_id', 'Periods',
+                                    help='Keep empty for all open fiscal year'),
+        'date_from': fields.date('Start date', required=True),
+        'date_to': fields.date('End date', required=True),
+        }
+
+    def _get_company(self, cr, uid, context=None):
+        user_obj = self.pool.get('res.users')
+        company_obj = self.pool.get('res.company')
+        user = user_obj.browse(cr, uid, uid, context=context)
+        if user.company_id:
+            return user.company_id.id
+        else:
+            return company_obj.search(cr, uid, [('parent_id', '=', False)])[0]
+
+    _defaults={
+        'state' : 'none',
+        'date_from' : time.strftime('%Y-01-01'),
+        'date_to' : time.strftime('%Y-%m-%d'),
+        'company_id' : _get_company,
+        'fiscalyear' : False,
+        'display_account': 'bal_all',
+        'display_type': True,
+        }
+
+    def next_view(self, cr, uid, ids, context=None):
+        obj_model = self.pool.get('ir.model.data')
+        if context is None:
+            context = {}
+        data = self.read(cr, uid, ids, [])[0]
+        context.update({'Account_list': data['Account_list']})
+        model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','account_pl_report_view')])
+        resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'])[0]['res_id']
+        return {
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'account.pl.report',
+            'views': [(resource_id,'form')],
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'context': context
+        }
+
+    def check_state(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        data={}
+        data['ids'] = context['active_ids']
+        data['form'] = self.read(cr, uid, ids, ['date_from',  'company_id',  'state', 'periods', 'date_to',  'display_account',  'display_type', 'fiscalyear'])[0]
+        data['form']['Account_list'] = context.get('Account_list',[])
+        data['form']['context'] = context
+        if data['form']['Account_list']:
+            data['model'] = 'ir.ui.menu'
+        else:
+            data['model'] = 'account.account'
+
+        if data['form']['state'] == 'bydate'  :
+           return self._check_date(cr, uid, data, context)
+        elif data['form']['state'] == 'byperiod':
+            if not data['form']['periods']:
+                raise  osv.except_osv(_('Warning'),_('Please Enter Periods ! '))
+        if data['form']['display_type']:
+            return {
+                'type': 'ir.actions.report.xml',
+                'report_name': 'pl.account.horizontal',
+                'datas': data,
+                'nodestroy':True,
+                }
+        else:
+            return {
+                'type': 'ir.actions.report.xml',
+                'report_name': 'pl.account',
+                'datas': data,
+                'nodestroy':True,
+                }
+            
+    def _check_date(self, cr, uid, data, context=None):
+        if context is None:
+            context = {}
+        sql = """
+            SELECT f.id, f.date_start, f.date_stop FROM account_fiscalyear f  Where %s between f.date_start and f.date_stop """
+        cr.execute(sql,(data['form']['date_from'],))
+        res = cr.dictfetchall()
+        if res:
+
+            if (data['form']['date_to'] > res[0]['date_stop'] or data['form']['date_to'] < res[0]['date_start']):
+                raise  osv.except_osv(_('UserError'),_('Date to must be set between %s and %s') % (res[0]['date_start'], res[0]['date_stop']))
+            else:
+                if data['form']['display_type']:
+                    return {
+                        'type': 'ir.actions.report.xml',
+                        'report_name': 'pl.account.horizontal',
+                        'datas': data,
+                        'nodestroy':True,
+                        }
+                else:
+                    return {
+                        'type': 'ir.actions.report.xml',
+                        'report_name': 'pl.account',
+                        'datas': data,
+                        'nodestroy':True,
+                        }
+        else:
+            raise osv.except_osv(_('UserError'),_('Date not in a defined fiscal year'))
+
+account_pl_report()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_report_india/wizard/account_pl_report_view.xml

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+     <data>
+
+        <record id="account_pl_report_view" model="ir.ui.view">
+             <field name="name">Select period</field>
+             <field name="model">account.pl.report</field>
+             <field name="type">form</field>
+             <field name="arch" type="xml">
+              	<form string="Select period">
+				    <field name="company_id"/>
+				    <field name="display_account" required = "True"/>
+				    <newline/>
+				    <field name="fiscalyear"/>
+				    <label colspan="2" string="(Keep empty for all open fiscal years)" align="0.0"/>
+				    <field name="display_type"/>
+				    <newline/>
+				    <separator string="Filters" colspan="4"/>
+				    <field name="state" required="True"/>
+				    <newline/>
+				    <group attrs="{'invisible':[('state','=','none')]}" colspan="4">
+				        <group attrs="{'invisible':[('state','=','byperiod')]}" colspan="4">
+				            <separator string="Date Filter" colspan="4"/>
+				            <field name="date_from"/>
+				            <field name="date_to"/>
+				        </group>
+				        <group attrs="{'invisible':[('state','=','bydate')]}" colspan="4">
+				            <separator string="Filter on Periods" colspan="4"/>
+				            <field name="periods" colspan="4" nolabel="1"/>
+				        </group>
+				    </group>
+				    <newline/>
+     				<group colspan="4" col="6">
+                       	<label string ="" colspan="2"/>
+     					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+               			<button name="check_state" string="Print" type="object" icon="gtk-print" default_focus="1"/>
+ 					</group>
+				</form>
+             </field>
+ 		</record>
+
+ 		<record id="action_account_pl_report" model="ir.actions.act_window">
+             <field name="name">Account Profit And Loss</field>
+             <field name="res_model">account.pl.report</field>
+             <field name="type">ir.actions.act_window</field>
+             <field name="view_type">form</field>
+             <field name="view_mode">form</field>
+             <field name="view_id" ref="account_pl_report_view"/>
+             <field name="target">new</field>
+       </record>
+
+		<record id="account_pl_report_account_view" model="ir.ui.view">
+            <field name="name">Account Chart</field>
+             <field name="model">account.pl.report</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+		        <form string="Select Chart">
+		        	<field name="Account_list"/>
+		        	<separator colspan="4"/>
+	            	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+		            <button name="next_view" string="Next" type="object" icon="gtk-go-forward" default_focus="1"/>
+		        </form>
+            </field>
+        </record>
+
+        <record id="action_pl_balance_account_report" model="ir.actions.act_window">
+             <field name="name">Select Account</field>
+             <field name="res_model">account.pl.report</field>
+             <field name="type">ir.actions.act_window</field>
+             <field name="view_type">form</field>
+             <field name="view_mode">tree,form</field>
+             <field name="view_id" ref="account_pl_report_account_view"/>
+             <field name="context">{'record_id':active_id}</field>
+             <field name="target">new</field>
+       </record>
+	   
+	   <menuitem 
+	        parent="account.menu_finance_legal_statement" 
+	        id="final_accounting_reports"
+	        name="Accounting Reports"/>
+
+ 	   <menuitem icon="STOCK_PRINT"
+ 	   		name="Profit And Loss"
+ 	   		action="action_pl_balance_account_report"
+ 			id="menu_account_pl_report"
+ 			parent="final_accounting_reports"/>
+
+	</data>
+</openerp>

addons/account_tax_include/i18n/account_tax_include.pot

@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01:51+0000\n"
-"PO-Revision-Date: 2009-08-28 16:01:51+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
-

addons/account_tax_include/i18n/ar.po

@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 06:24+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""

addons/account_tax_include/i18n/bg.po

@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 12:06+0000\n"
-"Last-Translator: lem0na <nickyk@gmx.net>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Невалиден XML за преглед на архитектурата"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Начин на изчисляване"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "С включен данък"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Без данък"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""

addons/account_tax_include/i18n/bs.po

@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-10 12:26+0000\n"
-"Last-Translator: adnan <adnankraljic@yahoo.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neodgovarajući XML za arhitekturu prikaza!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Cjenovna procedura"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Računi i cijene sa uključenim porezom"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Porez uključen"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Porez nije uključen"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Izračunaj cijene sa porezima"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Sub-ukupno"

addons/account_tax_include/i18n/ca.po

@@ -1,53 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-29 06:30+0000\n"
-"Last-Translator: Jordi Esteve - http://www.zikzakmedia.com "
-"<jesteve@zikzakmedia.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invàlid per a la definició de la vista!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Mètode preu"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Factures i preus amb impostos inclosos"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Impostos inclosos"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Impostos exclosos"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Codi pel càlcul dels preus amb impostos inclosos"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Subtotal"

addons/account_tax_include/i18n/cs.po

@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-04-26 09:10+0000\n"
-"Last-Translator: Martin Volf <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-28 03:44+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neplatný XML pro zobrazení architektury"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Metoda určování cen"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Faktury a ceny včetně daní"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Daně zahrnuty"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Daně vyloučeny"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Výpočetní kód pro ceny včetně daně"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Mezisoučet"

addons/account_tax_include/i18n/de.po

@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-04-09 13:20+0000\n"
-"Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Preismethode"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Rechnungen und Preise mit inkludierten Steuern"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Steuer inklusive"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Steuern exklusive"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Berechnungsgrundlage (inkl. Steuer)"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Zwischensumme"

addons/account_tax_include/i18n/el.po

@@ -1,53 +0,0 @@
-# Greek translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 15:27+0000\n"
-"Last-Translator: Makis Nicolaou <mark.nicolaou@gmail.com>\n"
-"Language-Team: Greek <el@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Άκυρο XML για την αρχιτεκτονική όψης!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Μέθοδος Τιμής"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Τιμολόγια και τιμές με ενσωμάτωση φόρων"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Συμπερίληψη φόρου"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Εξαιρούνται φόροι"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Κωδικός Υπολογισμού για Φόρους που εμπεριέχονται στις τιμές"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Υποσύνολο"

addons/account_tax_include/i18n/en_AU.po

@@ -1,53 +0,0 @@
-# English (Australia) translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-05-09 21:19+0000\n"
-"Last-Translator: MoLE <Unknown>\n"
-"Language-Team: English (Australia) <en_AU@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-10 04:17+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalid XML for View Architecture!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Price method"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Invoices and prices with taxes included"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Tax included"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Tax excluded"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Compute Code for Taxes included prices"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Subtotal"

addons/account_tax_include/i18n/en_GB.po

@@ -1,53 +0,0 @@
-# English (United Kingdom) translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-05-09 21:20+0000\n"
-"Last-Translator: MoLE <Unknown>\n"
-"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-10 04:17+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalid XML for View Architecture!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Price method"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Invoices and prices with taxes included"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Tax included"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Tax excluded"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Compute Code for Taxes included prices"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Subtotal"

addons/account_tax_include/i18n/es.po

@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-24 20:17+0000\n"
-"Last-Translator: Borja López Soilán (Pexego) <borjals@pexego.es>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Método precio"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Facturas y precios con impuestos incluidos"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Impuestos incluidos"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Impuestos excluidos"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Código para el cálculo de precios con impuestos incluidos"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Subtotal"

addons/account_tax_include/i18n/es_AR.po

@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-14 18:28+0000\n"
-"Last-Translator: Silvana Herrera <sherrera@thymbra.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para la definición de la vista!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Método de precio"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Facturas y precios con impuestos incluidos"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Impuestos incluidos"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Impuestos no incluidos"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Código del cálculo para precios con impuestos incluídos"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Subtotal"

addons/account_tax_include/i18n/et.po

@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 16:28+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Vigane XML vaate arhitektuurile!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Hinna meetod"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Makse sisaldavad arved ja hinnad"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Maksuga"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Maksuta"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Arvuta kood maksuga hindadele"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Vahesumma"

addons/account_tax_include/i18n/fi.po

@@ -1,53 +0,0 @@
-# Finnish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-17 10:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Finnish <fi@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Hinnan tyyppi"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Laskut ja hinnat veroilla"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Vero sisältyy"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Ilman veroa"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Laske koodi hinnoille joissa on vero mukana"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Välisumma"

addons/account_tax_include/i18n/fr.po

@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 09:23+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valide pour l'architecture de la vue"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Méthode de prix"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Factures et prix avec taxes comprises"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Taxe comprise"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Hors-taxe"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Code de calcul pour les prix taxes comprises"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Sous-total"

addons/account_tax_include/i18n/gl.po

@@ -1,54 +0,0 @@
-# translation of account-tax-include-es.po to Galego
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-# Frco. Javier Rial Rodríguez <fjrial@cesga.es>, 2009.
-msgid ""
-msgstr ""
-"Project-Id-Version: account-tax-include-es\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 12:37+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: Galego <g11n@mancomun.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML non válido para a definición da vista!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Método prezo"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Facturas e prezos con impostos incluídos"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Imposto incluído"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Imposto excluído"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Código para o cálculo dos impostos en prezos incluídos"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Subtotal"

addons/account_tax_include/i18n/hr.po

@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 09:23+0000\n"
-"Last-Translator: Dragan Jovanovic <dragan.jovanovic@strojotex.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Nevažeći XML za Arhitekturu Prikaza!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Cjenovna metoda"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Računi i cijene sa uključenim porezom"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Porez uključen"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Nije uključen porez"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Kod za izračun cijena sa uključenim porezima"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Podzbroj"

addons/account_tax_include/i18n/hu.po

@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 06:24+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""

addons/account_tax_include/i18n/id.po

@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 13:44+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""

addons/account_tax_include/i18n/it.po

@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 08:32+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valido per Visualizzazione Architettura!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Tasse incluse"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Tasse escluse"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""

addons/account_tax_include/i18n/ko.po

@@ -1,53 +0,0 @@
-# Korean translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 16:43+0000\n"
-"Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
-"Language-Team: Korean <ko@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "뷰 아키텍처의 XML이 유효하지 않습니다."
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "가격 방식"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "세금이 포함된 인보이스와 가격"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "세금 포함"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "세금 제외"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "세금 포함 가격을 위한 컴퓨터 코드"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "서브토털"

addons/account_tax_include/i18n/lt.po

@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 15:54+0000\n"
-"Last-Translator: Donatas Stonys TeraxIT <donatelonow@hotmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""

addons/account_tax_include/i18n/nl.po

@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-14 21:11+0000\n"
-"Last-Translator: Pieter J. Kersten (EduSense BV) <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor weergave!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Prijsmethode"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Facturen en prijzen inclusief belastingen"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Inclusief belastingen"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Exclusief belastingen"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Bereken code voor prijzen inclusief belastingen"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Subtotaal"

addons/account_tax_include/i18n/nl_BE.po

@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-04-24 15:12+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""

addons/account_tax_include/i18n/oc.po

@@ -1,53 +0,0 @@
-# Occitan (post 1500) translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-04-29 14:21+0000\n"
-"Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
-"Language-Team: Occitan (post 1500) <oc@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-05 03:47+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invalid per l'arquitectura de la vista"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Metòde de prètz"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Facturas e prèses amb taxas inclusas"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Taxa inclusa"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Fòra taxa"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Còde de calcul pels prèses amb taxas compresas"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Sostotal"

addons/account_tax_include/i18n/pl.po

@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-21 15:43+0000\n"
-"Last-Translator: Andrzej MoST (Marcin Ostajewski) <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Metoda wyceny"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Faktury i ceny zawierające podatki."
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Zawiera podatek"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Nie zawiera podatku"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Wylicz kod dla cen z podatkiem"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Suma częściowa"

addons/account_tax_include/i18n/pt.po

@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-28 23:29+0000\n"
-"Last-Translator: Paulino <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para a arquitectura da vista"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Método do preço"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Facturas e preços com imposto incluído"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Imposto incluído"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Imposto excluído"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Código de cálculo para preços com imposto incluído"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Subtotal"

addons/account_tax_include/i18n/pt_BR.po

@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 12:28+0000\n"
-"Last-Translator: Pedro_Maschio <pedro.bicudo@tgtconsult.com.br>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalido XML para Arquitetura da View"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""

addons/account_tax_include/i18n/ro.po

@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-28 16:40+0000\n"
-"Last-Translator: geopop65 <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invalid pentru arhitectura machetei de afișare !"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Metoda de pret"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Facturi şi preţuri cu taxele incluse"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Taxe incluse"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Fără taxe"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Calcul cod pentru preţuri cu taxe incluse"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Subtotal"

addons/account_tax_include/i18n/ru.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 13:39+0000\n"
-"Last-Translator: Sergei Kostigoff <sergei.kostigoff@gmail.com>\n"
+"PO-Revision-Date: 2010-06-06 06:51+0000\n"
+"Last-Translator: mr.The <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 03:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
@@ -44,7 +44,7 @@ msgstr "До налогов"
 #. module: account_tax_include
 #: view:account.tax:0
 msgid "Compute Code for Taxes included prices"
-msgstr ""
+msgstr "Выполнить код для цен с налогами"
 
 #. module: account_tax_include
 #: field:account.invoice.line,price_subtotal_incl:0

addons/account_tax_include/i18n/sk.po

@@ -1,53 +0,0 @@
-# Slovak translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-06 14:22+0000\n"
-"Last-Translator: Peter Kohaut <peter.kohaut@gmail.com>\n"
-"Language-Team: Slovak <sk@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neplatné XML pre zobrazenie architektúry!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Faktúry a ceny zahrnuté s DPH"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Medzisúčet"

addons/account_tax_include/i18n/sl.po

@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 09:23+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neveljaven XML za arhitekturo pogleda."
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Metoda cene"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Računi in cene z vključenimi davki"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Davek vključen"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Davek ni vključen"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Koda izračuna za davke v cenah"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Delna vsota"

addons/account_tax_include/i18n/sq.po

@@ -1,104 +0,0 @@
-# Translation of OpenERP Server.
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 15:23:46+0000\n"
-"PO-Revision-Date: 2009-08-28 15:23:46+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
-
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 15:23:46+0000\n"
-"PO-Revision-Date: 2009-08-28 15:23:46+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
-

addons/account_tax_include/i18n/sv.po

@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-14 15:44+0000\n"
-"Last-Translator: Treecko <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Felaktig XML för Vyarkitektur!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""

addons/account_tax_include/i18n/tlh.po

@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 06:24+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""

addons/account_tax_include/i18n/tr.po

@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# 	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-14 21:31+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Görüntüleme mimarisi için Geçersiz XML"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Fiyat Yöntemi"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Vergiler dahil fiyat ve faturalar"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "KDV Dahil"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "KDV Hariç"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Alt Toplam"

addons/account_tax_include/i18n/uk.po

@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 15:16+0000\n"
-"Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильний XML для Архітектури Вигляду!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""

addons/account_tax_include/i18n/vi.po

@@ -1,104 +0,0 @@
-# Translation of OpenERP Server.
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:00:38+0000\n"
-"PO-Revision-Date: 2009-08-28 16:00:38+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
-
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:00:38+0000\n"
-"PO-Revision-Date: 2009-08-28 16:00:38+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
-

addons/account_tax_include/i18n/zh_CN.po

@@ -1,63 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.6\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 07:29+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "无效的视图结构XML文件!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "价格规则"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "发票和含税价"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "含税"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "不含税"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "含税价格计算代码"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "小计"
-
-#~ msgid ""
-#~ "Allow the user to work tax included prices.\n"
-#~ "Especially useful for b2c businesses.\n"
-#~ "    \n"
-#~ "This module implement the modification on the invoice form.\n"
-#~ msgstr ""
-#~ "允许用户使用含税价格\n"
-#~ "特别适用于B2C商务\n"
-#~ "\n"
-#~ "这模块使发票的格式生效\n"

addons/account_tax_include/i18n/zh_TW.po

@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-01-30 12:43+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""

addons/account_tax_include/invoice_tax_incl.py

@@ -1,228 +0,0 @@
-# -*- 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/>.
-#
-##############################################################################
-
-import time
-import netsvc
-from osv import fields, osv
-import ir
-from tools import config
-import decimal_precision as dp
-
-class account_invoice(osv.osv):
-    _inherit = "account.invoice"
-    _columns = {
-        'price_type': fields.selection([('tax_included','Tax included'),
-                                        ('tax_excluded','Tax excluded')],
-                                        'Price method', required=True, readonly=True,
-                                        states={'draft':[('readonly',False)]}),
-    }
-    _defaults = {
-        'price_type': lambda *a: 'tax_excluded',
-    }
-
-    def refund(self, cr, uid, ids, date=None, period_id=None, description=None):
-        map_old_new = {}
-        refund_ids = []
-        for old_inv_id in ids:
-            new_id = super(account_invoice,self).refund(cr, uid, ids, date=date, period_id=period_id, description=description)
-            refund_ids += new_id
-            map_old_new[old_inv_id] = new_id[0]
-
-        for old_inv_id in map_old_new.keys():
-            old_inv_record = self.read(cr, uid, [old_inv_id], ['price_type'])[0]['price_type']
-            self.write(cr, uid, [map_old_new[old_inv_id]], {'price_type' : old_inv_record})
-        return refund_ids
-
-account_invoice()
-
-class account_invoice_line(osv.osv):
-    _inherit = "account.invoice.line"
-    def _amount_line2(self, cr, uid, ids, name, args, context=None):
-        """
-        Return the subtotal excluding taxes with respect to price_type.
-        """
-        res = {}
-        tax_obj = self.pool.get('account.tax')
-        cur_obj = self.pool.get('res.currency')
-        for line in self.browse(cr, uid, ids):
-            cur = line.invoice_id and line.invoice_id.currency_id or False
-            res_init = super(account_invoice_line, self)._amount_line(cr, uid, [line.id], name, args, context)
-            res[line.id] = {
-                'price_subtotal': 0.0,
-                'price_subtotal_incl': 0.0,
-                'data': []
-            }
-            if not line.quantity:
-                continue
-            if line.invoice_id:
-                product_taxes = []
-                if line.product_id:
-                    if line.invoice_id.type in ('out_invoice', 'out_refund'):
-                        product_taxes = filter(lambda x: x.price_include, line.product_id.taxes_id)
-                    else:
-                        product_taxes = filter(lambda x: x.price_include, line.product_id.supplier_taxes_id)
-
-                if ((set(product_taxes) == set(line.invoice_line_tax_id)) or not product_taxes) and (line.invoice_id.price_type == 'tax_included'):
-                    res[line.id]['price_subtotal_incl'] = cur and cur_obj.round(cr, uid, cur, res_init[line.id]) or res_init[line.id]
-                else:
-                    res[line.id]['price_subtotal'] = cur and cur_obj.round(cr, uid, cur, res_init[line.id]) or res_init[line.id]
-                    for tax in tax_obj.compute_inv(cr, uid, product_taxes, res_init[line.id]/line.quantity, line.quantity):
-                        res[line.id]['price_subtotal'] = res[line.id]['price_subtotal'] - round(tax['amount'], self.pool.get('decimal.precision').precision_get(cr, uid, 'Account'))
-            else:
-                res[line.id]['price_subtotal'] = cur and cur_obj.round(cr, uid, cur, res_init[line.id]) or res_init[line.id]
-
-            if res[line.id]['price_subtotal']:
-                res[line.id]['price_subtotal_incl'] = res[line.id]['price_subtotal']
-                for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, res[line.id]['price_subtotal']/line.quantity, line.quantity):
-                    res[line.id]['price_subtotal_incl'] = res[line.id]['price_subtotal_incl'] + tax['amount']
-                    res[line.id]['data'].append( tax)
-            else:
-                res[line.id]['price_subtotal'] = res[line.id]['price_subtotal_incl']
-                for tax in tax_obj.compute_inv(cr, uid, line.invoice_line_tax_id, res[line.id]['price_subtotal_incl']/line.quantity, line.quantity):
-                    res[line.id]['price_subtotal'] = res[line.id]['price_subtotal'] - tax['amount']
-                    res[line.id]['data'].append( tax)
-
-            res[line.id]['price_subtotal']= round(res[line.id]['price_subtotal'], self.pool.get('decimal.precision').precision_get(cr, uid, 'Account'))
-            res[line.id]['price_subtotal_incl']= round(res[line.id]['price_subtotal_incl'], self.pool.get('decimal.precision').precision_get(cr, uid, 'Account'))
-        return res
-
-    def _price_unit_default(self, cr, uid, context=None):
-        if context is None:
-            context = {}
-        if 'check_total' in context:
-            t = context['check_total']
-            if context.get('price_type', False) == 'tax_included':
-                for l in context.get('invoice_line', {}):
-                    if len(l) >= 3 and l[2]:
-                        p = l[2].get('price_unit', 0) * (1-l[2].get('discount', 0)/100.0)
-                        t = t - (p * l[2].get('quantity'))
-                return t
-            return super(account_invoice_line, self)._price_unit_default(cr, uid, context)
-        return 0
-
-    def _get_invoice(self, cr, uid, ids, context):
-        result = {}
-        for inv in self.pool.get('account.invoice').browse(cr, uid, ids, context=context):
-            for line in inv.invoice_line:
-                result[line.id] = True
-        return result.keys()
-    _columns = {
-        'price_subtotal': fields.function(_amount_line2, method=True, string='Subtotal w/o tax', multi='amount',
-            store={'account.invoice':(_get_invoice,['price_type'],10), 'account.invoice.line': (lambda self,cr,uid,ids,c={}: ids, None,10)}),
-        'price_subtotal_incl': fields.function(_amount_line2, method=True, string='Subtotal', multi='amount',
-            store={'account.invoice':(_get_invoice,['price_type'],10), 'account.invoice.line': (lambda self,cr,uid,ids,c={}: ids, None,10)}),
-    }
-
-    _defaults = {
-        'price_unit': _price_unit_default,
-    }
-
-    def move_line_get_item(self, cr, uid, line, context=None):
-        return {
-                'type':'src',
-                'name':line.name,
-                'price_unit':(line.quantity) and (line.price_subtotal / line.quantity) or line.price_subtotal,
-                'quantity':line.quantity,
-                'price':line.price_subtotal,
-                'account_id':line.account_id.id,
-                'product_id': line.product_id.id,
-                'uos_id':line.uos_id.id,
-                'account_analytic_id':line.account_analytic_id.id,
-            }
-
-    def product_id_change_unit_price_inv(self, cr, uid, tax_id, price_unit, qty, address_invoice_id, product, partner_id, context=None):
-        if context is None:
-            context = {}
-        # if the tax is already included, just return the value without calculations
-        if context.get('price_type', False) == 'tax_included':
-            return {'price_unit': price_unit,'invoice_line_tax_id': tax_id}
-        else:
-            return super(account_invoice_line, self).product_id_change_unit_price_inv(cr, uid, tax_id, price_unit, qty, address_invoice_id, product, partner_id, context=context)
-
-    def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None):
-        # note: will call product_id_change_unit_price_inv with context...
-
-        # Temporary trap, for bad context that came from koo:
-        # if isinstance(context, str):
-        #       print "str context:", context
-
-        ctx = (context and context.copy()) or {}
-        ctx.update({'price_type': ctx.get('price_type','tax_excluded')})
-        return super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id=currency_id, context=ctx)
-account_invoice_line()
-
-class account_invoice_tax(osv.osv):
-    _inherit = "account.invoice.tax"
-
-    def compute(self, cr, uid, invoice_id, context=None):
-        inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id)
-        line_ids = map(lambda x: x.id, inv.invoice_line)
-
-        tax_grouped = {}
-        tax_obj = self.pool.get('account.tax')
-        cur_obj = self.pool.get('res.currency')
-        cur = inv.currency_id
-        company_currency = inv.company_id.currency_id.id
-
-        for line in inv.invoice_line:
-            data = self.pool.get('account.invoice.line')._amount_line2(cr, uid, [line.id], [], [], context)[line.id]
-            for tax in data['data']:
-                val={}
-                val['invoice_id'] = inv.id
-                val['name'] = tax['name']
-                val['amount'] = tax['amount']
-                val['manual'] = False
-                val['sequence'] = tax['sequence']
-                val['base'] = tax['price_unit'] * line['quantity']
-
-                if inv.type in ('out_invoice','in_invoice'):
-                    val['base_code_id'] = tax['base_code_id']
-                    val['tax_code_id'] = tax['tax_code_id']
-                    val['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['base'] * tax['base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
-                    val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['tax_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
-                    val['account_id'] = tax['account_collected_id'] or line.account_id.id
-                else:
-                    val['base_code_id'] = tax['ref_base_code_id']
-                    val['tax_code_id'] = tax['ref_tax_code_id']
-                    val['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['base'] * tax['ref_base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
-                    val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['ref_tax_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
-                    val['account_id'] = tax['account_paid_id'] or line.account_id.id
-
-                key = (val['tax_code_id'], val['base_code_id'], val['account_id'])
-                if not key in tax_grouped:
-                    tax_grouped[key] = val
-                else:
-                    tax_grouped[key]['amount'] += val['amount']
-                    tax_grouped[key]['base'] += val['base']
-                    tax_grouped[key]['base_amount'] += val['base_amount']
-                    tax_grouped[key]['tax_amount'] += val['tax_amount']
-
-        for t in tax_grouped.values():
-            t['amount'] = cur_obj.round(cr, uid, cur, t['amount'])
-            t['base_amount'] = cur_obj.round(cr, uid, cur, t['base_amount'])
-            t['tax_amount'] = cur_obj.round(cr, uid, cur, t['tax_amount'])
-
-        return tax_grouped
-account_invoice_tax()
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

addons/account_tax_include/invoice_tax_incl.xml

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        
-        <record id="account_tax_view_price" model="ir.ui.view">
-            <field name="name">account.tax.exlcuded.view.form</field>
-            <field name="type">form</field>
-            <field name="model">account.tax</field>
-            <field name="inherit_id" ref="account.view_tax_form"/>
-            <field name="arch" type="xml">
-                <field name="python_compute" position="after">
-                    <separator colspan="4" string="Compute Code for Taxes included prices"/>
-                    <field colspan="4" name="python_compute_inv" nolabel="1"/>
-                </field>
-            </field>
-        </record>
-        
-        <record id="account_invoice_view_price" model="ir.ui.view">
-            <field name="name">account.invoice.vat.exlcuded.view.form</field>
-            <field name="type">form</field>
-            <field name="model">account.invoice</field>
-            <field name="inherit_id" ref="account.invoice_form"/>
-            <field name="arch" type="xml">
-                <field name="payment_term" position="after">
-                    <field name="price_type"/>
-                </field>
-            </field>
-        </record>
-        
-        <record id="invoice_supplier_form_tax_include" model="ir.ui.view">
-            <field name="name">account.invoice.supplier.tax_include</field>
-            <field name="type">form</field>
-            <field name="model">account.invoice</field>
-            <field name="inherit_id" ref="account.invoice_supplier_form"/>
-            <field name="arch" type="xml">
-                <field colspan="4" default_get="{'check_total': check_total, 'invoice_line': invoice_line, 'address_invoice_id': address_invoice_id, 'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False}" name="invoice_line" nolabel="1" position="before">
-                    <field name="price_type"/>
-                </field>
-            </field>
-        </record>
-        
-        <record id="invoice_supplier_form_tax_include2" model="ir.ui.view">
-            <field name="name">account.invoice.supplier.tax_include2</field>
-            <field name="type">form</field>
-            <field name="model">account.invoice</field>
-            <field name="inherit_id" ref="account.invoice_supplier_form"/>
-            <field name="arch" type="xml">
-                <field name="price_subtotal" position="after">
-                    <field name="price_subtotal_incl"/>
-                </field>
-            </field>
-        </record>
-        
-        <record id="invoice_supplier_form_tax_include3" model="ir.ui.view">
-            <field name="name">account.invoice.supplier.tax_include3</field>
-            <field name="type">form</field>
-            <field name="model">account.invoice</field>
-            <field name="inherit_id" ref="account.invoice_supplier_form"/>
-            <field name="arch" type="xml">
-                <field name="product_id" position="replace">
-                    <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id,{'price_type':parent.price_type})"/>
-                </field>
-            </field>
-        </record>
-        
-        <record id="view_invoice_line_tree" model="ir.ui.view">
-            <field name="name">account.invoice.line.tree</field>
-            <field name="model">account.invoice.line</field>
-            <field name="type">tree</field>
-            <field name="inherit_id" ref="account.view_invoice_line_tree"/>
-            <field name="arch" type="xml">
-                <field name="price_subtotal" position="after">
-                    <field name="price_subtotal_incl"/>
-                </field>
-            </field>
-        </record>
-        
-    </data>
-</openerp>

addons/account_voucher/__init__.py

@@ -20,6 +20,5 @@
 ##############################################################################
 
 import voucher
-import account
 import report
 import wizard

addons/account_voucher/__openerp__.py

@@ -36,7 +36,10 @@
     """,
     "category" : "Generic Modules/Accounting",
     "website" : "http://tinyerp.com",
-    "depends" : ["base", "account"],
+    "depends" : [
+        "base", 
+        "account"
+    ],
     "init_xml" : [
     ],
 
@@ -46,11 +49,12 @@
     "update_xml" : [
         "security/ir.model.access.csv",
         "voucher_sequence.xml",
-        "account_report.xml",
+        "voucher_workflow.xml",
+        "voucher_report.xml",
         "voucher_view.xml",
         "voucher_wizard.xml",
-        "account_view.xml",
         "wizard/account_voucher_open_view.xml",
+        
     ],
     'certificate': '0037580727101',
     "active": False,

addons/account_voucher/account.py

@@ -1,219 +0,0 @@
-# -*- 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/>.     
-#
-##############################################################################
-
-import time
-import netsvc
-from osv import fields, osv
-import ir
-import pooler
-import mx.DateTime
-from mx.DateTime import RelativeDateTime
-from tools import config
-
-class account_account(osv.osv):
-    _inherit = "account.account"
-    
-    def _get_level(self, cr, uid, ids, field_name, arg, context={}):
-        res={}
-        acc_obj=self.browse(cr,uid,ids)
-        for aobj in acc_obj:
-            level = 0
-            if aobj.parent_id :
-                obj=self.browse(cr,uid,aobj.parent_id.id)
-                level= obj.level + 1
-            res[aobj.id] = level
-        return res
-    
-    def _get_children_and_consol(self, cr, uid, ids, context={}):
-        ids2=[]
-        temp=[]
-        read_data= self.read(cr, uid, ids,['id','child_id'], context)
-        for data in read_data:
-            ids2.append(data['id'])
-            if data['child_id']:
-                temp=[]
-                for x in data['child_id']:
-                    temp.append(x)
-                ids2 += self._get_children_and_consol(cr, uid, temp, context)
-        return ids2
-
-    _columns = {
-        'journal_id':fields.many2one('account.journal', 'Journal',domain=[('type','=','situation')]),
-        'open_bal' : fields.float('Opening Balance',digits=(16,2)),
-        'level': fields.function(_get_level, string='Level', method=True, store=True, type='integer'),
-        'type1':fields.selection([('dr','Debit'),('cr','Credit'),('none','None')], 'Dr/Cr',store=True),
-    }
-    
-    def compute_total(self, cr, uid, ids, yr_st_date, yr_end_date, st_date, end_date, field_names, context={}):
-        if not (st_date >= yr_st_date and end_date <= yr_end_date):
-            return {}
-        query = "l.date >= '%s' AND l.date <= '%s'" % (st_date, end_date)
-        return self.__compute(cr, uid, ids, field_names, context=context, query=query)
-        
-    def create(self, cr, uid, vals, context={}):
-        name=self.search(cr,uid,[('name','ilike',vals['name']),('company_id','=',vals['name'])])
-        if name:
-            raise osv.except_osv('Error', 'Account is Already Created !')
-        obj=self.pool.get('account.account.type').browse(cr,uid,vals['user_type'])
-        if obj.code in ('cash','asset','expense'):
-            vals['type1'] = 'dr'
-        elif obj.code in ('equity','income','liability') : 
-             vals['type1'] = 'cr'
-        else:
-             vals['type1'] = 'none'
-        journal_ids=self.pool.get('account.journal').search(cr,uid,[('name','=','Opening Journal')])
-        vals['journal_id'] = journal_ids and journal_ids[0] or False
-        account_id = super(account_account, self).create(cr, uid, vals, context)
-        if vals.get('type1', False) != False:
-            journal_id = vals.get('journal_id',False)
-            if journal_id and vals.has_key('open_bal'):
-                if vals['open_bal'] != 0.0:
-                    journal = self.pool.get('account.journal').browse(cr, uid, [journal_id])
-                    if journal and journal[0].sequence_id:
-                        name = self.pool.get('ir.sequence').get_id(cr, uid, journal[0].sequence_id.id)
-                    move=self.pool.get('account.move').search(cr,uid,[('journal_id','=',journal_id)])
-                    if not move:
-                        move = False
-                        move_data = {'name': name, 'journal_id': journal_id}
-                        move_id=self.pool.get('account.move').create(cr,uid,move_data)
-                        move_obj=self.pool.get('account.move').browse(cr,uid,move_id)
-                    else:
-                        move_obj=self.pool.get('account.move').browse(cr,uid,move[0])
-                    self_obj=self.browse(cr,uid,account_id)
-                    move_line = {
-                         'name':journal[0].name,
-                         'debit':self_obj.debit or False,
-                         'credit':self_obj.credit or False,
-                         'account_id':account_id or False,
-                         'move_id':move and move[0] or move_id,
-                         'journal_id':journal_id ,
-                         'period_id':move_obj.period_id.id,
-                 }
-                    if vals['type1'] == 'dr':
-                        move_line['debit'] = vals['open_bal'] or False
-                    elif vals['type1'] == 'cr':
-                        move_line['credit'] = vals['open_bal'] or False
-                    self.pool.get('account.move.line').create(cr,uid,move_line)
-        return account_id
-
-    def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
-        res_temp={}
-        if vals.has_key('name'):
-            if not vals.has_key('company_id'):
-                vals['company_id']=self.browse(cr,uid,ids)[0].company_id.id
-            name=self.search(cr,uid,[('name','ilike',vals['name']),('company_id','=',vals['company_id'])])
-            if name:
-                raise osv.except_osv('Error', 'Same Account Name is Already present !')
-        if vals.has_key('user_type'):
-            obj=self.pool.get('account.account.type').browse(cr,uid,vals['user_type'])
-            if obj.code in ('asset','expense'):
-                vals['type1'] = 'dr'
-            elif obj.code in ('income','liability') : 
-                 vals['type1'] = 'cr'
-            else:
-                 vals['type1'] = 'none'
-        super(account_account, self).write(cr, uid,ids, vals, context)
-        if vals.has_key('open_bal'):
-            self_obj= self.browse(cr,uid,ids)
-            move_pool=self.pool.get('account.move')
-            if vals:
-                for obj in self_obj:
-                    flg=0
-                    if obj.journal_id and obj.journal_id.type == 'situation':
-                        move=move_pool.search(cr,uid,[('journal_id','=',obj.journal_id.id)])
-                        if move:
-                            move_obj=move_pool.browse(cr,uid,move[0])
-                            move=move[0]
-                        else:
-                            name = self.pool.get('ir.sequence').get_id(cr, uid, obj.journal_id.sequence_id.id)
-                            move_data = {'name': name, 'journal_id': obj.journal_id.id}
-                            move=self.pool.get('account.move').create(cr,uid,move_data)
-                            move_obj=move_pool.browse(cr,uid,move)
-                        move_line_data={'name':obj.journal_id.name,
-                                               'debit':obj.debit or 0.0,
-                                               'credit':obj.credit or 0.0,
-                                               'account_id':obj.id,
-                                               'move_id':move,
-                                               'journal_id':obj.journal_id.id,
-                                               'period_id':move_obj.period_id.id,
-                                               }
-                        if obj.type1:
-                            if obj.type1 == 'dr':
-                                move_line_data['debit'] = obj.open_bal
-                            elif obj.type1 == 'cr':
-                                move_line_data['credit'] = obj.open_bal
-                        if move_obj and move:
-                            for move_line in move_obj.line_id:
-                                if move_line.account_id.id == obj.id:
-                                    if move_line_data['debit'] == 0.0 and move_line_data['credit']== 0.0:
-                                        self.pool.get('account.move.line').unlink(cr,uid,[move_line.id])
-                                    else:
-                                        self.pool.get('account.move.line').write(cr,uid,[move_line.id],move_line_data)
-                                    flg=1
-                            if not flg:
-                                self.pool.get('account.move.line').create(cr,uid,move_line_data)
-        return True
-
-    def onchange_type(self, cr, uid, ids,user_type,type1):
-        if not user_type:
-            return {'value' : {}}
-        type_obj=self.pool.get('account.account.type').browse(cr,uid,user_type)
-        if type_obj.code in ('asset','expense'):
-            type1 = 'dr'
-        elif type_obj.code in ('income','liability') :
-            type1 = 'cr'
-        else:
-            type1 = 'none'
-
-        return {
-            'value' : {'type1' : type1}
-    }
-account_account()
-
-class account_move(osv.osv):
-    _inherit = "account.move"
-    _columns = {
-        'name':fields.char('Name', size=256, required=True, readonly=True, states={'draft':[('readonly',False)]}),
-    }
-account_move()
-
-class res_currency(osv.osv):
-    _inherit = "res.currency"
-
-    _columns = {
-                'sub_name': fields.char('Sub Currency', size=32, required=True)
-            }
-    _defaults = {
-        'sub_name': lambda *a: 'cents',
-
-    }
-res_currency()
-
-class account_account_template(osv.osv):
-        _inherit = "account.account.template"
-        
-        _columns = {
-        'type1':fields.selection([('dr','Debit'),('cr','Credit'),('none','None')], 'Dr/Cr',store=True),
-    }
-
-account_account_template()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_voucher/account_report.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-	<data>
-		<report id="report_account_voucher"
-			string="Voucher Report (Cr/Dr)"
-			model="account.voucher"
-			name="voucher.cash_receipt.drcr"
-			rml="account_voucher/report/report_voucher.rml"
-			auto="False"
-			header = "False"
-			menu="True"/>
-			
-		<report id="report_account_voucher_amt"
-			string="Voucher Report"
-			model="account.voucher"
-			name="voucher.cash_amount"
-			rml="account_voucher/report/report_voucher_amount.rml"
-			auto="False"
-			header = "False"
-			menu="True"/>
-	</data>
-</openerp>

addons/account_voucher/account_view.xml

@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record model="ir.ui.view" id="account_form1">
-            <field name="name">account.form1</field>
-            <field name="inherit_id" ref="account.view_account_form"/>
-            <field name="model">account.account</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <field name="user_type" position="after">
-                    <field name="balance" string="Closing Balance"/>
-                    <field name="type1" />
-                    <field name="open_bal"/>
-                    <field name="journal_id"/>
-                </field>
-            </field>
-        </record>
-        
-        <record model="ir.ui.view" id="account_form2">
-            <field name="name">account.form2</field>
-            <field name="inherit_id" ref="account.view_account_form"/>
-            <field name="model">account.account</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <field name="user_type" position="replace">
-                        <field name="user_type" select="1" on_change="onchange_type(user_type,type1)"/>
-                </field>
-            </field>
-        </record>
-        
-        <record model="ir.ui.view" id="account_tree1">
-            <field name="name">account.tree1</field>
-            <field name="inherit_id" ref="account.view_account_tree"/>
-            <field name="model">account.account</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <field name="name" position="after">
-                        <field name="open_bal" select="1"/>
-                </field>
-            </field>
-        </record>
-        
-        <record model="ir.ui.view" id="account_tree2">
-            <field name="name">account.tree2</field>
-            <field name="inherit_id" ref="account.view_account_tree"/>
-            <field name="model">account.account</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <field name="company_currency_id" position="before">
-                    <field name="type1"/>
-                </field>
-            </field>
-        </record>
-    
-        <!--    sub_currency    -->
-        <record model="ir.ui.view" id="sub_currency_form">
-            <field name="name">sub.currency.form</field>
-            <field name="inherit_id" ref="base.view_currency_form" />
-            <field name="model">res.currency</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <field name="name" position="after">
-                    <field name="sub_name" />
-                </field>
-            </field>
-        </record>
-        
-        <act_window name="Opening Balance Entry"
-            domain="[('journal_id', '=', journal_id)]"
-            res_model="account.move.line"
-            src_model="account.account"
-            id="act_account_acount_move_line_open1"/>
-
-    </data>
-</openerp>

addons/account_voucher/report/report_voucher.py

@@ -23,7 +23,6 @@ import time
 from report import report_sxw
 from tools import amount_to_text_en
 
-
 class report_voucher(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
         super(report_voucher, self).__init__(cr, uid, name, context)

addons/account_voucher/report/report_voucher.rml

@@ -26,24 +26,20 @@
       <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="voucher_lines">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table4">
+    <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
     <blockTableStyle id="last_info">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,7" stop="0,7"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,6" stop="0,6"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,7" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,7" stop="1,7"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,6" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,6" stop="1,6"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,7" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,7" stop="2,7"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,6" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,6" stop="2,6"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table3">
@@ -53,48 +49,42 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT"/>
-    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="13.0" leading="16" alignment="CENTER"/>
-    <paraStyle name="P3" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="22.0" leading="27" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P5" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P6" fontName="Helvetica" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P9" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P11" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
-    <paraStyle name="P13" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P14" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P15" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P16" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P17" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P18" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P19" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P20" fontName="Helvetica" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
-    <paraStyle name="P21" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P22" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P23" fontName="Helvetica-Bold" fontSize="13.0" leading="16" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P24" rightIndent="0.0" leftIndent="35.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
-    <paraStyle name="P25" rightIndent="0.0" leftIndent="35.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P26" rightIndent="0.0" leftIndent="35.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P27" rightIndent="0.0" leftIndent="71.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
-    <paraStyle name="P28" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
-    <paraStyle name="P29" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P30" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
-    <paraStyle name="P31" fontName="Helvetica" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
-    <paraStyle name="P32" rightIndent="0.0" leftIndent="35.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
-    <paraStyle name="P33" rightIndent="0.0" leftIndent="71.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
-    <paraStyle name="Standard" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT"/>
+    <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="13.0" leading="16" alignment="CENTER"/>
+    <paraStyle name="P2" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="22.0" leading="27" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P4" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P5" fontName="Helvetica" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P9" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P10" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P11" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P14" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P15" fontName="Helvetica" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="P16" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P17" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P18" fontName="Helvetica-Bold" fontSize="13.0" leading="16" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P19" rightIndent="0.0" leftIndent="35.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P20" rightIndent="0.0" leftIndent="35.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P21" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="P22" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P23" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="P24" fontName="Helvetica" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="P25" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P26" rightIndent="0.0" leftIndent="71.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="P27" rightIndent="0.0" leftIndent="35.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="Standard" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Text body" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Times-Italic" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Heading" fontName="Times-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Text body" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica-Oblique" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT"/>
+    <paraStyle name="Table Contents" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Heading" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -103,26 +93,26 @@
     <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Footer" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Footer" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT"/>
+    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="14.0"/>
     <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Drawing" fontName="Times-Italic" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Header" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT"/>
-    <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="LEFT"/>
-    <paraStyle name="Addressee" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="3.0"/>
-    <paraStyle name="Signature" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT"/>
+    <paraStyle name="terp_default_8_Italic" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Drawing" fontName="Helvetica-Oblique" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Header" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT"/>
+    <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT"/>
+    <paraStyle name="Addressee" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="Signature" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT"/>
     <paraStyle name="Heading 8" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Heading 7" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Heading 6" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -131,266 +121,281 @@
     <paraStyle name="Heading 1" fontName="Helvetica-Bold" fontSize="115%" leading="NaN" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Heading 10" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Salutation" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT"/>
-    <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Salutation" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT"/>
+    <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_9_with_indent_10" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9_50" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <images/>
   </stylesheet>
-  <images/>
   <story>
-    <para style="P29">[[ repeatIn(objects,'voucher') ]]</para>
-    <para style="P4">[[ company.name ]]</para>
-    <para style="P6">[[ company.partner_id.address and company.partner_id.address[0].street ]]</para>
-    <para style="P6">[[ company.partner_id.address and company.partner_id.address[0].zip ]] [[ company.partner_id.address and company.partner_id.address[0].city ]] - [[ company.partner_id.address and company.partner_id.address[0].country_id and company.partner_id.address[0].country_id.name ]]</para>
-    <para style="P6">[[ company.partner_id.address and company.partner_id.address[0].phone ]]</para>
-    <para style="P6">[[ company.partner_id.address and company.partner_id.address[0].email ]]</para>
-    <para style="P5">
+    <para style="P22">[[ repeatIn(objects,'voucher') ]]</para>
+    <para style="P3">[[ company.name ]]</para>
+    <para style="P5">[[ company.partner_id.address and company.partner_id.address[0].street ]]</para>
+    <para style="P5">[[ company.partner_id.address and company.partner_id.address[0].zip ]] [[ company.partner_id.address and company.partner_id.address[0].city ]] - [[ company.partner_id.address and company.partner_id.address[0].country_id and company.partner_id.address[0].country_id.name ]]</para>
+    <para style="P5">[[ company.partner_id.address and company.partner_id.address[0].phone ]]</para>
+    <para style="P5">[[ company.partner_id.address and company.partner_id.address[0].email ]]</para>
+    <para style="P4">
       <font color="white"> </font>
     </para>
-    <para style="P23">Cash Receipt Voucher [[ (voucher.type == 'rec_voucher' or removeParentNode('para')) and '' ]]</para>
-    <para style="P2">Cash Payment Voucher [[ (voucher.type == 'pay_voucher' or removeParentNode('para')) and '' ]]</para>
-    <para style="P23">Bank Receipt Voucher [[ (voucher.type == 'bank_rec_voucher' or removeParentNode('para')) and '' ]]</para>
-    <para style="P2">Bank Payment Voucher [[ (voucher.type == 'bank_pay_voucher' or removeParentNode('para')) and '' ]]</para>
-    <para style="P22">
+    <para style="P18">Cash Receipt Voucher [[ (voucher.type == 'rec_voucher' or removeParentNode('para')) and '' ]]</para>
+    <para style="P1">Cash Payment Voucher [[ (voucher.type == 'pay_voucher' or removeParentNode('para')) and '' ]]</para>
+    <para style="P18">Bank Receipt Voucher [[ (voucher.type == 'bank_rec_voucher' or removeParentNode('para')) and '' ]]</para>
+    <para style="P1">Bank Payment Voucher [[ (voucher.type == 'bank_pay_voucher' or removeParentNode('para')) and '' ]]</para>
+    <para style="P17">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="49.0,143.0,116.0,69.0,106.0" style="Table1">
       <tr>
         <td>
-          <para style="P10">No.</para>
+          <para style="P9">No.</para>
         </td>
         <td>
-          <para style="P11">[[ voucher.number ]]</para>
+          <para style="P10">[[ voucher.number ]]</para>
         </td>
         <td>
-          <para style="P3">
+          <para style="P2">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="P10">Dated :</para>
+          <para style="P9">Dated :</para>
         </td>
         <td>
-          <para style="P11">[[ time.strftime('%d %B,%Y', time.strptime(voucher.date , '%Y-%m-%d')) or '' ]]</para>
+          <para style="P10">[[ time.strftime('%d %B,%Y', time.strptime(voucher.date , '%Y-%m-%d')) or '' ]]</para>
         </td>
       </tr>
       <tr>
         <td>
-          <para style="P10">State :</para>
+          <para style="P9">State :</para>
         </td>
         <td>
-          <para style="P21">PRO-FORMA [[ ((voucher.state == 'proforma') or removeParentNode('para')) and '' ]]</para>
-          <para style="P21">Draft[[ ((voucher.state == 'draft') or removeParentNode('para')) and '' ]]</para>
-          <para style="P21">Canceled [[ ((voucher.state == 'cancel') or removeParentNode('para')) and '' ]]</para>
-          <para style="P21">Posted [[ ((voucher.state == 'posted') or removeParentNode('para')) and '' ]]</para>
+          <para style="P16">PRO-FORMA [[ ((voucher.state == 'proforma') or removeParentNode('para')) and '' ]]</para>
+          <para style="P16">Draft[[ ((voucher.state == 'draft') or removeParentNode('para')) and '' ]]</para>
+          <para style="P16">Canceled [[ ((voucher.state == 'cancel') or removeParentNode('para')) and '' ]]</para>
+          <para style="P16">Posted [[ ((voucher.state == 'posted') or removeParentNode('para')) and '' ]]</para>
         </td>
         <td>
-          <para style="P3">
+          <para style="P2">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="P10">Ref. :</para>
+          <para style="P9">Ref. :</para>
         </td>
         <td>
-          <para style="P11">[[ voucher.reference ]]</para>
+          <para style="P10">[[ voucher.reference ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="P13">
+    <para style="P11">
       <font color="white"> </font>
     </para>
-    <para style="P13">
+    <para style="P11">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="255.0,114.0,114.0" style="Heading1">
+    <blockTable colWidths="255.0,114.0,113.0" style="Heading1">
       <tr>
         <td>
-          <para style="P15">Particulars</para>
+          <para style="terp_header">Particulars</para>
         </td>
         <td>
-          <para style="P16">Debit</para>
+          <para style="terp_header_Right">Debit</para>
         </td>
         <td>
-          <para style="P16">Credit</para>
+          <para style="terp_header_Right">Credit</para>
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_1"/>
-    <blockTable colWidths="482.0" style="voucher_lines">
-      <tr>
-        <td>
-          <para style="terp_default_1">
-            <font color="white"> </font>
-          </para>
-          <section>
-            <para style="terp_default_8">[[ repeatIn(voucher.move_ids,'move_ids') ]] </para>
-            <blockTable colWidths="251.0,114.0,111.0" style="Table4">
-              <tr>
-                <td>
-                  <para style="P12">[[ (move_ids.partner_id and move_ids.partner_id.name) or '']] :</para>
-                  <para style="P24">[[ move_ids.account_id.name ]] </para>
-                  <para style="P27">[[ get_ref(voucher.id,move_ids) ]]</para>
-                </td>
-                <td>
-                  <para style="P20">[[ move_ids.debit ]]</para>
-                </td>
-                <td>
-                  <para style="P20">[[ move_ids.credit ]]</para>
-                </td>
-              </tr>
-            </blockTable>
-            <para style="terp_default_1">
+    <para style="terp_default_1">
+      <font color="white"> </font>
+    </para>
+    <section>
+      <para style="terp_default_8">[[ repeatIn(voucher.move_ids,'move_ids') ]] </para>
+      <blockTable colWidths="254.0,115.0,113.0" style="Table2">
+        <tr>
+          <td>
+            <para style="terp_default_Bold_9">
+              <font face="Helvetica" size="10.0">[[ (move_ids.partner_id and move_ids.partner_id.name) or 'Account']] </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(move_ids.debit) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(move_ids.credit) ]]</para>
+          </td>
+        </tr>
+        <tr>
+          <td>
+            <para style="terp_default_9_with_indent_10">
+              <font face="Helvetica">[[ move_ids.account_id.name ]] </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">
               <font color="white"> </font>
             </para>
-          </section>
-          <para style="P28">
-            <font color="white"> </font>
-          </para>
-        </td>
-      </tr>
-    </blockTable>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">
+              <font color="white"> </font>
+            </para>
+          </td>
+        </tr>
+        <tr>
+          <td>
+            <para style="terp_default_8_Italic">[[ move_ids.name ]] - [[ get_ref(voucher.id,move_ids) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9_50">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_9_50">
+              <font color="white"> </font>
+            </para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_1">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
     <blockTable colWidths="253.0,114.0,114.0" style="last_info">
       <tr>
         <td>
-          <para style="P14">
+          <para style="P12">Through : </para>
+        </td>
+        <td>
+          <para style="P2">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="P3">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="P3">
+          <para style="P2">
             <font color="white"> </font>
           </para>
         </td>
       </tr>
       <tr>
         <td>
-          <para style="P14">Through : </para>
+          <para style="P19">[[ voucher.narration or '']]</para>
         </td>
         <td>
-          <para style="P3">
+          <para style="P2">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="P3">
+          <para style="P2">
             <font color="white"> </font>
           </para>
         </td>
       </tr>
       <tr>
         <td>
-          <para style="P25">[[ voucher.narration or '']]</para>
+          <para style="P12">On Account of : </para>
         </td>
         <td>
-          <para style="P3">
+          <para style="P2">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="P3">
+          <para style="P2">
             <font color="white"> </font>
           </para>
         </td>
       </tr>
       <tr>
         <td>
-          <para style="P14">On Account of : </para>
+          <para style="P20">[[ voucher.name ]]</para>
         </td>
         <td>
-          <para style="P3">
+          <para style="P2">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="P3">
+          <para style="P2">
             <font color="white"> </font>
           </para>
         </td>
       </tr>
       <tr>
         <td>
-          <para style="P26">[[ voucher.name ]]</para>
+          <para style="P12">Amount (in words) : </para>
         </td>
         <td>
-          <para style="P3">
+          <para style="P12">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="P3">
+          <para style="P12">
             <font color="white"> </font>
           </para>
         </td>
       </tr>
       <tr>
         <td>
-          <para style="P14">Amount (in words) : </para>
+          <para style="P20">[[ convert(voucher.amount,voucher.currency_id.name) ]]</para>
         </td>
         <td>
-          <para style="P14">
+          <para style="P11">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="P14">
+          <para style="P11">
             <font color="white"> </font>
           </para>
         </td>
       </tr>
       <tr>
-        <td>
-          <para style="P26">[[ convert(voucher.amount,voucher.currency_id.name) ]]</para>
-        </td>
         <td>
           <para style="P13">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="P13">
-            <font color="white"> </font>
-          </para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="P17">
-            <font color="white"> </font>
-          </para>
+          <para style="P25">[[ debit(voucher.move_ids)]]</para>
         </td>
         <td>
-          <para style="P18">[[ debit(voucher.move_ids)]]</para>
-        </td>
-        <td>
-          <para style="P18">[[ credit(voucher.move_ids) ]]</para>
+          <para style="P25">[[ credit(voucher.move_ids) ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="P19">
+    <para style="P14">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="142.0,99.0,105.0,136.0" style="Table3">
       <tr>
         <td>
-          <para style="P7">
+          <para style="P6">
             <font color="white"> </font>
           </para>
-          <para style="P7">
+          <para style="P6">
             <font color="white"> </font>
           </para>
-          <para style="P7">
+          <para style="P6">
             <font color="white"> </font>
           </para>
-          <para style="P7">
+          <para style="P6">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P6">
             <font color="white"> </font>
           </para>
         </td>
@@ -404,32 +409,27 @@
             <font color="white"> </font>
           </para>
         </td>
-        <td>
-          <para style="P9">
-            <font color="white"> </font>
-          </para>
-        </td>
       </tr>
       <tr>
         <td>
-          <para style="P22">Receiver's Signature</para>
+          <para style="P17">Receiver's Signature</para>
         </td>
         <td>
-          <para style="P22">
+          <para style="P17">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="P22">
+          <para style="P17">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="P22">Authorised Signatory</para>
+          <para style="P17">Authorised Signatory</para>
         </td>
       </tr>
     </blockTable>
-    <para style="P1">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
   </story>

addons/account_voucher/report/report_voucher_amount.py

@@ -23,7 +23,6 @@ import time
 from report import report_sxw
 from tools import amount_to_text_en
 
-
 class report_voucher_amount(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
         super(report_voucher_amount, self).__init__(cr, uid, name, context)
@@ -42,4 +41,4 @@ report_sxw.report_sxw(
     'account.voucher',
     'addons/account_voucher/report/report_voucher_amount.rml',
     parser=report_voucher_amount,header=False
-)
+)

addons/account_voucher/report/report_voucher_amount.rml

@@ -34,10 +34,10 @@
     <blockTableStyle id="last_info">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,7" stop="0,7"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,6" stop="0,6"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,7" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,7" stop="1,7"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,6" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,6" stop="1,6"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table5">
@@ -60,31 +60,27 @@
     <paraStyle name="P11" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P12" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P14" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P15" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P16" fontName="Helvetica" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P17" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P18" fontName="Helvetica" fontSize="5.0" leading="7" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
-    <paraStyle name="P19" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P20" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P21" fontName="Helvetica-Bold" fontSize="13.0" leading="16" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P22" rightIndent="0.0" leftIndent="35.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P23" rightIndent="0.0" leftIndent="35.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P24" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P25" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
-    <paraStyle name="P26" fontName="Helvetica" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
-    <paraStyle name="P27" rightIndent="0.0" leftIndent="35.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
-    <paraStyle name="P28" rightIndent="0.0" leftIndent="71.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
-    <paraStyle name="P29" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
-    <paraStyle name="Standard" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT"/>
+    <paraStyle name="P14" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P15" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P16" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P17" fontName="Helvetica-Bold" fontSize="13.0" leading="16" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P18" rightIndent="0.0" leftIndent="35.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P19" rightIndent="0.0" leftIndent="35.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P20" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P21" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="P22" fontName="Helvetica" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="P23" rightIndent="0.0" leftIndent="35.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="P24" rightIndent="0.0" leftIndent="71.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="P25" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="Standard" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Text body" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Times-Italic" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Heading" fontName="Times-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Text body" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica-Oblique" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT"/>
+    <paraStyle name="Table Contents" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Heading" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -93,26 +89,26 @@
     <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Footer" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Footer" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT"/>
+    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="14.0"/>
     <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Drawing" fontName="Times-Italic" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Header" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT"/>
-    <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="LEFT"/>
-    <paraStyle name="Addressee" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="3.0"/>
-    <paraStyle name="Signature" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT"/>
+    <paraStyle name="Drawing" fontName="Helvetica-Oblique" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Header" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT"/>
+    <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT"/>
+    <paraStyle name="Addressee" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="Signature" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT"/>
     <paraStyle name="Heading 8" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Heading 7" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Heading 6" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -121,17 +117,19 @@
     <paraStyle name="Heading 1" fontName="Helvetica-Bold" fontSize="115%" leading="NaN" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Heading 10" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Salutation" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT"/>
-    <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Salutation" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT"/>
+    <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_9_30" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9_50" rightIndent="0.0" leftIndent="14.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <images/>
   </stylesheet>
-  <images/>
   <story>
-    <para style="P24">[[ repeatIn(objects,'voucher') ]]</para>
+    <para style="P20">[[ repeatIn(objects,'voucher') ]]</para>
     <para style="P4">[[ company.name ]]</para>
     <para style="P6">[[ company.partner_id.address and company.partner_id.address[0].street ]]</para>
     <para style="P6">[[ company.partner_id.address and company.partner_id.address[0].zip ]] [[ company.partner_id.address and company.partner_id.address[0].city ]] - [[ company.partner_id.address and company.partner_id.address[0].country_id and company.partner_id.address[0].country_id.name ]]</para>
@@ -140,11 +138,11 @@
     <para style="P5">
       <font color="white"> </font>
     </para>
-    <para style="P21">Cash Receipt Voucher [[ (voucher.type == 'rec_voucher' or removeParentNode('para')) and '' ]]</para>
+    <para style="P17">Cash Receipt Voucher [[ (voucher.type == 'rec_voucher' or removeParentNode('para')) and '' ]]</para>
     <para style="P2">Cash Payment Voucher [[ (voucher.type == 'pay_voucher' or removeParentNode('para')) and '' ]]</para>
-    <para style="P21">Bank Receipt Voucher [[ (voucher.type == 'bank_rec_voucher' or removeParentNode('para')) and '' ]]</para>
+    <para style="P17">Bank Receipt Voucher [[ (voucher.type == 'bank_rec_voucher' or removeParentNode('para')) and '' ]]</para>
     <para style="P2">Bank Payment Voucher [[ (voucher.type == 'bank_pay_voucher' or removeParentNode('para')) and '' ]]</para>
-    <para style="P20">
+    <para style="P16">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="68.0,124.0,122.0,62.0,106.0" style="Table1">
@@ -172,10 +170,10 @@
           <para style="P10">State :</para>
         </td>
         <td>
-          <para style="P19">PRO-FORMA [[ ((voucher.state == 'proforma') or removeParentNode('para')) and '' ]]</para>
-          <para style="P19">Draft[[ ((voucher.state == 'draft') or removeParentNode('para')) and '' ]]</para>
-          <para style="P19">Canceled [[ ((voucher.state == 'cancel') or removeParentNode('para')) and '' ]]</para>
-          <para style="P19">Posted [[ ((voucher.state == 'posted') or removeParentNode('para')) and '' ]]</para>
+          <para style="P15">PRO-FORMA [[ ((voucher.state == 'proforma') or removeParentNode('para')) and '' ]]</para>
+          <para style="P15">Draft[[ ((voucher.state == 'draft') or removeParentNode('para')) and '' ]]</para>
+          <para style="P15">Canceled [[ ((voucher.state == 'cancel') or removeParentNode('para')) and '' ]]</para>
+          <para style="P15">Posted [[ ((voucher.state == 'posted') or removeParentNode('para')) and '' ]]</para>
         </td>
         <td>
           <para style="P3">
@@ -194,7 +192,7 @@
           <para style="P10">Account :</para>
         </td>
         <td>
-          <para style="P19">[[ voucher.account_id.name ]]</para>
+          <para style="P15">[[ voucher.account_id.name ]]</para>
         </td>
         <td>
           <para style="P3">
@@ -222,10 +220,10 @@
     <blockTable colWidths="344.0,138.0" style="Heading1">
       <tr>
         <td>
-          <para style="P14">Particulars</para>
+          <para style="terp_header">Particulars</para>
         </td>
         <td>
-          <para style="P15">Amount</para>
+          <para style="terp_header_Right">Amount</para>
         </td>
       </tr>
     </blockTable>
@@ -237,41 +235,60 @@
           </para>
           <section>
             <para style="terp_default_8">[[ repeatIn(voucher.payment_ids,'payment_ids') ]] </para>
-            <blockTable colWidths="340.0,136.0" style="Table3">
+            <blockTable colWidths="342.0,135.0" style="Table3">
               <tr>
                 <td>
-                  <para style="P25">[[ payment_ids.partner_id.name ]] :</para>
-                  <para style="P27">[[ payment_ids.account_id.name ]] </para>
-                  <para style="P28">[[ payment_ids.ref ]] [[ payment_ids.amount ]] [[ payment_ids.type ]]</para>
+                  <para style="terp_header">[[ payment_ids.partner_id and payment_ids.partner_id.name or '' ]] </para>
                 </td>
                 <td>
-                  <para style="P26">[[ payment_ids.amount ]]</para>
+                  <para style="terp_header_Right">[[ payment_ids.amount ]]</para>
+                </td>
+              </tr>
+              <tr>
+                <td>
+                  <para style="terp_default_9_30">[[ payment_ids.account_id.name ]] </para>
+                </td>
+                <td>
+                  <para style="P22">
+                    <font color="white"> </font>
+                  </para>
+                </td>
+              </tr>
+              <tr>
+                <td>
+                  <para style="terp_default_9_50">[[ payment_ids.ref ]] [[ payment_ids.amount ]] </para>
+                </td>
+                <td>
+                  <para style="terp_default_9_50">
+                    <font color="white"> </font>
+                  </para>
+                </td>
+              </tr>
+              <tr>
+                <td>
+                  <para style="terp_default_9_50">[[ payment_ids.type ]]</para>
+                </td>
+                <td>
+                  <para style="terp_default_9_50">
+                    <font color="white"> </font>
+                  </para>
                 </td>
               </tr>
             </blockTable>
-            <para style="terp_default_1">
+            <para style="terp_default_9">
               <font color="white"> </font>
             </para>
           </section>
-          <para style="P29">
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+          <para style="P25">
             <font color="white"> </font>
           </para>
         </td>
       </tr>
     </blockTable>
     <blockTable colWidths="344.0,138.0" style="last_info">
-      <tr>
-        <td>
-          <para style="P13">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="P3">
-            <font color="white"> </font>
-          </para>
-        </td>
-      </tr>
       <tr>
         <td>
           <para style="P13">Through : </para>
@@ -284,7 +301,7 @@
       </tr>
       <tr>
         <td>
-          <para style="P22">[[ voucher.narration or '' ]] </para>
+          <para style="P18">[[ voucher.narration or '' ]] </para>
         </td>
         <td>
           <para style="P11">
@@ -304,7 +321,7 @@
       </tr>
       <tr>
         <td>
-          <para style="P23">[[ voucher.name ]]</para>
+          <para style="P19">[[ voucher.name ]]</para>
         </td>
         <td>
           <para style="P11">
@@ -324,7 +341,7 @@
       </tr>
       <tr>
         <td>
-          <para style="P23">[[ convert(voucher.amount,voucher.currency_id.name) ]]</para>
+          <para style="P19">[[ convert(voucher.amount,voucher.currency_id.name) ]]</para>
         </td>
         <td>
           <para style="P12">
@@ -339,11 +356,11 @@
           </para>
         </td>
         <td>
-          <para style="P16">[[ voucher.amount ]]</para>
+          <para style="terp_header_Right">[[ voucher.amount ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="P17">
+    <para style="P14">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="142.0,99.0,105.0,136.0" style="Table5">
@@ -380,20 +397,20 @@
       </tr>
       <tr>
         <td>
-          <para style="P20">Receiver's Signature</para>
+          <para style="P16">Receiver's Signature</para>
         </td>
         <td>
-          <para style="P20">
+          <para style="P16">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="P20">
+          <para style="P16">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="P20">Authorised Signatory</para>
+          <para style="P16">Authorised Signatory</para>
         </td>
       </tr>
     </blockTable>

addons/account_voucher/voucher.py

@@ -21,13 +21,25 @@
 
 import time
 import netsvc
-from osv import fields, osv
+from osv import fields
+from osv import osv
 import ir
 import pooler
 import mx.DateTime
 from mx.DateTime import RelativeDateTime
 from tools import config
 
+type2journal = {
+    'rec_voucher': 'cash',
+    'bank_rec_voucher': 'bank',
+    'pay_voucher': 'cash',
+    'bank_pay_voucher': 'bank',
+    'cont_voucher': 'cash',
+    'journal_sale_vou': 'sale',
+    'journal_pur_voucher': 'purchase',
+    'journal_voucher':'general'
+}
+
 class ir_sequence_type(osv.osv):
     _inherit = "ir.sequence.type"
     _columns = {
@@ -36,8 +48,19 @@ class ir_sequence_type(osv.osv):
     }
 ir_sequence_type()
 
+class account_journal(osv.osv):
+    _inherit = "account.journal"
+    _columns = {
+        'max_amount': fields.float('Verify Transection', digits=(16, int(config['price_accuracy'])), help="Validate voucher entry twice before posting it, if transection amount more then entered here"),
+    }
+account_journal()
+
 class account_voucher(osv.osv):
-    def _get_period(self, cr, uid, context):
+
+    def _get_period(self, cr, uid, context={}):
+        if context.get('period_id', False):
+            return context.get('period_id')
+            
         periods = self.pool.get('account.period').find(cr, uid)
         if periods:
             return periods[0]
@@ -45,34 +68,22 @@ class account_voucher(osv.osv):
             return False
 
     def _get_type(self, cr, uid, context={}):
-        type = context.get('type', 'rec_voucher')
+        type = context.get('type', 'bank_rec_voucher')
         return type
 
     def _get_reference_type(self, cursor, user, context=None):
         return [('none', 'Free Reference')]
 
-    def _get_journal(self, cr, uid, context):
-        type_inv = 'rec_voucher'
-
-        if type(context) == type(''):
-            type_inv = context
-        elif type(context) == type({}):
-            type_inv = context.get('type', 'rec_voucher')
-
-        type2journal = {
-            'rec_voucher': 'cash',
-            'bank_rec_voucher': 'cash',
-            'pay_voucher': 'cash',
-            'bank_pay_voucher': 'cash',
-            'cont_voucher': 'cash',
-            'journal_sale_vou': 'sale',
-            'journal_pur_voucher': 'purchase',
-            'journal_voucher':'expanse'
-        }
-
-        journal_obj = self.pool.get('account.journal')
-        ttype = type2journal.get(type_inv, 'cash')
-        res = journal_obj.search(cr, uid, [('type', '=', ttype)], limit=1)
+    def _get_journal(self, cr, uid, context={}):
+        journal_pool = self.pool.get('account.journal')
+        
+        if context.get('journal_id', False):
+            return context.get('journal_id')
+        
+        type_inv = context.get('type', 'rec_voucher')
+        
+        ttype = type2journal.get(type_inv, type_inv)
+        res = journal_pool.search(cr, uid, [('type', '=', ttype)], limit=1)
 
         if res:
             return res[0]
@@ -80,7 +91,7 @@ class account_voucher(osv.osv):
             return False
 
     def _get_currency(self, cr, uid, context):
-        user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, [uid])[0]
+        user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid)
         if user.company_id:
             return user.company_id.currency_id.id
         else:
@@ -92,15 +103,15 @@ class account_voucher(osv.osv):
     _columns = {
         'name':fields.char('Name', size=256, required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'type': fields.selection([
-            ('pay_voucher','Cash Payment Voucher'),
-            ('bank_pay_voucher','Bank Payment Voucher'),
-            ('rec_voucher','Cash Receipt Voucher'),
-            ('bank_rec_voucher','Bank Receipt Voucher'),
-            ('cont_voucher','Contra Voucher'),
-            ('journal_sale_vou','Journal Sale Voucher'),
-            ('journal_pur_voucher','Journal Purchase Voucher'),
+            ('pay_voucher','Cash Payment'),
+            ('bank_pay_voucher','Bank Payment'),
+            ('rec_voucher','Cash Receipt'),
+            ('bank_rec_voucher','Bank Receipt'),
+            ('cont_voucher','Contra'),
+            ('journal_sale_vou','Journal Sale'),
+            ('journal_pur_voucher','Journal Purchase'),
             ('journal_voucher','Journal Voucher'),
-            ],'Type', readonly=True, select=True , size=128),
+            ],'Entry Type', select=True , size=128, readonly=True, states={'draft':[('readonly',False)]}),
         'date':fields.date('Date', readonly=True, states={'draft':[('readonly',False)]}),
         'journal_id':fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'account_id':fields.many2one('account.account', 'Account', required=True, readonly=True, states={'draft':[('readonly',False)]}, domain=[('type','<>','view')]),
@@ -110,16 +121,17 @@ class account_voucher(osv.osv):
         'currency_id': fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'state':fields.selection(
-                    [('draft','Draft'),
-                     ('proforma','Pro-forma'),
-                     ('posted','Posted'),
-                     ('cancel','Cancel')
-                    ], 'State',
-                    readonly=True,
-                    help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed Voucher. \
+            [('draft','Draft'),
+             ('proforma','Pro-forma'),
+             ('posted','Posted'),
+             ('recheck','Waiting for Re-checking'),
+             ('cancel','Cancel'),
+             ('audit','Audit Complete')
+            ], 'State', readonly=True, size=32,
+            help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed Voucher. \
                         \n* The \'Pro-forma\' when voucher is in Pro-forma state,voucher does not have an voucher number. \
                         \n* The \'Posted\' state is used when user create voucher,a voucher number is generated and voucher entries are created in account \
-                        \n* The \'Cancelled\' state is used when user cancel voucher.'),
+                        \n* The \'Cancelled\' state is used when user cancel voucher.'),                    
         'amount':fields.float('Amount', readonly=True),
         'number':fields.char('Number', size=32, readonly=True),
         'reference': fields.char('Voucher Reference', size=64),
@@ -131,43 +143,60 @@ class account_voucher(osv.osv):
     }
 
     _defaults = {
-        'state': lambda *a: 'draft',
-        'date' : lambda *a: time.strftime('%Y-%m-%d'),
         'period_id': _get_period,
         'type': _get_type,
-        'reference_type': lambda *a: 'none',
         'journal_id':_get_journal,
-        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.voucher', context=c),
         'currency_id': _get_currency,
+        
+        'state': lambda *a: 'draft',
+        'date' : lambda *a: time.strftime('%Y-%m-%d'),
+        'reference_type': lambda *a: "none",
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.voucher',context=c),
     }
 
-    def _get_analityc_lines(self, cr, uid, id):
-        inv = self.browse(cr, uid, [id])[0]
-        cur_obj = self.pool.get('res.currency')
+#    def _get_analityc_lines(self, cr, uid, id):
+#        inv = self.browse(cr, uid, [id])[0]
+#        cur_obj = self.pool.get('res.currency')
 
     def onchange_account(self, cr, uid, ids, account_id):
+        
         if not account_id:
-            return {'value':{'amount':False}}
-        account = self.pool.get('account.account').browse(cr,uid,account_id)
+            return {
+                'value':{'amount':False}
+            }
+
+        account = self.pool.get('account.account').browse(cr, uid, account_id)
         balance=account.balance
-        return {'value':{'amount':balance}}
+        return {
+            'value':{'amount':balance}
+        }
 
     def onchange_journal(self, cr, uid, ids, journal_id, type):
         if not journal_id:
-            return {'value':{'account_id':False}}
+            return {
+                'value':{'account_id':False}
+            }
+            
         journal = self.pool.get('account.journal')
+        
         if journal_id and (type in ('rec_voucher','bank_rec_voucher','journal_pur_voucher','journal_voucher')):
             account_id = journal.browse(cr, uid, journal_id).default_debit_account_id
-            return {'value':{'account_id':account_id.id}}
+            return {
+                'value':{'account_id':account_id.id}
+            }
         elif journal_id and (type in ('pay_voucher','bank_pay_voucher','journal_sale_vou')) :
                 account_id = journal.browse(cr, uid, journal_id).default_credit_account_id
-                return {'value':{'account_id':account_id.id}}
+                return {
+                    'value':{'account_id':account_id.id}
+                }
         else:
             account_id = journal.browse(cr, uid, journal_id).default_credit_account_id
-            return {'value':{'account_id':account_id.id}}
+            return {
+                'value':{'account_id':account_id.id}
+            }
 
     def open_voucher(self, cr, uid, ids, context={}):
-        obj = self.pool.get('account.voucher').browse(cr,uid,ids)
+        obj = self.pool.get('account.voucher').browse(cr, uid, ids)
         total = 0
         for i in obj[0].payment_ids:
             total += i.amount
@@ -200,8 +229,7 @@ class account_voucher(osv.osv):
                 unlink_ids.append(t['id'])
             else:
                 raise osv.except_osv('Invalid action !', 'Cannot delete Voucher(s) which are already opened or paid !')
-        osv.osv.unlink(self, cr, uid, unlink_ids)
-        return True
+        return super(account_voucher, self).unlink(self, cr, uid, unlink_ids)
 
     def _get_analytic_lines(self, cr, uid, id):
         inv = self.browse(cr, uid, [id])[0]
@@ -234,9 +262,12 @@ class account_voucher(osv.osv):
         return iml
 
     def action_move_line_create(self, cr, uid, ids, *args):
+    
         for inv in self.browse(cr, uid, ids):
+        
             if inv.move_id:
                 continue
+                
             company_currency = inv.company_id.currency_id.id
 
             line_ids = self.read(cr, uid, [inv.id], ['payment_ids'])[0]['payment_ids']
@@ -304,7 +335,8 @@ class account_voucher(osv.osv):
                 'name' : name,
                 'journal_id': journal_id,
                 'type' : inv.type,
-                'narration' : inv.narration
+                'narration' : inv.narration,
+                'date':inv.date
             }
             if inv.period_id:
                 move['period_id'] = inv.period_id.id
@@ -354,13 +386,14 @@ class account_voucher(osv.osv):
                 elif line.type == 'cr':
                     move_line['credit'] = line.amount or False
                     amount=line.amount * (-1)
-
+                
+                move_line['analytic_account_id'] = line.account_analytic_id.id or False
                 ml_id=self.pool.get('account.move.line').create(cr, uid, move_line)
 
                 if inv.narration:
-                    line.name=inv.narration
+                    line.name = inv.narration
                 else:
-                    line.name=line.name
+                    line.name = line.name
 
                 if line.account_analytic_id:
                     an_line = {
@@ -385,7 +418,6 @@ class account_voucher(osv.osv):
 
 
     def line_get_convert(self, cr, uid, x, date, context={}):
-
         return {
             'date':date,
             'date_maturity': x.get('date_maturity', False),
@@ -401,6 +433,7 @@ class account_voucher(osv.osv):
             'tax_amount': x.get('tax_amount', False),
             'ref':x.get('ref',False)
         }
+        
     def _convert_ref(self, cr, uid, ref):
         return (ref or '').replace('/','')
 
@@ -433,14 +466,14 @@ class account_voucher(osv.osv):
         if not len(ids):
             return []
         types = {
-                'pay_voucher': 'CPV: ',
-                'rec_voucher': 'CRV: ',
-                'cont_voucher': 'CV: ',
-                'bank_pay_voucher': 'BPV: ',
-                'bank_rec_voucher': 'BRV: ',
-                'journal_sale_vou': 'JSV: ',
-                'journal_pur_voucher': 'JPV: ',
-                'journal_voucher':'JV'
+            'pay_voucher': 'CPV: ',
+            'rec_voucher': 'CRV: ',
+            'cont_voucher': 'CV: ',
+            'bank_pay_voucher': 'BPV: ',
+            'bank_rec_voucher': 'BRV: ',
+            'journal_sale_vou': 'JSV: ',
+            'journal_pur_voucher': 'JPV: ',
+            'journal_voucher':'JV'
         }
         return [(r['id'], types[r['type']]+(r['number'] or '')+' '+(r['name'] or '')) for r in self.read(cr, uid, ids, ['type', 'number', 'name'], context, load='_classic_write')]
 
@@ -539,7 +572,6 @@ class account_voucher_line(osv.osv):
         if not amount:
             return {'value' : {}}
         if partner_id:
-
             obj = self.pool.get('res.partner')
             if type1 in ('rec_voucher', 'bank_rec_voucher', 'journal_voucher'):
                 if amount < 0 :
@@ -575,34 +607,23 @@ class account_voucher_line(osv.osv):
         else:
             if type1 in ('rec_voucher', 'bank_rec_voucher', 'journal_voucher'):
                 if amount < 0 :
-
                     type = 'dr'
                 else:
-
                     type = 'cr'
-
             elif type1 in ('pay_voucher','bank_pay_voucher','cont_voucher') :
                 if amount < 0 :
-
                     type = 'cr'
                 else:
-
                     type = 'dr'
-
             elif type1 in ('journal_sale_vou') :
                 if amount < 0 :
-
                     type = 'cr'
                 else:
-
                     type = 'dr'
-
             elif type1 in ('journal_pur_voucher') :
                 if amount< 0 :
-
                     type = 'dr'
                 else:
-
                     type = 'cr'
 
         return {
@@ -611,9 +632,7 @@ class account_voucher_line(osv.osv):
 
     def onchange_type(self, cr, uid, ids,partner_id,amount,type,type1):
         if partner_id:
-
             obj = self.pool.get('res.partner')
-
             if type1 in ('rec_voucher','bank_rec_voucher', 'journal_voucher'):
                 if type == 'dr' :
                     account_id = obj.browse(cr, uid, partner_id).property_account_payable
@@ -637,7 +656,6 @@ class account_voucher_line(osv.osv):
                 else:
                     account_id = obj.browse(cr, uid, partner_id).property_account_receivable
                     total=amount*(-1)
-
             elif type1 in ('journal_pur_voucher') :
                 if type == 'dr' :
                     account_id = obj.browse(cr, uid, partner_id).property_account_receivable
@@ -648,34 +666,25 @@ class account_voucher_line(osv.osv):
         else:
             if type1 in ('rec_voucher','bank_rec_voucher', 'journal_voucher'):
                 if type == 'dr' :
-
                     total=amount*(-1)
                 else:
-
                     total=amount*(-1)
 
             elif type1 in ('pay_voucher','bank_pay_voucher','cont_voucher') :
                 if type == 'cr' :
-
                     total=amount*(-1)
                 else:
-
                     total=amount*(-1)
 
             elif type1 in ('journal_sale_vou') :
                 if type == 'cr' :
-
                     total=amount*(-1)
                 else:
-
                     total=amount*(-1)
-
             elif type1 in ('journal_pur_voucher') :
                 if type == 'dr' :
-
                     total=amount*(-1)
                 else:
-
                     total=amount*(-1)
 
         return {
@@ -694,9 +703,3 @@ class account_voucher_line(osv.osv):
         }
 
 account_voucher_line()
-
-
-
-
-
-

addons/account_voucher/voucher_report.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <report id="report_account_voucher"
+            string="Print Voucher"
+            model="account.voucher"
+            name="voucher.cash_receipt.drcr"
+            rml="account_voucher/report/report_voucher.rml"
+            auto="False"
+            header = "False"
+            menu="True"/>
+            
+        <report id="report_account_voucher_amt"
+            string="Print Receipt"
+            model="account.voucher"
+            name="voucher.cash_amount"
+            rml="account_voucher/report/report_voucher_amount.rml"
+            auto="False"
+            header = "False"
+            menu="True"/>
+    </data>
+</openerp>