diff --git a/addons/account/account.py b/addons/account/account.py
index 6095c2aa113..7938862acfb 100644
--- a/addons/account/account.py
+++ b/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),
@@ -1348,7 +1348,6 @@ class account_tax(osv.osv):
         'include_base_amount': fields.boolean('Included in base amount', help="Indicates if the amount of tax must be included in the base amount for the computation of the next taxes"),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'description': fields.char('Tax Code',size=32),
-        'price_include': fields.boolean('Tax Included in Price', help="Check this if the price you use on the product and invoices includes this tax."),
         'type_tax_use': fields.selection([('sale','Sale'),('purchase','Purchase'),('all','All')], 'Tax Application', required=True)
 
     }
@@ -1381,7 +1380,6 @@ class account_tax(osv.osv):
         'applicable_type': lambda *a: 'true',
         'type': lambda *a: 'percent',
         'amount': lambda *a: 0,
-        'price_include': lambda *a: 0,
         'active': lambda *a: 1,
         'type_tax_use': lambda *a: 'all',
         'sequence': lambda *a: 1,
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index dcbaf683674..e955f498602 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -486,20 +486,18 @@
 
 		<!--  Partners inherited form -->
 
-		<record id="view_invoice_partner_info_form" model="ir.ui.view">
+        <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>
+                    <page string="Account Info">
+                        <field name="invoice_ids" colspan="4" nolabel="1" context="{'group_by':'product_id'}"/>
+                    </page>
                 </notebook>
             </field>
         </record>
-
-
     </data>
 </openerp>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index d4bf99c85ac..2ab119e59a7 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -284,7 +284,7 @@
                             <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" />
+                            <field name="allow_date" groups="base.group_extended"/>
                             <field name="company_id" groups="base.group_multi_company"/>
                             <newline/>
                             <field name="centralisation"/>
@@ -596,7 +596,6 @@
             <field name="arch" type="xml">
                 <tree string="Account Tax">
                     <field name="name"/>
-                    <field name="price_include"/>
                     <field name="description"/>
                 </tree>
             </field>
@@ -628,7 +627,6 @@
                             <label colspan="2" nolabel="1" string="Keep empty to use the expense account"/>
                             <field groups="base.group_extended" name="child_depend"/>
                             <field groups="base.group_extended" name="sequence"/>
-                            <field groups="base.group_extended" name="price_include"/>
                             <field name="type_tax_use"/>
                             <newline/>
                             <field colspan="4" groups="base.group_extended" name="child_ids"/>
diff --git a/addons/account/i18n/eu.po b/addons/account/i18n/eu.po
index 68a84f413de..68344247171 100644
--- a/addons/account/i18n/eu.po
+++ b/addons/account/i18n/eu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-18 05:15+0000\n"
+"X-Launchpad-Export-Date: 2010-05-19 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/oc.po b/addons/account/i18n/oc.po
index 53532fba0ac..180ce8da31a 100644
--- a/addons/account/i18n/oc.po
+++ b/addons/account/i18n/oc.po
@@ -8,13 +8,13 @@ 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-13 10:33+0000\n"
-"Last-Translator: Cédric VALMARY (Per Tot en òc) <cvalmary@yahoo.fr>\n"
+"PO-Revision-Date: 2010-05-18 08:45+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-04-17 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-05-19 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -175,7 +175,7 @@ msgstr ""
 #. module: account
 #: view:account.move:0
 msgid "Total Credit"
-msgstr "Total crrdit"
+msgstr "Credit Total"
 
 #. module: account
 #: field:account.config.wizard,charts:0
@@ -255,7 +255,7 @@ msgstr "Taxas provesidors"
 #. module: account
 #: view:account.move:0
 msgid "Total Debit"
-msgstr "Total debit"
+msgstr "Debit Total"
 
 #. module: account
 #: rml:account.tax.code.entries:0
@@ -808,7 +808,6 @@ msgstr ""
 msgid "Move Lines"
 msgstr ""
 
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
@@ -2136,7 +2135,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 ""
 
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 6fa4b4ba51e..34c7aa3e6ba 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -333,7 +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 orm.except_orm(_('UnknownError'), str(e))
+                raise
 
     def unlink(self, cr, uid, ids, context=None):
         invoices = self.read(cr, uid, ids, ['state'])
diff --git a/addons/account_budget/i18n/oc.po b/addons/account_budget/i18n/oc.po
new file mode 100644
index 00000000000..07ca10ef7d0
--- /dev/null
+++ b/addons/account_budget/i18n/oc.po
@@ -0,0 +1,486 @@
+# 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-05-18 08:42+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-19 05:12+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_budget
+#: field:crossovered.budget,creating_user_id:0
+msgid "Responsible User"
+msgstr ""
+
+#. module: account_budget
+#: rml:account.budget:0
+msgid "% performance"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.actions.act_window,name:account_budget.open_budget_post_form
+#: model:ir.ui.menu,name:account_budget.menu_budget_post_form
+msgid "Budgetary Positions"
+msgstr ""
+
+#. module: account_budget
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom del Modèl invalid per la definicion de l'accion."
+
+#. module: account_budget
+#: rml:account.analytic.account.budget:0
+#: rml:crossovered.budget.report:0
+msgid "Printed at:"
+msgstr ""
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: account_budget
+#: field:crossovered.budget,validating_user_id:0
+msgid "Validate User"
+msgstr ""
+
+#. module: account_budget
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Lo nom de l'objècte deu començar amb x_ e conténer pas de caractèrs "
+"especials !"
+
+#. module: account_budget
+#: selection:crossovered.budget,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: account_budget
+#: field:account.budget.post.dotation,period_id:0
+msgid "Period"
+msgstr "Periòde"
+
+#. module: account_budget
+#: wizard_field:account.budget.report,init,date2:0
+#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
+#: wizard_field:wizard.crossovered.budget,init,date_to:0
+#: wizard_field:wizard.crossovered.budget.summary,init,date_to:0
+msgid "End of period"
+msgstr ""
+
+#. module: account_budget
+#: rml:account.budget:0
+msgid "Printing date:"
+msgstr ""
+
+#. module: account_budget
+#: selection:crossovered.budget,state:0
+msgid "Draft"
+msgstr "Borrolhon"
+
+#. module: account_budget
+#: rml:account.analytic.account.budget:0
+#: rml:account.budget:0
+#: rml:crossovered.budget.report:0
+msgid "at"
+msgstr "a"
+
+#. module: account_budget
+#: view:account.budget.post:0
+msgid "Dotations"
+msgstr ""
+
+#. module: account_budget
+#: rml:account.budget:0
+msgid "Performance"
+msgstr "Performància"
+
+#. module: account_budget
+#: rml:account.analytic.account.budget:0
+#: rml:account.budget:0
+#: rml:crossovered.budget.report:0
+msgid "Currency:"
+msgstr "Devisa :"
+
+#. module: account_budget
+#: rml:account.budget:0
+msgid "From"
+msgstr "De"
+
+#. module: account_budget
+#: field:crossovered.budget.lines,percentage:0
+msgid "Percentage"
+msgstr "Percentatge"
+
+#. module: account_budget
+#: rml:account.budget:0
+msgid "Results"
+msgstr "Resultats"
+
+#. module: account_budget
+#: field:crossovered.budget,state:0
+msgid "Status"
+msgstr "Estat"
+
+#. module: account_budget
+#: model:ir.module.module,description:account_budget.module_meta_information
+msgid ""
+"This module allows accountants to manage analytic and crossovered budgets.\n"
+"\n"
+"Once the Master Budgets and the Budgets defined (in Financial\n"
+"Management/Budgets/), the Project Managers can set the planned amount on "
+"each\n"
+"Analytic Account.\n"
+"\n"
+"The accountant has the possibility to see the total of amount planned for "
+"each\n"
+"Budget and Master Budget in order to ensure the total planned is not\n"
+"greater/lower than what he planned for this Budget/Master Budget. Each list "
+"of\n"
+"record can also be switched to a graphical view of it.\n"
+"\n"
+"Three reports are available:\n"
+"    1. The first is available from a list of Budgets. It gives the "
+"spreading, for these Budgets, of the Analytic Accounts per Master Budgets.\n"
+"\n"
+"    2. The second is a summary of the previous one, it only gives the "
+"spreading, for the selected Budgets, of the Analytic Accounts.\n"
+"\n"
+"    3. The last one is available from the Analytic Chart of Accounts. It "
+"gives the spreading, for the selected Analytic Accounts, of the Master "
+"Budgets per Budgets.\n"
+"\n"
+msgstr ""
+
+#. module: account_budget
+#: rml:account.budget:0
+#: rml:crossovered.budget.report:0
+msgid "%"
+msgstr "%"
+
+#. module: account_budget
+#: rml:account.analytic.account.budget:0
+#: rml:crossovered.budget.report:0
+msgid "Description"
+msgstr "Descripcion"
+
+#. module: account_budget
+#: rml:account.analytic.account.budget:0
+msgid "Analytic Account :"
+msgstr "Compte Analitic :"
+
+#. module: account_budget
+#: wizard_button:account.budget.report,init,report:0
+#: wizard_button:wizard.analytic.account.budget.report,init,report:0
+#: wizard_button:wizard.crossovered.budget,init,report:0
+#: wizard_button:wizard.crossovered.budget.summary,init,report:0
+msgid "Print"
+msgstr "Estampar"
+
+#. module: account_budget
+#: rml:account.budget:0
+msgid "A/c No."
+msgstr ""
+
+#. module: account_budget
+#: rml:account.analytic.account.budget:0
+#: rml:account.budget:0
+#: rml:crossovered.budget.report:0
+msgid "to"
+msgstr "a"
+
+#. module: account_budget
+#: rml:account.analytic.account.budget:0
+#: rml:account.budget:0
+#: rml:crossovered.budget.report:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: account_budget
+#: rml:account.analytic.account.budget:0
+#: field:crossovered.budget.lines,planned_amount:0
+#: rml:crossovered.budget.report:0
+msgid "Planned Amount"
+msgstr ""
+
+#. module: account_budget
+#: rml:account.analytic.account.budget:0
+#: rml:crossovered.budget.report:0
+msgid "Perc(%)"
+msgstr ""
+
+#. module: account_budget
+#: rml:account.budget:0
+msgid "Period Budget"
+msgstr ""
+
+#. module: account_budget
+#: rml:account.budget:0
+msgid "Budget Analysis"
+msgstr ""
+
+#. module: account_budget
+#: view:crossovered.budget:0
+#: selection:crossovered.budget,state:0
+msgid "Done"
+msgstr "Acabat"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Validate"
+msgstr "Validar"
+
+#. module: account_budget
+#: wizard_view:wizard.crossovered.budget,init:0
+#: wizard_view:wizard.crossovered.budget.summary,init:0
+msgid "Select Options"
+msgstr ""
+
+#. module: account_budget
+#: rml:account.analytic.account.budget:0
+#: field:crossovered.budget.lines,practical_amount:0
+#: rml:crossovered.budget.report:0
+msgid "Practical Amount"
+msgstr ""
+
+#. module: account_budget
+#: field:crossovered.budget,date_to:0
+#: field:crossovered.budget.lines,date_to:0
+msgid "End Date"
+msgstr "Data de fin"
+
+#. module: account_budget
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid per l'arquitectura de la vista"
+
+#. module: account_budget
+#: field:crossovered.budget.lines,theoritical_amount:0
+msgid "Theoritical Amount"
+msgstr ""
+
+#. module: account_budget
+#: field:account.budget.post,name:0
+#: field:account.budget.post.dotation,name:0
+#: field:crossovered.budget,name:0
+msgid "Name"
+msgstr "Nom"
+
+#. module: account_budget
+#: model:ir.actions.wizard,name:account_budget.wizard_crossovered_budget_menu_1
+msgid "Print Summary of Budgets"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.actions.wizard,name:account_budget.wizard_budget_spread
+msgid "Spread amount"
+msgstr ""
+
+#. module: account_budget
+#: view:account.analytic.account:0
+#: view:account.budget.post:0
+msgid "Lines"
+msgstr "Linhas"
+
+#. module: account_budget
+#: rml:account.budget:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,crossovered_budget_id:0
+#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view
+#: model:ir.actions.wizard,name:account_budget.wizard_budget_report
+#: model:ir.model,name:account_budget.model_crossovered_budget
+#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_view
+msgid "Budget"
+msgstr "Budgèt"
+
+#. module: account_budget
+#: field:account.budget.post.dotation,post_id:0
+msgid "Item"
+msgstr "Element"
+
+#. module: account_budget
+#: field:account.budget.post.dotation,amount:0
+#: wizard_field:account.budget.spread,init,amount:0
+msgid "Amount"
+msgstr "Soma"
+
+#. module: account_budget
+#: field:crossovered.budget.lines,paid_date:0
+msgid "Paid Date"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_post_tree
+#: model:ir.ui.menu,name:account_budget.menu_action_account_budget_post_tree
+#: model:ir.ui.menu,name:account_budget.next_id_31
+msgid "Budgets"
+msgstr ""
+
+#. module: account_budget
+#: selection:crossovered.budget,state:0
+msgid "Cancelled"
+msgstr "Anullat"
+
+#. module: account_budget
+#: view:account.budget.post.dotation:0
+#: model:ir.model,name:account_budget.model_account_budget_post_dotation
+msgid "Budget Dotation"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.post.dotation:0
+msgid "Budget Dotations"
+msgstr ""
+
+#. module: account_budget
+#: rml:account.budget:0
+msgid "Budget Item Detail"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: field:crossovered.budget.lines,general_budget_id:0
+#: model:ir.model,name:account_budget.model_account_budget_post
+msgid "Budgetary Position"
+msgstr ""
+
+#. module: account_budget
+#: wizard_field:account.budget.report,init,date1:0
+#: wizard_field:wizard.analytic.account.budget.report,init,date_from:0
+#: wizard_field:wizard.crossovered.budget,init,date_from:0
+#: wizard_field:wizard.crossovered.budget.summary,init,date_from:0
+msgid "Start of period"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.actions.report.xml,name:account_budget.account_analytic_account_budget
+#: model:ir.actions.report.xml,name:account_budget.report_crossovered_budget
+#: model:ir.actions.wizard,name:account_budget.account_analytic_account_budget_report
+#: model:ir.actions.wizard,name:account_budget.wizard_crossovered_budget_menu
+msgid "Print Budgets"
+msgstr ""
+
+#. module: account_budget
+#: field:account.budget.post,code:0
+#: field:crossovered.budget,code:0
+msgid "Code"
+msgstr "Còde"
+
+#. module: account_budget
+#: field:account.budget.post.dotation,tot_planned:0
+msgid "Total Planned Amount"
+msgstr ""
+
+#. module: account_budget
+#: wizard_view:wizard.analytic.account.budget.report,init:0
+msgid "Select Dates Period"
+msgstr ""
+
+#. module: account_budget
+#: field:account.budget.post,dotation_ids:0
+msgid "Spreading"
+msgstr ""
+
+#. module: account_budget
+#: rml:account.analytic.account.budget:0
+#: rml:crossovered.budget.report:0
+msgid "Theoretical Amount"
+msgstr ""
+
+#. module: account_budget
+#: wizard_field:account.budget.spread,init,fiscalyear:0
+msgid "Fiscal Year"
+msgstr ""
+
+#. module: account_budget
+#: field:crossovered.budget.lines,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "Compte Analitic"
+
+#. module: account_budget
+#: rml:crossovered.budget.report:0
+msgid "Budget :"
+msgstr "Budgèt :"
+
+#. module: account_budget
+#: rml:account.budget:0
+#: view:account.budget.post:0
+#: wizard_view:account.budget.spread,init:0
+#: wizard_button:account.budget.spread,init,spread:0
+msgid "Spread"
+msgstr "Difusir"
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: field:account.budget.post,account_ids:0
+msgid "Accounts"
+msgstr "Comptes"
+
+#. module: account_budget
+#: model:ir.actions.report.xml,name:account_budget.account_budget
+msgid "Print Budget"
+msgstr ""
+
+#. module: account_budget
+#: view:account.analytic.account:0
+#: field:account.analytic.account,crossovered_budget_line:0
+#: view:account.budget.post:0
+#: field:account.budget.post,crossovered_budget_line:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget,crossovered_budget_line:0
+#: view:crossovered.budget.lines:0
+#: model:ir.actions.act_window,name:account_budget.act_account_analytic_account_cb_lines
+#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_lines_view
+#: model:ir.model,name:account_budget.model_crossovered_budget_lines
+#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_lines_view
+msgid "Budget Lines"
+msgstr ""
+
+#. module: account_budget
+#: wizard_button:account.budget.report,init,end:0
+#: wizard_button:account.budget.spread,init,end:0
+#: view:crossovered.budget:0
+#: wizard_button:wizard.analytic.account.budget.report,init,end:0
+#: wizard_button:wizard.crossovered.budget,init,end:0
+#: wizard_button:wizard.crossovered.budget.summary,init,end:0
+msgid "Cancel"
+msgstr "Anullar"
+
+#. module: account_budget
+#: model:ir.module.module,shortdesc:account_budget.module_meta_information
+msgid "Budget Management"
+msgstr ""
+
+#. module: account_budget
+#: field:crossovered.budget,date_from:0
+#: field:crossovered.budget.lines,date_from:0
+msgid "Start Date"
+msgstr "Data de començament"
+
+#. module: account_budget
+#: rml:account.analytic.account.budget:0
+#: rml:crossovered.budget.report:0
+msgid "Analysis from"
+msgstr ""
+
+#. module: account_budget
+#: selection:crossovered.budget,state:0
+msgid "Validated"
+msgstr ""
+
+#. module: account_budget
+#: wizard_view:account.budget.report,init:0
+msgid "Select period"
+msgstr "Seleccionatz un periòde"
diff --git a/addons/account_invoice_layout/i18n/id.po b/addons/account_invoice_layout/i18n/id.po
index 9f1682ad273..661f48b2b23 100644
--- a/addons/account_invoice_layout/i18n/id.po
+++ b/addons/account_invoice_layout/i18n/id.po
@@ -7,13 +7,13 @@ 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-07 13:19+0000\n"
-"Last-Translator: opix <inur.opix@gmail.com>\n"
+"PO-Revision-Date: 2010-05-18 11:05+0000\n"
+"Last-Translator: Pandu Pradana <p4ndupr4d4n4@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-05-19 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
@@ -35,7 +35,7 @@ msgstr ""
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Cancelled Invoice"
-msgstr ""
+msgstr "Pembatalan Tagihan"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -56,7 +56,7 @@ msgstr "Potongan (%)"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "(Incl. taxes):"
-msgstr ""
+msgstr "(Termasuk pajak):"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -132,7 +132,7 @@ msgstr "Harga"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "/ ("
-msgstr ""
+msgstr "/ ("
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
@@ -147,7 +147,7 @@ msgstr "Rekening Asal"
 #. module: account_invoice_layout
 #: model:ir.actions.act_window,name:account_invoice_layout.notify_mesage_tree_form
 msgid "Write Messages"
-msgstr ""
+msgstr "Tulis Pesan"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
@@ -212,7 +212,7 @@ msgstr "Invoice dengan Layout"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Description / Taxes"
-msgstr ""
+msgstr "Penjelasan / Pajak"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
@@ -222,7 +222,7 @@ msgstr "Jumlah"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Description/Taxes"
-msgstr ""
+msgstr "Penjelasan/Pajak"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
@@ -262,7 +262,7 @@ msgstr "Faktur Pembelian"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Note :"
-msgstr ""
+msgstr "Catatan :"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
@@ -272,12 +272,12 @@ msgstr "Pajak"
 #. module: account_invoice_layout
 #: model:ir.module.module,shortdesc:account_invoice_layout.module_meta_information
 msgid "account_invoice_layout"
-msgstr ""
+msgstr "Tatanan_tagihan_akun"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Total (Excl. taxes):"
-msgstr ""
+msgstr "Jumlah (Tidak termasuk pajak):"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
diff --git a/addons/account_report/i18n/oc.po b/addons/account_report/i18n/oc.po
new file mode 100644
index 00000000000..1469c5cb903
--- /dev/null
+++ b/addons/account_report/i18n/oc.po
@@ -0,0 +1,532 @@
+# 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-05-18 08:43+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-19 05:11+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_report
+#: field:account.report.history,name:0
+#: selection:account.report.report,type:0
+#: model:ir.model,name:account_report.model_account_report_history
+msgid "Indicator"
+msgstr ""
+
+#. module: account_report
+#: wizard_field:print.indicators.pdf,init,file:0
+msgid "Select a PDF File"
+msgstr ""
+
+#. module: account_report
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom del Modèl invalid per la definicion de l'accion."
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "Operators:"
+msgstr ""
+
+#. module: account_report
+#: field:account.report.report,parent_id:0
+msgid "Parent"
+msgstr "Parent"
+
+#. module: account_report
+#: field:account.report.report,disp_graph:0
+msgid "Display As Graph"
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "Account Debit:"
+msgstr ""
+
+#. module: account_report
+#: selection:account.report.report,type:0
+msgid "Others"
+msgstr "Autres"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "balance(['ACCOUNT_CODE',],fiscalyear)"
+msgstr ""
+
+#. module: account_report
+#: rml:print.indicators:0
+msgid "Tabular Summary"
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "Notes"
+msgstr "Nòtas"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "= Goodness Indicator Limit:"
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "Very bad"
+msgstr ""
+
+#. module: account_report
+#: field:account.report.history,val:0
+#: field:account.report.report,amount:0
+msgid "Value"
+msgstr "Valor"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "= Badness Indicator Limit:"
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+#: selection:account.report.report,status:0
+msgid "Bad"
+msgstr ""
+
+#. module: account_report
+#: wizard_view:print.indicators.pdf,init:0
+msgid "Select the PDF file on which Indicators will be printed."
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "> Goodness Indicator Limit:"
+msgstr ""
+
+#. module: account_report
+#: field:account.report.report,badness_limit:0
+msgid "Badness Indicator Limit"
+msgstr ""
+
+#. module: account_report
+#: selection:account.report.report,status:0
+msgid "Very Bad"
+msgstr ""
+
+#. module: account_report
+#: model:ir.actions.act_window,name:account_report.account_report_history_record_structure
+msgid "Indicator history"
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "credit(['ACCOUNT_CODE',],fiscalyear)"
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "Report Amount:"
+msgstr ""
+
+#. module: account_report
+#: model:ir.actions.report.xml,name:account_report.fiscal_statements
+msgid "Fiscal Statements"
+msgstr ""
+
+#. module: account_report
+#: wizard_button:print.indicators,init,next:0
+msgid "Next"
+msgstr "Seguent"
+
+#. module: account_report
+#: model:ir.module.module,shortdesc:account_report.module_meta_information
+msgid "Reporting for accounting"
+msgstr ""
+
+#. module: account_report
+#: wizard_button:print.indicators,next,print:0
+#: wizard_button:print.indicators.pdf,init,print:0
+msgid "Print"
+msgstr "Estampar"
+
+#. module: account_report
+#: field:account.report.report,type:0
+msgid "Type"
+msgstr "Tipe"
+
+#. module: account_report
+#: model:ir.actions.report.xml,name:account_report.report_indicator_pdf
+msgid "Print Indicators in PDF"
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "Account Tax Code:"
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+#: selection:account.report.report,status:0
+msgid "Good"
+msgstr "Bon"
+
+#. module: account_report
+#: view:account.report.history:0
+msgid "Account Report History"
+msgstr ""
+
+#. module: account_report
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid per l'arquitectura de la vista"
+
+#. module: account_report
+#: help:account.report.report,badness_limit:0
+msgid "This Value sets the limit of badness."
+msgstr ""
+
+#. module: account_report
+#: wizard_field:print.indicators,init,select_base:0
+msgid "Choose Criteria"
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "debit(['ACCOUNT_CODE',],fiscalyear)"
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "Account Credit:"
+msgstr ""
+
+#. module: account_report
+#: wizard_view:print.indicators,init:0
+msgid "Select the criteria based on which Indicators will be printed."
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "< Badness Indicator Limit:"
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+#: selection:account.report.report,status:0
+msgid "Very Good"
+msgstr ""
+
+#. module: account_report
+#: field:account.report.report,note:0
+msgid "Note"
+msgstr "Nòta"
+
+#. module: account_report
+#: rml:accounting.report:0
+#: rml:print.indicators:0
+msgid "Currency:"
+msgstr "Devisa :"
+
+#. module: account_report
+#: field:account.report.report,status:0
+msgid "Status"
+msgstr "Estat"
+
+#. module: account_report
+#: help:account.report.report,disp_tree:0
+msgid ""
+"When the indicators are printed, if one indicator is set with this field to "
+"True, then it will display one more graphs with all its children in tree"
+msgstr ""
+
+#. module: account_report
+#: selection:account.report.report,status:0
+msgid "Normal"
+msgstr "Normala"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "Example: (balance(['6','45'],-1) - credit(['7'])) / report('RPT1')"
+msgstr ""
+
+#. module: account_report
+#: field:account.report.report,active:0
+msgid "Active"
+msgstr "Actiu"
+
+#. module: account_report
+#: field:account.report.report,disp_tree:0
+msgid "Display Tree"
+msgstr ""
+
+#. module: account_report
+#: selection:print.indicators,init,select_base:0
+msgid "Based On Fiscal Years"
+msgstr ""
+
+#. module: account_report
+#: model:ir.model,name:account_report.model_account_report_report
+msgid "Account reporting"
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "Account Balance:"
+msgstr ""
+
+#. module: account_report
+#: rml:print.indicators:0
+msgid "Expression :"
+msgstr "Expression :"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "report('REPORT_CODE')"
+msgstr ""
+
+#. module: account_report
+#: field:account.report.report,expression:0
+msgid "Expression"
+msgstr "Expression"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "Accounting reporting"
+msgstr ""
+
+#. module: account_report
+#: model:ir.actions.act_window,name:account_report.action_account_report_form
+#: model:ir.ui.menu,name:account_report.menu_action_account_report_form
+msgid "New Reporting Item Formula"
+msgstr ""
+
+#. module: account_report
+#: field:account.report.report,code:0
+#: rml:accounting.report:0
+msgid "Code"
+msgstr "Còde"
+
+#. module: account_report
+#: field:account.report.history,tmp:0
+msgid "temp"
+msgstr ""
+
+#. module: account_report
+#: field:account.report.history,period_id:0
+msgid "Period"
+msgstr "Periòde"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "General"
+msgstr "General"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "Legend of operators"
+msgstr ""
+
+#. module: account_report
+#: wizard_button:print.indicators,init,end:0
+#: wizard_button:print.indicators,next,end:0
+#: wizard_button:print.indicators.pdf,init,end:0
+msgid "Cancel"
+msgstr "Anullar"
+
+#. module: account_report
+#: field:account.report.report,child_ids:0
+msgid "Children"
+msgstr "Enfants"
+
+#. module: account_report
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Lo nom de l'objècte deu començar amb x_ e conténer pas de caractèrs "
+"especials !"
+
+#. module: account_report
+#: help:account.report.report,goodness_limit:0
+msgid "This Value sets the limit of goodness."
+msgstr ""
+
+#. module: account_report
+#: model:ir.actions.wizard,name:account_report.wizard_print_indicators
+#: model:ir.ui.menu,name:account_report.menu_wizard_print_indicators
+#: wizard_view:print.indicators,init:0
+#: wizard_view:print.indicators,next:0
+msgid "Print Indicators"
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "+ - * / ( )"
+msgstr "+ - * / ( )"
+
+#. module: account_report
+#: rml:accounting.report:0
+#: rml:print.indicators:0
+msgid "Printing date:"
+msgstr ""
+
+#. module: account_report
+#: model:ir.actions.wizard,name:account_report.wizard_indicators_with_pdf
+msgid "Indicators in PDF"
+msgstr ""
+
+#. module: account_report
+#: rml:accounting.report:0
+#: rml:print.indicators:0
+msgid "at"
+msgstr "a"
+
+#. module: account_report
+#: rml:accounting.report:0
+msgid "Accounting Report"
+msgstr ""
+
+#. module: account_report
+#: field:account.report.report,goodness_limit:0
+msgid "Goodness Indicator Limit"
+msgstr ""
+
+#. module: account_report
+#: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_other
+#: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view_other
+msgid "Other reports"
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+msgid ""
+"Note: The second arguement 'fiscalyear' and 'period' are optional "
+"arguements.If the value is -1,previous fiscalyear or period is considered."
+msgstr ""
+
+#. module: account_report
+#: rml:print.indicators:0
+msgid ")"
+msgstr ")"
+
+#. module: account_report
+#: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_fiscal
+#: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view_fiscal
+msgid "Fiscal Statements reporting"
+msgstr ""
+
+#. module: account_report
+#: selection:print.indicators,init,select_base:0
+msgid "Based on Fiscal Periods"
+msgstr ""
+
+#. module: account_report
+#: model:ir.actions.report.xml,name:account_report.report_print_indicators
+#: rml:print.indicators:0
+msgid "Indicators"
+msgstr "Indicadors"
+
+#. module: account_report
+#: wizard_view:print.indicators.pdf,init:0
+msgid "Print Indicators with PDF"
+msgstr ""
+
+#. module: account_report
+#: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_indicator
+#: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view_indicator
+msgid "Indicators reporting"
+msgstr ""
+
+#. module: account_report
+#: field:account.report.report,name:0
+#: rml:accounting.report:0
+#: rml:print.indicators:0
+msgid "Name"
+msgstr "Nom"
+
+#. module: account_report
+#: wizard_field:print.indicators,next,base_selection:0
+msgid "Select Criteria"
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "tax_code(['ACCOUNT_TAX_CODE',],period)"
+msgstr ""
+
+#. module: account_report
+#: field:account.report.history,fiscalyear_id:0
+msgid "Fiscal Year"
+msgstr ""
+
+#. module: account_report
+#: model:ir.actions.act_window,name:account_report.action_account_report_tree
+#: model:ir.actions.act_window,name:account_report.action_account_report_tree_view
+#: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_define
+#: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view
+msgid "Custom reporting"
+msgstr ""
+
+#. module: account_report
+#: rml:print.indicators:0
+msgid "Page"
+msgstr "Pagina"
+
+#. module: account_report
+#: selection:account.report.report,type:0
+msgid "View"
+msgstr "Afichatge"
+
+#. module: account_report
+#: rml:print.indicators:0
+msgid "Indicators -"
+msgstr ""
+
+#. module: account_report
+#: help:account.report.report,disp_graph:0
+msgid ""
+"If the field is set to True, information will be printed as a Graph, "
+"otherwise as an array."
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "Return value for status"
+msgstr ""
+
+#. module: account_report
+#: field:account.report.report,sequence:0
+msgid "Sequence"
+msgstr "Sequéncia"
+
+#. module: account_report
+#: rml:accounting.report:0
+msgid "Amount"
+msgstr "Soma"
+
+#. module: account_report
+#: rml:print.indicators:0
+msgid "1cm 27.7cm 20cm 27.7cm"
+msgstr "1cm 27.7cm 20cm 27.7cm"
+
+#. module: account_report
+#: model:ir.module.module,description:account_report.module_meta_information
+msgid ""
+"Financial and accounting reporting\n"
+"    Fiscal statements\n"
+"    Indicators\n"
+"    "
+msgstr ""
+
+#. module: account_report
+#: selection:account.report.report,type:0
+msgid "Fiscal Statement"
+msgstr ""
diff --git a/addons/account_report_india/__init__.py b/addons/account_report_india/__init__.py
new file mode 100644
index 00000000000..f8c96cb3c42
--- /dev/null
+++ b/addons/account_report_india/__init__.py
@@ -0,0 +1,3 @@
+
+import report
+import wizard
diff --git a/addons/account_report_india/__openerp__.py b/addons/account_report_india/__openerp__.py
new file mode 100644
index 00000000000..4e0f8339d64
--- /dev/null
+++ b/addons/account_report_india/__openerp__.py
@@ -0,0 +1,48 @@
+# -*- 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",
+        "account_voucher"
+    ],
+    "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
+}
diff --git a/addons/account_report_india/report/__init__.py b/addons/account_report_india/report/__init__.py
new file mode 100755
index 00000000000..5bcdacfefaf
--- /dev/null
+++ b/addons/account_report_india/report/__init__.py
@@ -0,0 +1,3 @@
+
+import report_bs
+import report_pl
diff --git a/addons/account_report_india/report/report_balance_sheet.rml b/addons/account_report_india/report/report_balance_sheet.rml
new file mode 100644
index 00000000000..95a34c2f063
--- /dev/null
+++ b/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>
diff --git a/addons/account_report_india/report/report_balance_sheet_horizontal.rml b/addons/account_report_india/report/report_balance_sheet_horizontal.rml
new file mode 100644
index 00000000000..09a2f252f80
--- /dev/null
+++ b/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>
+
diff --git a/addons/account_report_india/report/report_bs.py b/addons/account_report_india/report/report_bs.py
new file mode 100644
index 00000000000..3369ff0e222
--- /dev/null
+++ b/addons/account_report_india/report/report_bs.py
@@ -0,0 +1,202 @@
+# -*- 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)
diff --git a/addons/account_report_india/report/report_pl.py b/addons/account_report_india/report/report_pl.py
new file mode 100644
index 00000000000..b8b77e08be9
--- /dev/null
+++ b/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)
+
diff --git a/addons/account_report_india/report/report_pl_account.rml b/addons/account_report_india/report/report_pl_account.rml
new file mode 100644
index 00000000000..77f3fa50ad8
--- /dev/null
+++ b/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>
diff --git a/addons/account_report_india/report/report_pl_account_horizontal.rml b/addons/account_report_india/report/report_pl_account_horizontal.rml
new file mode 100644
index 00000000000..0c2be18da0b
--- /dev/null
+++ b/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>
+
diff --git a/addons/account_report_india/report/rml_parse.py b/addons/account_report_india/report/rml_parse.py
new file mode 100755
index 00000000000..2d2c1d5a763
--- /dev/null
+++ b/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
+
+
+
diff --git a/addons/account_report_india/wizard/__init__.py b/addons/account_report_india/wizard/__init__.py
new file mode 100755
index 00000000000..2a870d96fad
--- /dev/null
+++ b/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
\ No newline at end of file
diff --git a/addons/account_report_india/wizard/account_bs_report.py b/addons/account_report_india/wizard/account_bs_report.py
new file mode 100644
index 00000000000..27c50b4b880
--- /dev/null
+++ b/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:
diff --git a/addons/account_report_india/wizard/account_bs_report_view.xml b/addons/account_report_india/wizard/account_bs_report_view.xml
new file mode 100644
index 00000000000..a07ef94d81c
--- /dev/null
+++ b/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>
diff --git a/addons/account_report_india/wizard/account_pl_report.py b/addons/account_report_india/wizard/account_pl_report.py
new file mode 100644
index 00000000000..f507226fefd
--- /dev/null
+++ b/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:
diff --git a/addons/account_report_india/wizard/account_pl_report_view.xml b/addons/account_report_india/wizard/account_pl_report_view.xml
new file mode 100644
index 00000000000..e4ef4c5434e
--- /dev/null
+++ b/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>
diff --git a/addons/account_reporting/i18n/oc.po b/addons/account_reporting/i18n/oc.po
new file mode 100644
index 00000000000..97cba6a7eea
--- /dev/null
+++ b/addons/account_reporting/i18n/oc.po
@@ -0,0 +1,246 @@
+# 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-05-18 08:40+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-19 05:12+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_reporting
+#: field:color.rml,code:0
+msgid "code"
+msgstr "còde"
+
+#. module: account_reporting
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Lo nom de l'objècte deu començar amb x_ e conténer pas de caractèrs "
+"especials !"
+
+#. module: account_reporting
+#: selection:account.report.bs,font_style:0
+msgid "Helvetica-Bold"
+msgstr "Helvetica-Gras"
+
+#. module: account_reporting
+#: selection:account.report.bs,font_style:0
+msgid "Helvetica"
+msgstr "Helvetica"
+
+#. module: account_reporting
+#: field:account.report.bs,note:0
+msgid "Note"
+msgstr "Nòta"
+
+#. module: account_reporting
+#: field:account.report.bs,report_type:0
+msgid "Report Type"
+msgstr ""
+
+#. module: account_reporting
+#: model:ir.ui.menu,name:account_reporting.action_account_report_bs_form
+#: model:ir.ui.menu,name:account_reporting.menu_finan_config_BSheet
+msgid "Balance Sheet Report"
+msgstr ""
+
+#. module: account_reporting
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom del Modèl invalid per la definicion de l'accion."
+
+#. module: account_reporting
+#: selection:account.report.bs,font_style:0
+msgid "Courier"
+msgstr ""
+
+#. module: account_reporting
+#: selection:account.report.bs,font_style:0
+msgid "Courier-BoldOblique"
+msgstr ""
+
+#. module: account_reporting
+#: wizard_button:account.account.balancesheet.report,init,report:0
+msgid "Print BalanceSheet"
+msgstr ""
+
+#. module: account_reporting
+#: help:account.account.balancesheet.report,init,periods:0
+msgid "All periods if empty"
+msgstr ""
+
+#. module: account_reporting
+#: field:account.report.bs,color_font:0
+msgid "Font Color"
+msgstr "Color de la poliça"
+
+#. module: account_reporting
+#: selection:account.report.bs,report_type:0
+msgid "Report Objects With Accounts and child of Accounts"
+msgstr ""
+
+#. module: account_reporting
+#: model:ir.module.module,description:account_reporting.module_meta_information
+msgid ""
+"Financial and accounting reporting\n"
+"    Balance Sheet Report"
+msgstr ""
+
+#. module: account_reporting
+#: selection:account.report.bs,report_type:0
+msgid "Report Objects With Accounts"
+msgstr ""
+
+#. module: account_reporting
+#: selection:account.report.bs,font_style:0
+msgid "Courier-Oblique"
+msgstr ""
+
+#. module: account_reporting
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid per l'arquitectura de la vista"
+
+#. module: account_reporting
+#: field:account.report.bs,name:0
+#: field:color.rml,name:0
+msgid "Name"
+msgstr "Nom"
+
+#. module: account_reporting
+#: view:account.report.bs:0
+msgid "Account reporting"
+msgstr ""
+
+#. module: account_reporting
+#: model:ir.ui.menu,name:account_reporting.bs_report_action_form
+msgid "Balance Sheet Report Form"
+msgstr ""
+
+#. module: account_reporting
+#: view:account.report.bs:0
+msgid "Notes"
+msgstr "Nòtas"
+
+#. module: account_reporting
+#: selection:account.report.bs,font_style:0
+msgid "Times-BoldItalic"
+msgstr ""
+
+#. module: account_reporting
+#: model:ir.model,name:account_reporting.model_account_report_bs
+msgid "Account reporting for Balance Sheet"
+msgstr ""
+
+#. module: account_reporting
+#: selection:account.report.bs,font_style:0
+msgid "Courier-Bold"
+msgstr ""
+
+#. module: account_reporting
+#: selection:account.report.bs,font_style:0
+msgid "Times-Italic"
+msgstr ""
+
+#. module: account_reporting
+#: selection:account.report.bs,report_type:0
+msgid "Report Objects Only"
+msgstr ""
+
+#. module: account_reporting
+#: model:ir.model,name:account_reporting.model_color_rml
+msgid "Rml Colors"
+msgstr ""
+
+#. module: account_reporting
+#: model:ir.module.module,shortdesc:account_reporting.module_meta_information
+msgid "Reporting of Balancesheet for accounting"
+msgstr ""
+
+#. module: account_reporting
+#: field:account.report.bs,code:0
+msgid "Code"
+msgstr "Còde"
+
+#. module: account_reporting
+#: field:account.report.bs,parent_id:0
+msgid "Parent"
+msgstr "Parent"
+
+#. module: account_reporting
+#: field:account.report.bs,sequence:0
+msgid "Sequence"
+msgstr "Sequéncia"
+
+#. module: account_reporting
+#: selection:account.report.bs,font_style:0
+msgid "Times-Bold"
+msgstr ""
+
+#. module: account_reporting
+#: view:account.report.bs:0
+msgid "General"
+msgstr "General"
+
+#. module: account_reporting
+#: wizard_field:account.account.balancesheet.report,init,fiscalyear:0
+msgid "Fiscal year"
+msgstr "Exercici fiscal"
+
+#. module: account_reporting
+#: view:account.report.bs:0
+#: field:account.report.bs,account_id:0
+msgid "Accounts"
+msgstr "Comptes"
+
+#. module: account_reporting
+#: wizard_field:account.account.balancesheet.report,init,periods:0
+msgid "Periods"
+msgstr "Periòdes"
+
+#. module: account_reporting
+#: field:account.report.bs,color_back:0
+msgid "Back Color"
+msgstr ""
+
+#. module: account_reporting
+#: field:account.report.bs,child_id:0
+msgid "Children"
+msgstr "Enfants"
+
+#. module: account_reporting
+#: wizard_button:account.account.balancesheet.report,init,end:0
+msgid "Cancel"
+msgstr "Anullar"
+
+#. module: account_reporting
+#: selection:account.report.bs,font_style:0
+msgid "Times-Roman"
+msgstr ""
+
+#. module: account_reporting
+#: selection:account.report.bs,font_style:0
+msgid "Helvetica-Oblique"
+msgstr ""
+
+#. module: account_reporting
+#: field:account.report.bs,font_style:0
+msgid "Font"
+msgstr "Poliça de caractèr"
+
+#. module: account_reporting
+#: wizard_view:account.account.balancesheet.report,init:0
+msgid "Customize Report"
+msgstr ""
diff --git a/addons/account_tax_include/__init__.py b/addons/account_tax_include/__init__.py
index f239c0211d0..f96eb08f2fe 100644
--- a/addons/account_tax_include/__init__.py
+++ b/addons/account_tax_include/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,11 +15,11 @@
 #    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/>.
 #
 ##############################################################################
 
-import invoice_tax_incl
+import account_tax_include
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account_tax_include/__openerp__.py b/addons/account_tax_include/__openerp__.py
index c173a85592c..5bb1a2e2399 100644
--- a/addons/account_tax_include/__openerp__.py
+++ b/addons/account_tax_include/__openerp__.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/>.
 #
 ##############################################################################
 
@@ -26,14 +26,14 @@
     'category': 'Generic Modules/Accounting',
     'description': """Allow the user to work tax included prices.
 Especially useful for b2c businesses.
-    
+
 This module implement the modification on the invoice form.
 """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
     'depends': ['account'],
     'init_xml': [],
-    'update_xml': ['invoice_tax_incl.xml'],
+    'update_xml': ['account_tax_include_view.xml'],
     'demo_xml': [],
     'installable': True,
     'active': False,
diff --git a/addons/account_tax_include/invoice_tax_incl.py b/addons/account_tax_include/account_tax_include.py
similarity index 92%
rename from addons/account_tax_include/invoice_tax_incl.py
rename to addons/account_tax_include/account_tax_include.py
index 31f3d8a233a..6e0c9552694 100644
--- a/addons/account_tax_include/invoice_tax_incl.py
+++ b/addons/account_tax_include/account_tax_include.py
@@ -18,14 +18,23 @@
 #    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_tax(osv.osv):
+    _inherit = 'account.tax'
+    _description = 'Account Tax'
+    _columns = {
+        'price_include': fields.boolean('Tax Included in Price', help="Check this if the price you use on the product and invoices includes this tax."),
+                }
+
+    _defaults = {
+        'price_include': 0,
+                }
+account_tax()
+
 class account_invoice(osv.osv):
     _inherit = "account.invoice"
     _columns = {
@@ -35,7 +44,7 @@ class account_invoice(osv.osv):
                                         states={'draft':[('readonly',False)]}),
     }
     _defaults = {
-        'price_type': lambda *a: 'tax_excluded',
+        'price_type': 'tax_excluded',
     }
 
     def refund(self, cr, uid, ids, date=None, period_id=None, description=None):
@@ -55,6 +64,7 @@ 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.
@@ -62,6 +72,7 @@ class account_invoice_line(osv.osv):
         res = {}
         tax_obj = self.pool.get('account.tax')
         cur_obj = self.pool.get('res.currency')
+        dec_obj = self.pool.get('decimal.precision')
         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)
@@ -85,7 +96,7 @@ class account_invoice_line(osv.osv):
                 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'))
+                        res[line.id]['price_subtotal'] = res[line.id]['price_subtotal'] - round(tax['amount'], dec_obj.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]
 
@@ -93,15 +104,15 @@ class account_invoice_line(osv.osv):
                 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)
+                    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'))
+            res[line.id]['price_subtotal']= round(res[line.id]['price_subtotal'], dec_obj.precision_get(cr, uid, 'Account'))
+            res[line.id]['price_subtotal_incl']= round(res[line.id]['price_subtotal_incl'], dec_obj.precision_get(cr, uid, 'Account'))
         return res
 
     def _price_unit_default(self, cr, uid, context=None):
@@ -124,16 +135,17 @@ class account_invoice_line(osv.osv):
             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 {
@@ -146,7 +158,7 @@ class account_invoice_line(osv.osv):
                 '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:
@@ -167,23 +179,26 @@ class account_invoice_line(osv.osv):
         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')
+        line_obj = self.pool.get('account.invoice.line')
+
+        inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id)
+        line_ids = map(lambda x: x.id, inv.invoice_line)
+
         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]
+            data = line_obj._amount_line2(cr, uid, [line.id], [], [], context)[line.id]
             for tax in data['data']:
                 val={}
                 val['invoice_id'] = inv.id
@@ -221,8 +236,7 @@ class account_invoice_tax(osv.osv):
             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:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_tax_include/invoice_tax_incl.xml b/addons/account_tax_include/account_tax_include_view.xml
similarity index 77%
rename from addons/account_tax_include/invoice_tax_incl.xml
rename to addons/account_tax_include/account_tax_include_view.xml
index 946aa0687a2..98440d0a000 100644
--- a/addons/account_tax_include/invoice_tax_incl.xml
+++ b/addons/account_tax_include/account_tax_include_view.xml
@@ -1,7 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        
+
+	   <!-- Add price include (boolean) on tax form/tree view -->
+       <record id="view_tax_tree_inherit" model="ir.ui.view">
+            <field name="name">account.tax.tree.inherit.tree</field>
+            <field name="type">tree</field>
+            <field name="model">account.tax</field>
+            <field name="inherit_id" ref="account.view_tax_tree"/>
+            <field name="arch" type="xml">
+                <field name="name" position="after">
+                    <field name="price_include"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="view_tax_form_inherit" model="ir.ui.view">
+            <field name="name">account.tax.tree.inherit.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="sequence" position="after">
+                    <field groups="base.group_extended" name="price_include"/>
+                </field>
+            </field>
+        </record>
+        <!-- End -->
+
         <record id="account_tax_view_price" model="ir.ui.view">
             <field name="name">account.tax.exlcuded.view.form</field>
             <field name="type">form</field>
@@ -14,7 +40,7 @@
                 </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>
@@ -26,7 +52,7 @@
                 </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>
@@ -38,7 +64,7 @@
                 </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>
@@ -50,7 +76,7 @@
                 </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>
@@ -62,7 +88,7 @@
                 </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>
@@ -74,6 +100,6 @@
                 </field>
             </field>
         </record>
-        
+
     </data>
 </openerp>
diff --git a/addons/account_voucher/i18n/oc.po b/addons/account_voucher/i18n/oc.po
new file mode 100644
index 00000000000..94ee23ca205
--- /dev/null
+++ b/addons/account_voucher/i18n/oc.po
@@ -0,0 +1,601 @@
+# 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-05-18 08:57+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-19 05:12+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.act_account_acount_move_line_open1
+msgid "Opening Balance Entry"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.ui.menu,name:account_voucher.menu_action_receipt_bakreceipt_voucher_list
+msgid "Bank Receipts"
+msgstr "Recebuts bancaris"
+
+#. module: account_voucher
+#: rml:voucher.cash_amount:0
+#: rml:voucher.cash_receipt.drcr:0
+msgid "Particulars"
+msgstr ""
+
+#. module: account_voucher
+#: rml:voucher.cash_amount:0
+#: rml:voucher.cash_receipt.drcr:0
+msgid "State :"
+msgstr "Estat :"
+
+#. module: account_voucher
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom del Modèl invalid per la definicion de l'accion."
+
+#. module: account_voucher
+#: rml:voucher.cash_amount:0
+#: rml:voucher.cash_receipt.drcr:0
+msgid "Ref. :"
+msgstr "Ref. :"
+
+#. module: account_voucher
+#: selection:account.move,voucher_type:0
+#: selection:account.voucher,type:0
+#: selection:account.voucher.open,init,type:0
+#: model:ir.actions.act_window,name:account_voucher.action_view_cont_voucher_form
+#: model:ir.ui.menu,name:account_voucher.menu_action_view_cont_voucher_form
+msgid "Contra Voucher"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,company_id:0
+msgid "Company"
+msgstr "Entrepresa"
+
+#. module: account_voucher
+#: selection:account.move,voucher_type:0
+#: selection:account.voucher,type:0
+#: model:ir.actions.act_window,name:account_voucher.action_view_jour_voucher_form
+#: model:ir.ui.menu,name:account_voucher.menu_action_view_jour_voucher_form
+msgid "Journal Voucher"
+msgstr "Jornal dels chèques"
+
+#. module: account_voucher
+#: rml:voucher.cash_receipt.drcr:0
+msgid ","
+msgstr ","
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Set to Draft"
+msgstr "Metre en Borrolhon"
+
+#. module: account_voucher
+#: wizard_button:account.voucher.open,init,open:0
+msgid "Open Voucher Entries"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.model,name:account_voucher.model_account_voucher_line
+msgid "Voucher Line"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.move:0
+msgid "Total Credit"
+msgstr "Credit Total"
+
+#. module: account_voucher
+#: field:account.voucher,account_id:0
+#: field:account.voucher.line,account_id:0
+msgid "Account"
+msgstr "Compte"
+
+#. module: account_voucher
+#: rml:voucher.cash_amount:0
+msgid "D"
+msgstr "D"
+
+#. module: account_voucher
+#: field:account.account,level:0
+msgid "Level"
+msgstr "Nivèl"
+
+#. module: account_voucher
+#: view:account.move:0
+msgid "Account Entry Line"
+msgstr "Linha d'escritura comptabla"
+
+#. module: account_voucher
+#: view:account.move:0
+msgid "Total Debit"
+msgstr "Debit Total"
+
+#. module: account_voucher
+#: field:account.voucher,amount:0
+#: field:account.voucher.line,amount:0
+#: rml:voucher.cash_amount:0
+msgid "Amount"
+msgstr "Soma"
+
+#. module: account_voucher
+#: rml:voucher.cash_amount:0
+#: rml:voucher.cash_receipt.drcr:0
+msgid "Receiver's Signature"
+msgstr ""
+
+#. module: account_voucher
+#: rml:voucher.cash_amount:0
+#: rml:voucher.cash_receipt.drcr:0
+msgid "No."
+msgstr "N°"
+
+#. module: account_voucher
+#: rml:voucher.cash_amount:0
+#: rml:voucher.cash_receipt.drcr:0
+msgid "Amount (in words) :"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher.line,account_analytic_id:0
+msgid "Analytic Account"
+msgstr "Compte Analitic"
+
+#. module: account_voucher
+#: selection:account.move,voucher_type:0
+#: selection:account.voucher,type:0
+#: selection:account.voucher.open,init,type:0
+#: model:ir.actions.act_window,name:account_voucher.action_view_jour_sale_voucher_form
+#: model:ir.ui.menu,name:account_voucher.menu_action_view_jour_sale_voucher_form
+msgid "Journal Sale Voucher"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_receipt_vou_voucher_list
+#: model:ir.ui.menu,name:account_voucher.menu_action_receipt_vou_voucher_list
+msgid "Receipt Vouchers"
+msgstr ""
+
+#. module: account_voucher
+#: rml:voucher.cash_amount:0
+msgid "Account :"
+msgstr ""
+
+#. module: account_voucher
+#: rml:voucher.cash_amount:0
+#: rml:voucher.cash_receipt.drcr:0
+msgid "On Account of :"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_payments_bankpay_voucher_list
+#: model:ir.actions.act_window,name:account_voucher.action_payments_cashpay_voucher_list
+#: model:ir.actions.act_window,name:account_voucher.action_payments_voucher_list
+#: model:ir.ui.menu,name:account_voucher.menu_action_payments_voucher_list
+msgid "Payment Vouchers"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Create"
+msgstr "Crear"
+
+#. module: account_voucher
+#: selection:account.account,type1:0
+#: selection:account.account.template,type1:0
+msgid "None"
+msgstr "Pas cap"
+
+#. module: account_voucher
+#: field:account.voucher,number:0
+msgid "Number"
+msgstr "Numèro"
+
+#. module: account_voucher
+#: view:account.move:0
+#: field:account.voucher,state:0
+#: wizard_field:account.voucher.open,init,state:0
+msgid "State"
+msgstr "Estat"
+
+#. module: account_voucher
+#: selection:account.account,type1:0
+#: selection:account.account.template,type1:0
+#: selection:account.voucher.line,type:0
+#: rml:voucher.cash_receipt.drcr:0
+msgid "Debit"
+msgstr "Debit"
+
+#. module: account_voucher
+#: field:account.voucher,type:0
+#: field:account.voucher.line,type:0
+msgid "Type"
+msgstr "Tipe"
+
+#. module: account_voucher
+#: model:ir.ui.menu,name:account_voucher.menu_action_voucher_list
+msgid "Voucher Entries"
+msgstr ""
+
+#. module: account_voucher
+#: rml:voucher.cash_amount:0
+#: rml:voucher.cash_receipt.drcr:0
+msgid "Authorised Signatory"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_voucher_list
+msgid "Vouchers"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher.line,voucher_id:0
+#: model:res.request.link,name:account_voucher.req_link_voucher
+msgid "Voucher"
+msgstr ""
+
+#. module: account_voucher
+#: wizard_view:account.voucher.open,init:0
+#: model:ir.ui.menu,name:account_voucher.menu_wizard_account_voucher_open
+msgid "Open Vouchers"
+msgstr ""
+
+#. module: account_voucher
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid per l'arquitectura de la vista"
+
+#. module: account_voucher
+#: rml:voucher.cash_amount:0
+#: rml:voucher.cash_receipt.drcr:0
+msgid "Dated :"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.ui.menu,name:account_voucher.menu_action_receipt_cashreceipt_voucher_list
+msgid "Cash Receipts"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,partner_id:0
+#: field:account.voucher.line,partner_id:0
+msgid "Partner"
+msgstr "Partenari"
+
+#. module: account_voucher
+#: model:ir.ui.menu,name:account_voucher.menu_action_view_bank_pay_voucher_form
+msgid "New Bank Payment"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,payment_ids:0
+msgid "Voucher Lines"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,currency_id:0
+msgid "Currency"
+msgstr "Devisa"
+
+#. module: account_voucher
+#: view:account.move:0
+#: field:account.move,narration:0
+#: view:account.voucher:0
+#: field:account.voucher,narration:0
+msgid "Narration"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,reference:0
+msgid "Voucher Reference"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.ui.menu,name:account_voucher.menu_action_view_cash_rec_voucher_form
+msgid "New Cash Receipt"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.report.xml,name:account_voucher.report_account_voucher_amt
+msgid "Voucher Report"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.account,open_bal:0
+msgid "Opening Balance"
+msgstr ""
+
+#. module: account_voucher
+#: selection:account.voucher,state:0
+#: selection:account.voucher.open,init,state:0
+#: rml:voucher.cash_amount:0
+#: rml:voucher.cash_receipt.drcr:0
+msgid "Draft"
+msgstr "Borrolhon"
+
+#. module: account_voucher
+#: rml:voucher.cash_amount:0
+#: rml:voucher.cash_receipt.drcr:0
+msgid "PRO-FORMA"
+msgstr "PRO-FORMA"
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_receipt_cashreceipt_voucher_list
+msgid "Cash Receipt"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.ui.menu,name:account_voucher.menu_action_view_cash_pay_voucher_form
+msgid "New Cash Payment"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.move:0
+msgid "Optional Information"
+msgstr "Entresenhas opcionalas"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "General Entries"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,date:0
+msgid "Date"
+msgstr "Data"
+
+#. module: account_voucher
+#: rml:voucher.cash_amount:0
+#: rml:voucher.cash_receipt.drcr:0
+msgid ":"
+msgstr ":"
+
+#. module: account_voucher
+#: field:account.account,type1:0
+#: field:account.account.template,type1:0
+msgid "Dr/Cr"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.report.xml,name:account_voucher.report_account_voucher
+msgid "Voucher Report (Cr/Dr)"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.move,voucher_type:0
+#: wizard_field:account.voucher.open,init,type:0
+msgid "Voucher Type"
+msgstr ""
+
+#. module: account_voucher
+#: selection:account.account,type1:0
+#: selection:account.account.template,type1:0
+#: selection:account.voucher.line,type:0
+#: rml:voucher.cash_receipt.drcr:0
+msgid "Credit"
+msgstr "Credit"
+
+#. module: account_voucher
+#: rml:voucher.cash_amount:0
+#: rml:voucher.cash_receipt.drcr:0
+msgid "Through :"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,reference_type:0
+msgid "Reference Type"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.model,name:account_voucher.model_account_voucher
+msgid "Accounting Voucher"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,period_id:0
+msgid "Period"
+msgstr "Periòde"
+
+#. module: account_voucher
+#: model:ir.ui.menu,name:account_voucher.menu_action_payments_bankpay_voucher_list
+msgid "Bank Payments"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.move:0
+msgid "General Information"
+msgstr "Informacions generalas"
+
+#. module: account_voucher
+#: wizard_field:account.voucher.open,init,period_ids:0
+msgid "Periods"
+msgstr "Periòdes"
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: selection:account.voucher,state:0
+#: wizard_button:account.voucher.open,init,end:0
+#: selection:account.voucher.open,init,state:0
+msgid "Cancel"
+msgstr "Anullar"
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: selection:account.voucher,state:0
+#: selection:account.voucher.open,init,state:0
+msgid "Pro-forma"
+msgstr "Pro-forma"
+
+#. module: account_voucher
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Lo nom de l'objècte deu començar amb x_ e conténer pas de caractèrs "
+"especials !"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Other Info"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.module.module,shortdesc:account_voucher.module_meta_information
+msgid "Accounting Voucher Entries"
+msgstr ""
+
+#. module: account_voucher
+#: field:res.currency,sub_name:0
+msgid "Sub Currency"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_other_voucher_list
+#: model:ir.ui.menu,name:account_voucher.menu_action_other_voucher_list
+msgid "Other Vouchers"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher.line,name:0
+msgid "Description"
+msgstr "Descripcion"
+
+#. module: account_voucher
+#: rml:voucher.cash_amount:0
+#: rml:voucher.cash_receipt.drcr:0
+msgid "Canceled"
+msgstr "Anullat"
+
+#. module: account_voucher
+#: selection:account.move,voucher_type:0
+#: selection:account.voucher,type:0
+#: selection:account.voucher.open,init,type:0
+#: model:ir.actions.act_window,name:account_voucher.action_view_cash_pay_voucher_form
+#: rml:voucher.cash_amount:0
+#: rml:voucher.cash_receipt.drcr:0
+msgid "Cash Payment Voucher"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_receipt_bakreceipt_voucher_list
+msgid "Bank Receipt"
+msgstr ""
+
+#. module: account_voucher
+#: rml:voucher.cash_amount:0
+#: rml:voucher.cash_receipt.drcr:0
+msgid "-"
+msgstr "-"
+
+#. module: account_voucher
+#: selection:account.move,voucher_type:0
+#: selection:account.voucher,type:0
+#: selection:account.voucher.open,init,type:0
+#: model:ir.actions.act_window,name:account_voucher.action_view_jour_pur_voucher_form
+#: model:ir.ui.menu,name:account_voucher.menu_action_view_jour_pur_voucher_form
+msgid "Journal Purchase Voucher"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.account:0
+msgid "Closing Balance"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher.line,ref:0
+msgid "Ref."
+msgstr "Ref."
+
+#. module: account_voucher
+#: selection:account.voucher,state:0
+#: selection:account.voucher.open,init,state:0
+#: rml:voucher.cash_amount:0
+#: rml:voucher.cash_receipt.drcr:0
+msgid "Posted"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,name:0
+msgid "Name"
+msgstr "Nom"
+
+#. module: account_voucher
+#: field:account.voucher,move_ids:0
+msgid "Real Entry"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.wizard,name:account_voucher.wizard_account_voucher_open
+msgid "Open a Voucher Entry"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,move_id:0
+msgid "Account Entry"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Entry Lines"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.ui.menu,name:account_voucher.menu_action_view_bank_rec_voucher_form
+msgid "New Bank Receipt"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.ui.menu,name:account_voucher.menu_action_payments_cashpay_voucher_list
+msgid "Cash Payments"
+msgstr ""
+
+#. module: account_voucher
+#: selection:account.move,voucher_type:0
+#: selection:account.voucher,type:0
+#: selection:account.voucher.open,init,type:0
+#: model:ir.actions.act_window,name:account_voucher.action_view_cash_rec_voucher_form
+#: rml:voucher.cash_amount:0
+#: rml:voucher.cash_receipt.drcr:0
+msgid "Cash Receipt Voucher"
+msgstr ""
+
+#. module: account_voucher
+#: selection:account.move,voucher_type:0
+#: selection:account.voucher,type:0
+#: selection:account.voucher.open,init,type:0
+#: model:ir.actions.act_window,name:account_voucher.action_view_bank_pay_voucher_form
+#: rml:voucher.cash_amount:0
+#: rml:voucher.cash_receipt.drcr:0
+msgid "Bank Payment Voucher"
+msgstr ""
+
+#. module: account_voucher
+#: selection:account.move,voucher_type:0
+#: selection:account.voucher,type:0
+#: selection:account.voucher.open,init,type:0
+#: model:ir.actions.act_window,name:account_voucher.action_view_bank_rec_voucher_form
+#: rml:voucher.cash_amount:0
+#: rml:voucher.cash_receipt.drcr:0
+msgid "Bank Receipt Voucher"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.account,journal_id:0
+#: field:account.voucher,journal_id:0
+msgid "Journal"
+msgstr "Jornal"
diff --git a/addons/analytic/project.py b/addons/analytic/project.py
index 2ed3fe5a67d..c0f01322a6c 100644
--- a/addons/analytic/project.py
+++ b/addons/analytic/project.py
@@ -261,7 +261,7 @@ class account_analytic_account(osv.osv):
             partner = parent['partner_id'][0]
         else:
             partner = False
-        res = {'value' : {'code' : '%s - %03d' % (parent['code'] or '', numchild + 1),}}
+        res = {'value' : {}}
         if partner:
             res['value']['partner_id'] = partner
         return res
diff --git a/addons/analytic_journal_billing_rate/i18n/oc.po b/addons/analytic_journal_billing_rate/i18n/oc.po
new file mode 100644
index 00000000000..22b337e0889
--- /dev/null
+++ b/addons/analytic_journal_billing_rate/i18n/oc.po
@@ -0,0 +1,66 @@
+# 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-05-18 08:44+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-19 05:12+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: analytic_journal_billing_rate
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid per l'arquitectura de la vista"
+
+#. module: analytic_journal_billing_rate
+#: field:analytic_journal_rate_grid,journal_id:0
+msgid "Analytic Journal"
+msgstr "Jornal analitic"
+
+#. module: analytic_journal_billing_rate
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Lo nom de l'objècte deu començar amb x_ e conténer pas de caractèrs "
+"especials !"
+
+#. module: analytic_journal_billing_rate
+#: view:analytic_journal_rate_grid:0
+msgid "Billing Rate per Journal for this Analytic Account"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: field:analytic_journal_rate_grid,account_id:0
+msgid "Analytic Account"
+msgstr "Compte Analitic"
+
+#. module: analytic_journal_billing_rate
+#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
+msgid "Relation table between journals and billing rates"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: field:account.analytic.account,journal_rate_ids:0
+msgid "Invoicing Rate per Journal"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: model:ir.module.module,shortdesc:analytic_journal_billing_rate.module_meta_information
+msgid "Analytic Journal Billing Rate"
+msgstr ""
+
+#. module: analytic_journal_billing_rate
+#: field:analytic_journal_rate_grid,rate_id:0
+msgid "Invoicing Rate"
+msgstr ""
diff --git a/addons/audittrail/i18n/oc.po b/addons/audittrail/i18n/oc.po
new file mode 100644
index 00000000000..7699077394d
--- /dev/null
+++ b/addons/audittrail/i18n/oc.po
@@ -0,0 +1,311 @@
+# 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-05-18 08:49+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-19 05:12+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: audittrail
+#: model:ir.module.module,shortdesc:audittrail.module_meta_information
+msgid "Audit Trail"
+msgstr ""
+
+#. module: audittrail
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Lo nom de l'objècte deu començar amb x_ e conténer pas de caractèrs "
+"especials !"
+
+#. module: audittrail
+#: field:audittrail.log.line,log_id:0
+msgid "Log"
+msgstr "Jornal"
+
+#. module: audittrail
+#: selection:audittrail.rule,state:0
+msgid "Subscribed"
+msgstr "Abonat"
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "Old Value : "
+msgstr ""
+
+#. module: audittrail
+#: selection:audittrail.log,method:0
+msgid "Create"
+msgstr "Crear"
+
+#. module: audittrail
+#: wizard_view:audittrail.view.log,init:0
+msgid "Audit Logs"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.rule,state:0
+msgid "State"
+msgstr "Estat"
+
+#. module: audittrail
+#: selection:audittrail.rule,state:0
+msgid "Draft"
+msgstr "Borrolhon"
+
+#. module: audittrail
+#: field:audittrail.log.line,old_value:0
+msgid "Old Value"
+msgstr ""
+
+#. module: audittrail
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom del Modèl invalid per la definicion de l'accion."
+
+#. module: audittrail
+#: model:ir.actions.wizard,name:audittrail.wizard_audittrail_log
+msgid "View log"
+msgstr ""
+
+#. module: audittrail
+#: model:ir.model,name:audittrail.model_audittrail_log_line
+msgid "audittrail.log.line"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.log,method:0
+msgid "Method"
+msgstr "Metòde"
+
+#. module: audittrail
+#: wizard_field:audittrail.view.log,init,from:0
+msgid "Log From"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.log.line,log:0
+msgid "Log ID"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.log,res_id:0
+msgid "Resource Id"
+msgstr ""
+
+#. module: audittrail
+#: selection:audittrail.log,method:0
+msgid "Write"
+msgstr "Escriure"
+
+#. module: audittrail
+#: model:ir.ui.menu,name:audittrail.menu_action_audittrail
+msgid "Audittrails"
+msgstr ""
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "Log Lines"
+msgstr ""
+
+#. module: audittrail
+#: view:audittrail.rule:0
+msgid "Subscribe"
+msgstr "S'abonar"
+
+#. module: audittrail
+#: selection:audittrail.log,method:0
+msgid "Read"
+msgstr "Legir"
+
+#. module: audittrail
+#: field:audittrail.log,object_id:0
+#: field:audittrail.rule,object_id:0
+msgid "Object"
+msgstr "Objècte"
+
+#. module: audittrail
+#: view:audittrail.rule:0
+msgid "AuditTrail Rule"
+msgstr ""
+
+#. module: audittrail
+#: wizard_field:audittrail.view.log,init,to:0
+msgid "Log To"
+msgstr ""
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "New Value Text: "
+msgstr ""
+
+#. module: audittrail
+#: model:ir.module.module,description:audittrail.module_meta_information
+msgid ""
+"Allows the administrator to track every user operations on all objects of "
+"the system.\n"
+"    Subscribe Rules for read, write, create and delete on objects and check "
+"logs"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.log,timestamp:0
+msgid "Date"
+msgstr "Data"
+
+#. module: audittrail
+#: field:audittrail.log,user_id:0
+msgid "User"
+msgstr "Utilizaire"
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "Old Value Text : "
+msgstr ""
+
+#. module: audittrail
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid per l'arquitectura de la vista"
+
+#. module: audittrail
+#: field:audittrail.log,name:0
+msgid "Name"
+msgstr "Nom"
+
+#. module: audittrail
+#: field:audittrail.log,line_ids:0
+msgid "Log lines"
+msgstr ""
+
+#. module: audittrail
+#: model:ir.ui.menu,name:audittrail.menu_action_audittrail_rule_tree_sub
+msgid "Subscribed Rules"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.log.line,field_id:0
+msgid "Fields"
+msgstr "Camps"
+
+#. module: audittrail
+#: view:audittrail.rule:0
+msgid "AuditTrail Rules"
+msgstr ""
+
+#. module: audittrail
+#: model:ir.model,name:audittrail.model_audittrail_rule
+msgid "audittrail.rule"
+msgstr ""
+
+#. module: audittrail
+#: view:audittrail.rule:0
+msgid "UnSubscribe"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.rule,log_write:0
+msgid "Log writes"
+msgstr ""
+
+#. module: audittrail
+#: model:ir.model,name:audittrail.model_audittrail_log
+msgid "audittrail.log"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.log.line,field_description:0
+msgid "Field Description"
+msgstr ""
+
+#. module: audittrail
+#: selection:audittrail.log,method:0
+msgid "Delete"
+msgstr "Suprimir"
+
+#. module: audittrail
+#: wizard_button:audittrail.view.log,init,open:0
+msgid "Open Logs"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.log.line,new_value_text:0
+msgid "New value Text"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.rule,name:0
+msgid "Rule Name"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.rule,log_read:0
+msgid "Log reads"
+msgstr ""
+
+#. module: audittrail
+#: model:ir.ui.menu,name:audittrail.menu_action_audittrail_log_tree
+msgid "Logs"
+msgstr "Jornals"
+
+#. module: audittrail
+#: field:audittrail.log.line,new_value:0
+msgid "New Value"
+msgstr ""
+
+#. module: audittrail
+#: model:ir.ui.menu,name:audittrail.menu_action_log_tree2
+msgid "View Logs"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.rule,log_create:0
+msgid "Log creates"
+msgstr ""
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "AuditTrail Logs"
+msgstr ""
+
+#. module: audittrail
+#: model:ir.ui.menu,name:audittrail.menu_action_audittrail_rule_tree
+msgid "Rules"
+msgstr "Règlas"
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "New Value : "
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.rule,user_id:0
+msgid "Users"
+msgstr "Utilizaires"
+
+#. module: audittrail
+#: field:audittrail.log.line,old_value_text:0
+msgid "Old value Text"
+msgstr ""
+
+#. module: audittrail
+#: wizard_button:audittrail.view.log,init,end:0
+msgid "Cancel"
+msgstr "Anullar"
+
+#. module: audittrail
+#: field:audittrail.rule,log_unlink:0
+msgid "Log deletes"
+msgstr ""
diff --git a/addons/base_contact/i18n/oc.po b/addons/base_contact/i18n/oc.po
new file mode 100644
index 00000000000..01b24d6c21b
--- /dev/null
+++ b/addons/base_contact/i18n/oc.po
@@ -0,0 +1,357 @@
+# 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-05-18 08:57+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-19 05:11+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: base_contact
+#: field:res.partner.job,sequence_contact:0
+msgid "Contact Seq."
+msgstr "Seq. del contacte"
+
+#. module: base_contact
+#: model:ir.model,name:base_contact.model_res_partner_contact
+msgid "res.partner.contact"
+msgstr ""
+
+#. module: base_contact
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Lo nom de l'objècte deu començar amb x_ e conténer pas de caractèrs "
+"especials !"
+
+#. module: base_contact
+#: field:res.partner.job,function_id:0
+msgid "Partner Function"
+msgstr "Foncion del partenari"
+
+#. module: base_contact
+#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
+#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
+#: model:process.node,name:base_contact.process_node_contacts0
+#: view:res.partner:0
+#: view:res.partner.address:0
+#: field:res.partner.address,job_ids:0
+msgid "Contacts"
+msgstr "Contactes"
+
+#. module: base_contact
+#: field:res.partner.job,sequence_partner:0
+msgid "Partner Seq."
+msgstr "Seq. del partenari"
+
+#. module: base_contact
+#: selection:res.partner.job,state:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: base_contact
+#: field:res.partner.contact,first_name:0
+msgid "First Name"
+msgstr "Pichon nom"
+
+#. module: base_contact
+#: model:ir.model,name:base_contact.model_res_partner_job
+msgid "Contact Partner Function"
+msgstr "Foncion del contacte del partenari"
+
+#. module: base_contact
+#: field:res.partner.job,other:0
+msgid "Other"
+msgstr "Autre"
+
+#. module: base_contact
+#: model:process.transition,name:base_contact.process_transition_contacttofunction0
+msgid "Contact to function"
+msgstr "Contacte cap a foncion"
+
+#. module: base_contact
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom del Modèl invalid per la definicion de l'accion."
+
+#. module: base_contact
+#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
+msgid "Partner to address"
+msgstr "Partenari cap a adreça"
+
+#. module: base_contact
+#: view:res.partner.address:0
+msgid "# of Contacts"
+msgstr "# de contactes"
+
+#. module: base_contact
+#: help:res.partner.job,other:0
+msgid "Additional phone field"
+msgstr ""
+
+#. module: base_contact
+#: model:process.node,name:base_contact.process_node_function0
+msgid "Function"
+msgstr "Foncion"
+
+#. module: base_contact
+#: field:res.partner.job,fax:0
+msgid "Fax"
+msgstr "Fax"
+
+#. module: base_contact
+#: field:res.partner.contact,lang_id:0
+msgid "Language"
+msgstr "Lenga"
+
+#. module: base_contact
+#: field:res.partner.job,phone:0
+msgid "Phone"
+msgstr "Telefòn"
+
+#. module: base_contact
+#: model:process.transition,note:base_contact.process_transition_contacttofunction0
+msgid "Defines contacts and functions."
+msgstr "Definir los contactes e lors foncions"
+
+#. module: base_contact
+#: field:res.partner.contact,title:0
+msgid "Title"
+msgstr "Títol"
+
+#. module: base_contact
+#: view:res.partner.job:0
+msgid "Contact Functions"
+msgstr "Foncions del contacte"
+
+#. module: base_contact
+#: model:ir.module.module,shortdesc:base_contact.module_meta_information
+msgid "Base Contact"
+msgstr "Basa Contacte"
+
+#. module: base_contact
+#: help:res.partner.job,sequence_partner:0
+msgid ""
+"Order of importance of this job title in the list of job title of the linked "
+"partner"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,email:0
+#: field:res.partner.job,email:0
+msgid "E-Mail"
+msgstr "Corrièr electronic"
+
+#. module: base_contact
+#: field:res.partner.job,date_stop:0
+msgid "Date Stop"
+msgstr "Data de fin d'emplec"
+
+#. module: base_contact
+#: view:res.partner:0
+#: field:res.partner.job,address_id:0
+msgid "Address"
+msgstr "Adreça"
+
+#. module: base_contact
+#: model:ir.actions.act_window,name:base_contact.action_res_partner_job
+#: model:ir.ui.menu,name:base_contact.menu_action_res_partner_job
+msgid "Contact's Jobs"
+msgstr "Foncions dels contactes"
+
+#. module: base_contact
+#: field:res.partner.contact,country_id:0
+msgid "Nationality"
+msgstr "Nacionalitat"
+
+#. module: base_contact
+#: help:res.partner.job,sequence_contact:0
+msgid ""
+"Order of importance of this address in the list of addresses of the linked "
+"contact"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.address,job_id:0
+#: field:res.partner.contact,job_id:0
+msgid "Main Job"
+msgstr "Emplec principal"
+
+#. module: base_contact
+#: view:res.partner:0
+msgid "Categories"
+msgstr "Categorias"
+
+#. module: base_contact
+#: field:res.partner.contact,function_id:0
+msgid "Main Function"
+msgstr "Foncion principala"
+
+#. module: base_contact
+#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
+msgid "Define partners and their addresses."
+msgstr ""
+
+#. module: base_contact
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid per l'arquitectura de la vista"
+
+#. module: base_contact
+#: model:process.process,name:base_contact.process_process_basecontactprocess0
+msgid "Base Contact Process"
+msgstr "Tractar los contactes de basa"
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Seq."
+msgstr "Seq."
+
+#. module: base_contact
+#: field:res.partner.job,extension:0
+msgid "Extension"
+msgstr "Extension"
+
+#. module: base_contact
+#: field:res.partner.contact,mobile:0
+msgid "Mobile"
+msgstr "Telefonet"
+
+#. module: base_contact
+#: help:res.partner.job,extension:0
+msgid "Internal/External extension phone number"
+msgstr ""
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_contacts0
+msgid "People you work with."
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Extra Information"
+msgstr "Informacion suplementària"
+
+#. module: base_contact
+#: view:res.partner.contact:0
+#: field:res.partner.contact,job_ids:0
+msgid "Functions and Addresses"
+msgstr "Foncions e adreças"
+
+#. module: base_contact
+#: field:res.partner.contact,active:0
+msgid "Active"
+msgstr "Actiu"
+
+#. module: base_contact
+#: field:res.partner.job,contact_id:0
+msgid "Contact"
+msgstr "Contacte"
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_partners0
+msgid "Companies you work with."
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,partner_id:0
+msgid "Main Employer"
+msgstr "Emplegaire principal"
+
+#. module: base_contact
+#: model:process.transition,name:base_contact.process_transition_functiontoaddress0
+msgid "Function to address"
+msgstr "Foncion cap a adreça"
+
+#. module: base_contact
+#: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
+msgid "Partner Contacts"
+msgstr "Contactes del partenari"
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Partner Contact"
+msgstr "Contacte del partenari"
+
+#. module: base_contact
+#: model:process.node,name:base_contact.process_node_partners0
+msgid "Partners"
+msgstr "Partenaris"
+
+#. module: base_contact
+#: model:process.node,name:base_contact.process_node_addresses0
+#: view:res.partner:0
+msgid "Addresses"
+msgstr "Adreças"
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_addresses0
+msgid "Working and private addresses."
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,name:0
+msgid "Last Name"
+msgstr "Nom d'ostal"
+
+#. module: base_contact
+#: field:res.partner.job,state:0
+msgid "State"
+msgstr "Estat"
+
+#. module: base_contact
+#: view:res.partner.contact:0
+#: view:res.partner.job:0
+msgid "General"
+msgstr "General"
+
+#. module: base_contact
+#: selection:res.partner.job,state:0
+msgid "Past"
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "General Information"
+msgstr "Informacions generalas"
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_function0
+msgid "Jobs at a same partner address."
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.job,name:0
+msgid "Partner"
+msgstr "Partenari"
+
+#. module: base_contact
+#: field:res.partner.job,date_start:0
+msgid "Date Start"
+msgstr "Data de començament"
+
+#. module: base_contact
+#: model:process.transition,note:base_contact.process_transition_functiontoaddress0
+msgid "Define functions and address."
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,website:0
+msgid "Website"
+msgstr "Site web"
+
+#. module: base_contact
+#: field:res.partner.contact,birthdate:0
+msgid "Birth Date"
+msgstr "Data de naissença"
diff --git a/addons/base_iban/i18n/oc.po b/addons/base_iban/i18n/oc.po
new file mode 100644
index 00000000000..e1e7020e801
--- /dev/null
+++ b/addons/base_iban/i18n/oc.po
@@ -0,0 +1,64 @@
+# 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-05-18 08:28+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-19 05:11+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: base_iban
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid per l'arquitectura de la vista"
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_zip_field
+msgid "zip"
+msgstr "zip"
+
+#. module: base_iban
+#: help:res.partner.bank,iban:0
+msgid "International Bank Account Number"
+msgstr "Numèro Internacional de Compte Bancari"
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_country_field
+msgid "country_id"
+msgstr "country_id"
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_swift_field
+msgid "bic"
+msgstr "bic"
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_iban_field
+msgid "iban"
+msgstr "iban"
+
+#. module: base_iban
+#: model:ir.module.module,shortdesc:base_iban.module_meta_information
+#: field:res.partner.bank,iban:0
+msgid "IBAN"
+msgstr "IBAN"
+
+#. module: base_iban
+#: model:res.partner.bank.type,name:base_iban.bank_iban
+msgid "IBAN Account"
+msgstr "N° IBAN del compte"
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_acc_number_field
+msgid "acc_number"
+msgstr "acc_number"
diff --git a/addons/base_module_merge/i18n/oc.po b/addons/base_module_merge/i18n/oc.po
new file mode 100644
index 00000000000..e4cc7b748e1
--- /dev/null
+++ b/addons/base_module_merge/i18n/oc.po
@@ -0,0 +1,155 @@
+# 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-05-18 08:33+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-19 05:12+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,category:0
+msgid "Category"
+msgstr "Categoria"
+
+#. module: base_module_merge
+#: wizard_view:base_module_merge.module_merge,save:0
+msgid "Information"
+msgstr "Informacion"
+
+#. module: base_module_merge
+#: wizard_view:base_module_merge.module_merge,init:0
+msgid "Module Merging"
+msgstr ""
+
+#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,author:0
+msgid "Author"
+msgstr "Autor"
+
+#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,directory_name:0
+msgid "Directory Name"
+msgstr "Nom del dorsièr"
+
+#. module: base_module_merge
+#: selection:base_module_merge.module_merge,info,data_kind:0
+msgid "Demo Data"
+msgstr "Donadas de demo"
+
+#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,save,module_filename:0
+msgid "Filename"
+msgstr "Nom del fichièr"
+
+#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,version:0
+msgid "Version"
+msgstr "Version"
+
+#. module: base_module_merge
+#: wizard_view:base_module_merge.module_merge,info:0
+#: wizard_view:base_module_merge.module_merge,save:0
+msgid "Module Recording"
+msgstr "Modul d'Enregistrament"
+
+#. module: base_module_merge
+#: wizard_view:base_module_merge.module_merge,save:0
+msgid "Thanks in advance for your contribution."
+msgstr ""
+
+#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,description:0
+msgid "Full Description"
+msgstr "Descripcion completa"
+
+#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,name:0
+msgid "Module Name"
+msgstr "Nom de modul"
+
+#. module: base_module_merge
+#: model:ir.actions.wizard,name:base_module_merge.wizard_base_module_merger
+#: model:ir.ui.menu,name:base_module_merge.menu_wizard_base_module_merger
+msgid "Merge module"
+msgstr ""
+
+#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,save,module_file:0
+msgid "Module .zip File"
+msgstr "Fichièr zip del Modul"
+
+#. module: base_module_merge
+#: model:ir.module.module,shortdesc:base_module_merge.module_meta_information
+msgid "Module Merger"
+msgstr ""
+
+#. module: base_module_merge
+#: wizard_view:base_module_merge.module_merge,save:0
+msgid "Module successfully created !"
+msgstr "Modul creat amb succès !"
+
+#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,website:0
+msgid "Documentation URL"
+msgstr ""
+
+#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,init,modules_list:0
+msgid "Modules"
+msgstr "Moduls"
+
+#. module: base_module_merge
+#: wizard_button:base_module_merge.module_merge,info,save:0
+#: wizard_button:base_module_merge.module_merge,init,info:0
+msgid "Continue"
+msgstr "Contunhar"
+
+#. module: base_module_merge
+#: selection:base_module_merge.module_merge,info,data_kind:0
+msgid "Normal Data"
+msgstr ""
+
+#. module: base_module_merge
+#: wizard_view:base_module_merge.module_merge,save:0
+msgid ""
+"If you think your module could interrest others people, we'd like you to "
+"publish it on OpenERP.com, in the 'Modules' section. You can do it through "
+"the website or using features of the 'base_module_publish' module."
+msgstr ""
+
+#. module: base_module_merge
+#: help:base_module_merge.module_merge,init,modules_list:0
+msgid "Select Modules which you want to merge in single module"
+msgstr ""
+
+#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,data_kind:0
+msgid "Type of Data"
+msgstr "Tipe de Donada"
+
+#. module: base_module_merge
+#: wizard_view:base_module_merge.module_merge,info:0
+msgid "Module Information"
+msgstr "Informacion sul Modul"
+
+#. module: base_module_merge
+#: wizard_button:base_module_merge.module_merge,info,end:0
+#: wizard_button:base_module_merge.module_merge,init,end:0
+msgid "Cancel"
+msgstr "Anullar"
+
+#. module: base_module_merge
+#: wizard_button:base_module_merge.module_merge,save,end:0
+msgid "Close"
+msgstr "Tampar"
diff --git a/addons/board_document/i18n/oc.po b/addons/board_document/i18n/oc.po
new file mode 100644
index 00000000000..4f6aa7e41d2
--- /dev/null
+++ b/addons/board_document/i18n/oc.po
@@ -0,0 +1,90 @@
+# 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-05-18 09:06+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-19 05:12+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: board_document
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid per l'arquitectura de la vista"
+
+#. module: board_document
+#: view:board.board:0
+msgid "New Files"
+msgstr "Fichièrs novèls"
+
+#. module: board_document
+#: model:ir.actions.act_window,name:board_document.open_board_document_manager
+#: model:ir.ui.menu,name:board_document.menu_board_document_manager
+msgid "Document Dashboard"
+msgstr ""
+
+#. module: board_document
+#: view:board.board:0
+msgid "Wall of Shame"
+msgstr "Paret de la Vergonha"
+
+#. module: board_document
+#: view:board.board:0
+msgid "File Size by Month"
+msgstr "Talha dels Fichièrs per Mes"
+
+#. module: board_document
+#: view:board.board:0
+msgid "Files by Month"
+msgstr "Fichièrs per Mes"
+
+#. module: board_document
+#: model:ir.actions.act_window,name:board_document.open_board_document_manager1
+#: model:ir.ui.menu,name:board_document.menu_board_document_manager1
+msgid "Statistics by User"
+msgstr ""
+
+#. module: board_document
+#: view:board.board:0
+msgid "Files by Resource Type"
+msgstr "Fichièrs per Tipe de Ressorsa"
+
+#. module: board_document
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom del Modèl invalid per la definicion de l'accion."
+
+#. module: board_document
+#: model:ir.module.module,shortdesc:board_document.module_meta_information
+msgid "Dashboard for Document Management"
+msgstr ""
+
+#. module: board_document
+#: view:board.board:0
+msgid "Files by Partner"
+msgstr "Fichièrs per Partenari"
+
+#. module: board_document
+#: model:ir.ui.menu,name:board_document.menu_board_document
+msgid "Document"
+msgstr "Document"
+
+#. module: board_document
+#: view:board.board:0
+msgid "Files by Users"
+msgstr "Fichièrs per Utilizaire"
+
+#. module: board_document
+#: view:board.board:0
+msgid "Document board"
+msgstr "Tablèu dels Documents"
diff --git a/addons/board_manufacturing/i18n/oc.po b/addons/board_manufacturing/i18n/oc.po
new file mode 100644
index 00000000000..67f60dc5222
--- /dev/null
+++ b/addons/board_manufacturing/i18n/oc.po
@@ -0,0 +1,74 @@
+# 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-05-18 09:03+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-19 05:11+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: board_manufacturing
+#: view:board.board:0
+msgid "Procurement in Exception"
+msgstr "Aprovisionament en excepcion"
+
+#. module: board_manufacturing
+#: view:board.board:0
+msgid "Next production orders"
+msgstr "Òrdre de fabricacion seguent"
+
+#. module: board_manufacturing
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid per l'arquitectura de la vista"
+
+#. module: board_manufacturing
+#: view:board.board:0
+msgid "Deliveries (Out packing)"
+msgstr "Liurasons"
+
+#. module: board_manufacturing
+#: view:board.board:0
+msgid "Manufacturing board"
+msgstr "Tablèu de bòrd de produccion"
+
+#. module: board_manufacturing
+#: model:ir.ui.menu,name:board_manufacturing.next_id_87
+msgid "Production"
+msgstr "Produccion"
+
+#. module: board_manufacturing
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom del Modèl invalid per la definicion de l'accion."
+
+#. module: board_manufacturing
+#: model:ir.actions.act_window,name:board_manufacturing.open_board_manufacturing
+#: model:ir.ui.menu,name:board_manufacturing.menu_board_manufacturing
+msgid "Production Dashboard"
+msgstr "Tablèu de bòrd de produccion"
+
+#. module: board_manufacturing
+#: model:ir.module.module,shortdesc:board_manufacturing.module_meta_information
+msgid "Board for manufacturing"
+msgstr "Tablèu per la produccion"
+
+#. module: board_manufacturing
+#: view:board.board:0
+msgid "Stock value variation"
+msgstr "Variacion de la valor de l'emmagazinatge"
+
+#. module: board_manufacturing
+#: view:board.board:0
+msgid "Workcenter futur load"
+msgstr ""
diff --git a/addons/board_project/i18n/oc.po b/addons/board_project/i18n/oc.po
new file mode 100644
index 00000000000..c1452a23e89
--- /dev/null
+++ b/addons/board_project/i18n/oc.po
@@ -0,0 +1,140 @@
+# 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-05-18 09:08+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-19 05:11+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: board_project
+#: view:board.board:0
+msgid "My project's planning"
+msgstr "Mon planning de projèctes"
+
+#. module: board_project
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:board_project.act_hr_timesheet_sheet
+msgid "Timesheets"
+msgstr "Fuèlh de preséncia"
+
+#. module: board_project
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom del Modèl invalid per la definicion de l'accion."
+
+#. module: board_project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board_project.act_my_project
+msgid "My projects"
+msgstr "Mos projèctes"
+
+#. module: board_project
+#: model:ir.actions.act_window,name:board_project.action_view_task_tree_deadline
+msgid "My Task's Deadlines"
+msgstr "Las Datas Limitas de mos Prètzfaches"
+
+#. module: board_project
+#: view:project.task:0
+msgid "My Tasks"
+msgstr "Mos prètzfaches"
+
+#. module: board_project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board_project.action_view_board_note_tree
+msgid "Public Notes"
+msgstr "Nòtas publicas"
+
+#. module: board_project
+#: model:ir.actions.act_window,name:board_project.open_board_project
+#: model:ir.ui.menu,name:board_project.menu_board_project
+msgid "Project Dashboard"
+msgstr "Tablèu de bòrd de projècte"
+
+#. module: board_project
+#: model:ir.module.module,shortdesc:board_project.module_meta_information
+msgid "Board for project users"
+msgstr ""
+
+#. module: board_project
+#: model:ir.actions.act_window,name:board_project.action_project_pipeline_user
+msgid "Pipeline of tasks"
+msgstr ""
+
+#. module: board_project
+#: view:board.board:0
+msgid "My Planning"
+msgstr ""
+
+#. module: board_project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board_project.act_my_account
+msgid "My accounts to invoice"
+msgstr "Mos comptes de facturar"
+
+#. module: board_project
+#: model:ir.actions.act_window,name:board_project.open_board_project_manager
+#: model:ir.ui.menu,name:board_project.menu_board_project_manager
+msgid "Project Manager Dashboard"
+msgstr "Tablèu de bòrd de gestion de projècte"
+
+#. module: board_project
+#: view:board.board:0
+msgid "My Deadlines"
+msgstr "Mas datas limitas"
+
+#. module: board_project
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid per l'arquitectura de la vista"
+
+#. module: board_project
+#: view:board.board:0
+msgid "User's timesheets"
+msgstr "Fuèlh de preséncia de l'utilizaire"
+
+#. module: board_project
+#: model:ir.ui.menu,name:board_project.next_id_86
+msgid "Project"
+msgstr "Projècte"
+
+#. module: board_project
+#: view:board.board:0
+msgid "Project manager board"
+msgstr "Tablèu del responsable del projècte"
+
+#. module: board_project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board_project.action_view_task_tree
+msgid "My Open Tasks"
+msgstr "Mos prètzfaches dobèrts"
+
+#. module: board_project
+#: view:board.board:0
+msgid "My Board"
+msgstr "Mon Tablèu"
+
+#. module: board_project
+#: view:board.board:0
+msgid "My tasks board"
+msgstr "Mon tablèu de prètzfaches"
+
+#. module: board_project
+#: view:board.board:0
+msgid "My user's pipeline"
+msgstr ""
+
+#. module: board_project
+#: view:board.board:0
+msgid "My Timesheet"
+msgstr "Mon Fuèlh de preséncia"
diff --git a/addons/board_sale/i18n/oc.po b/addons/board_sale/i18n/oc.po
new file mode 100644
index 00000000000..459943a5940
--- /dev/null
+++ b/addons/board_sale/i18n/oc.po
@@ -0,0 +1,74 @@
+# 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-05-18 09:06+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-19 05:11+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: board_sale
+#: model:ir.module.module,shortdesc:board_sale.module_meta_information
+msgid "Dashboard for sales"
+msgstr "Tablèu de Bòrd de las Vendas"
+
+#. module: board_sale
+#: model:ir.actions.act_window,name:board_sale.open_board_sales_manager
+#: model:ir.ui.menu,name:board_sale.menu_board_sales_manager
+msgid "Sale Dashboard"
+msgstr "Tablèu de Bòrd de las Vendas"
+
+#. module: board_sale
+#: view:board.board:0
+msgid "Sales of the month"
+msgstr "Vendas del Mes"
+
+#. module: board_sale
+#: view:board.board:0
+msgid "Sales manager board"
+msgstr "Tablèu de Bòrd del Gestionari de las Vendas"
+
+#. module: board_sale
+#: view:board.board:0
+msgid "Cases of the month"
+msgstr "Cas del Mes"
+
+#. module: board_sale
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid per l'arquitectura de la vista"
+
+#. module: board_sale
+#: view:board.board:0
+msgid "My open quotations"
+msgstr "Mos Devises Dobèrts"
+
+#. module: board_sale
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom del Modèl invalid per la definicion de l'accion."
+
+#. module: board_sale
+#: model:ir.ui.menu,name:board_sale.next_id_88
+msgid "Sales"
+msgstr "Vendas"
+
+#. module: board_sale
+#: view:board.board:0
+msgid "Cases statistics"
+msgstr "Estatisticas dels Cases"
+
+#. module: board_sale
+#: view:board.board:0
+msgid "Top ten sales of the month"
+msgstr "10 melhoras Vendas del Mes"
diff --git a/addons/crm/i18n/es.po b/addons/crm/i18n/es.po
index aaf1103bcd8..d0b526f542e 100644
--- a/addons/crm/i18n/es.po
+++ b/addons/crm/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-18 05:15+0000\n"
+"X-Launchpad-Export-Date: 2010-05-19 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm_vertical/i18n/id.po b/addons/crm_vertical/i18n/id.po
index 78fa6ce730c..2001657f4ab 100644
--- a/addons/crm_vertical/i18n/id.po
+++ b/addons/crm_vertical/i18n/id.po
@@ -7,16 +7,16 @@ 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:48+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-05-18 10:59+0000\n"
+"Last-Translator: Pandu Pradana <p4ndupr4d4n4@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:20+0000\n"
+"X-Launchpad-Export-Date: 2010-05-19 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
 #: model:ir.module.module,description:crm_vertical.module_meta_information
 msgid "Simplification of the interface for CRM."
-msgstr ""
+msgstr "Penyederhanaan dari antar-muka CRM."
diff --git a/addons/hr_attendance/i18n/tr.po b/addons/hr_attendance/i18n/tr.po
index c29b97853ca..87b03b27557 100644
--- a/addons/hr_attendance/i18n/tr.po
+++ b/addons/hr_attendance/i18n/tr.po
@@ -7,13 +7,13 @@ 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:34+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-05-18 11:29+0000\n"
+"Last-Translator: Angel Spy <melissadilara@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:18+0000\n"
+"X-Launchpad-Export-Date: 2010-05-19 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -112,7 +112,7 @@ msgstr "Bir zaman aralığı seçiniz..."
 #. module: hr_attendance
 #: rml:report.hr.timesheet.attendance.error:0
 msgid "Date Recorded"
-msgstr ""
+msgstr "Tarih Kaydedildi"
 
 #. module: hr_attendance
 #: selection:hr.attendance,action:0
@@ -123,7 +123,7 @@ msgstr "Giriş"
 #. module: hr_attendance
 #: rml:report.hr.timesheet.attendance.error:0
 msgid "Total period:"
-msgstr ""
+msgstr "Toplam periyod:"
 
 #. module: hr_attendance
 #: field:hr.attendance,action_desc:0
@@ -139,12 +139,12 @@ msgstr "Mart"
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "August"
-msgstr "Agustos"
+msgstr "Ağustos"
 
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "May"
-msgstr "Mayis"
+msgstr "Mayıs"
 
 #. module: hr_attendance
 #: wizard_field:hr.si_so,so_ask_si,last_time:0
@@ -175,7 +175,7 @@ msgstr "Personel Devam Kontrolü"
 #. module: hr_attendance
 #: field:hr.action.reason,name:0
 msgid "Reason"
-msgstr ""
+msgstr "Sebep"
 
 #. module: hr_attendance
 #: constraint:hr.attendance:0
@@ -218,17 +218,17 @@ msgstr "Başlangıç Tarihi"
 #. module: hr_attendance
 #: selection:hr.employee,state:0
 msgid "Present"
-msgstr ""
+msgstr "Mevcut"
 
 #. module: hr_attendance
 #: selection:hr.employee,state:0
 msgid "Absent"
-msgstr ""
+msgstr "Yok"
 
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "February"
-msgstr "Subat"
+msgstr "Şubat"
 
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
@@ -238,7 +238,7 @@ msgstr "Ekim"
 #. module: hr_attendance
 #: wizard_field:hr.si_so,si_ask_so,last_time:0
 msgid "Your last sign out"
-msgstr "Son Çıkış imzanız"
+msgstr "Son çıkışınız"
 
 #. module: hr_attendance
 #: rml:report.hr.timesheet.attendance.error:0
@@ -248,7 +248,7 @@ msgstr "Min. Gecikme"
 #. module: hr_attendance
 #: field:hr.action.reason,action_type:0
 msgid "Action's type"
-msgstr ""
+msgstr "Eylem türü"
 
 #. module: hr_attendance
 #: view:hr.action.reason:0
@@ -270,7 +270,7 @@ msgstr "Analiz Bilgisi"
 #. module: hr_attendance
 #: wizard_field:hr.si_so,init,state:0
 msgid "Current state"
-msgstr "Güncel Durum"
+msgstr "Mevcut durum"
 
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
@@ -298,7 +298,7 @@ msgstr ""
 #: field:hr.attendance,action:0
 #: selection:hr.attendance,action:0
 msgid "Action"
-msgstr "İşlem"
+msgstr "Eylem"
 
 #. module: hr_attendance
 #: wizard_button:hr.attendance.report,init,print:0
@@ -314,7 +314,7 @@ msgstr ""
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "November"
-msgstr "Kasim"
+msgstr "Kasım"
 
 #. module: hr_attendance
 #: wizard_view:hr.attendance.report,init:0
@@ -347,12 +347,12 @@ msgstr ""
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "September"
-msgstr "Eylul"
+msgstr "Eylül"
 
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "December"
-msgstr "Aralik"
+msgstr "Aralık"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
@@ -362,7 +362,7 @@ msgstr "Personel Devam Süresi"
 #. module: hr_attendance
 #: wizard_view:hr.attendance.print_month,init:0
 msgid "Select a month"
-msgstr "Bir Ay Seç"
+msgstr "Ay seçin"
 
 #. module: hr_attendance
 #: wizard_field:hr.attendance.print_month,init,month:0
@@ -382,7 +382,7 @@ msgstr "Devam Süresi Hata Raporu"
 #. module: hr_attendance
 #: wizard_field:hr.attendance.print_month,init,year:0
 msgid "Year"
-msgstr ""
+msgstr "Yıl"
 
 #. module: hr_attendance
 #: wizard_button:hr.attendance.print_month,init,end:0
@@ -397,4 +397,4 @@ msgstr "İptal"
 #. module: hr_attendance
 #: rml:report.hr.timesheet.attendance.error:0
 msgid "Operation"
-msgstr "Operasyon"
+msgstr "İşlem"
diff --git a/addons/hr_contract/i18n/ar.po b/addons/hr_contract/i18n/ar.po
index de5ebc99fa0..4122d40f142 100644
--- a/addons/hr_contract/i18n/ar.po
+++ b/addons/hr_contract/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-18 05:15+0000\n"
+"X-Launchpad-Export-Date: 2010-05-19 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 4e1e3033a92..f5ca61f4085 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -120,9 +120,9 @@ class hr_expense_expense(osv.osv):
             for l in exp.line_ids:
                 tax_id = []
                 if l.product_id:
-                    acc = l.product_id.product_tmpl_id.property_account_expense.id
+                    acc = l.product_id.product_tmpl_id.property_account_expense
                     if not acc:
-                        acc = l.product_id.categ_id.property_account_expense_categ.id
+                        acc = l.product_id.categ_id.property_account_expense_categ
                     tax_id = [x.id for x in l.product_id.supplier_taxes_id]
                 else:
                     acc = self.pool.get('ir.property').get(cr, uid, 'property_account_expense_categ', 'product.category')
@@ -131,7 +131,7 @@ class hr_expense_expense(osv.osv):
 
                 lines.append((0, False, {
                     'name': l.name,
-                    'account_id': acc,
+                    'account_id': acc.id,
                     'price_unit': l.unit_amount,
                     'quantity': l.unit_quantity,
                     'uos_id': l.uom_id.id,
@@ -177,7 +177,7 @@ class product_product(osv.osv):
     _inherit = "product.product"
     _columns = {
         'hr_expense_ok': fields.boolean('Can Constitute an Expense', help="Determines if the product can be visible in the list of product within a selection from an HR expense sheet line."),
-    }
+                }
 
 product_product()
 
diff --git a/addons/hr_expense/hr_expense_demo.xml b/addons/hr_expense/hr_expense_demo.xml
index 51a77f8d4e9..25bf807b867 100644
--- a/addons/hr_expense/hr_expense_demo.xml
+++ b/addons/hr_expense/hr_expense_demo.xml
@@ -1,6 +1,40 @@
 <?xml version="1.0" ?>
 <openerp>
 	<data noupdate="1">
+
+	    <record id="product_product_expense_0" model="product.product">
+            <field name="list_price">800.0</field>
+            <field name="standard_price">700.0</field>
+            <field name="uom_id" ref="product.product_uom_unit"/>
+            <field name="uom_po_id" ref="product.product_uom_unit"/>
+            <field name="type">service</field>
+            <field name="name">Travel</field>
+            <field name="categ_id" ref="product.product_category_7"/>
+            <field name="hr_expense_ok" eval="True" />
+        </record>
+
+        <record id="product_product_expense_1" model="product.product">
+            <field name="list_price">50.25</field>
+            <field name="standard_price">35.5</field>
+            <field name="uom_id" ref="product.product_uom_unit"/>
+            <field name="uom_po_id" ref="product.product_uom_unit"/>
+            <field name="type">service</field>
+            <field name="name">PC Expense</field>
+            <field name="categ_id" ref="product.product_category_7"/>
+            <field name="hr_expense_ok" eval="True" />
+        </record>
+
+        <record id="product_product_expense_2" model="product.product">
+            <field name="list_price">500.0</field>
+            <field name="standard_price">400.0</field>
+            <field name="uom_id" ref="product.product_uom_unit"/>
+            <field name="uom_po_id" ref="product.product_uom_unit"/>
+            <field name="type">service</field>
+            <field name="name">Hotel</field>
+            <field name="categ_id" ref="product.product_category_7"/>
+            <field name="hr_expense_ok" eval="True" />
+        </record>
+
 		<record id="hr_expense_expense_septemberexpenses0" model="hr.expense.expense">
 			<field name="currency_id" ref="base.EUR"/>
 			<field name="employee_id" ref="hr.employee1"/>
@@ -10,20 +44,25 @@
 			<field name="date">2010-05-03</field>
 			<field name="state">draft</field>
 		</record>
+
 		<record id="hr_expense_line_travelbycarcustomerseagatedouble0" model="hr.expense.line">
 			<field name="name">Travel by Car - Customer Seagate 2 - Double</field>
 			<field name="date_value">2010-05-03</field>
 			<field name="analytic_account" ref="account.analytic_thymbra"/>
+			<field name="product_id" ref="product_product_expense_0"/>
 			<field model="hr.expense.expense" name="expense_id" search="[('name', '=', u'September Expenses')]"/>
-			<field eval="200.0" name="unit_amount"/>
-			<field eval="130.0" name="unit_quantity"/>
+			<field eval="700.0" name="unit_amount"/>
+			<field name="uom_id" ref="product.product_uom_unit"/>
+			<field eval="200.0" name="unit_quantity"/>
 		</record>
 		<record id="hr_expense_line_basicpcserverforseagate0" model="hr.expense.line">
 			<field name="name">Basic PC - Server for Seagate</field>
 			<field name="date_value">2010-05-03</field>
 			<field name="analytic_account" ref="account.analytic_seagate_p2"/>
+			<field name="product_id" ref="product_product_expense_1"/>
 			<field model="hr.expense.expense" name="expense_id" search="[('name', '=', u'September Expenses')]"/>
-			<field eval="500.0" name="unit_amount"/>
+			<field eval="35.5" name="unit_amount"/>
+			<field name="uom_id" ref="product.product_uom_unit"/>
 			<field eval="1.0" name="unit_quantity"/>
 		</record>
 	</data>
@@ -41,8 +80,10 @@
 			<field name="name">Hotel Expenses - Thymbra</field>
 			<field name="date_value">2010-05-03</field>
 			<field name="analytic_account" ref="account.analytic_thymbra"/>
+			<field name="product_id" ref="product_product_expense_2"/>
 			<field model="hr.expense.expense" name="expense_id" search="[('name', '=', u'Hotel Expenses')]"/>
-			<field eval="2000.0" name="unit_amount"/>
+			<field eval="400.0" name="unit_amount"/>
+			<field name="uom_id" ref="product.product_uom_unit"/>
 			<field eval="5.0" name="unit_quantity"/>
 		</record>
 
diff --git a/addons/hr_holidays/i18n/es.po b/addons/hr_holidays/i18n/es.po
index 9d0158f14b2..245cacc6dee 100644
--- a/addons/hr_holidays/i18n/es.po
+++ b/addons/hr_holidays/i18n/es.po
@@ -7,13 +7,14 @@ 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-30 21:12+0000\n"
-"Last-Translator: Cristian Salamea (GnuThink) <ovnicraft@gmail.com>\n"
+"PO-Revision-Date: 2010-05-18 13:49+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-05-05 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-05-19 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -49,7 +50,7 @@ msgstr "Azul claro"
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Brown"
-msgstr "Café"
+msgstr "Marrón"
 
 #. module: hr_holidays
 #: xsl:holidays.summary:0
@@ -89,7 +90,7 @@ msgstr "hasta"
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Cyan"
-msgstr "Cian Claro"
+msgstr "Cian claro"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -185,12 +186,12 @@ msgstr "Estado Vacaciones"
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
 msgid "Holidays Status"
-msgstr "Estado de Vacaciones"
+msgstr "Estado de vacaciones"
 
 #. module: hr_holidays
 #: field:hr.holidays,date_to:0
 msgid "Vacation end day"
-msgstr "Fecha Fin Vacaciones"
+msgstr "Fecha fin vacaciones"
 
 #. module: hr_holidays
 #: view:hr.holidays.per.user:0
@@ -261,7 +262,7 @@ msgstr "Empleado"
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "Waiting Validation"
-msgstr "Esperando Validación"
+msgstr "Esperando validación"
 
 #. module: hr_holidays
 #: model:process.transition,note:hr_holidays.process_transition_employeeholidays0
@@ -276,7 +277,7 @@ msgstr "Salmón claro"
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Wheat"
-msgstr "Abano"
+msgstr "Trigo"
 
 #. module: hr_holidays
 #: field:hr.holidays.log,nb_holidays:0
@@ -292,20 +293,20 @@ msgstr "Mis peticiones"
 #: view:hr.holidays:0
 #: view:hr.holidays.per.user:0
 msgid "Number of Days"
-msgstr "Número de Días"
+msgstr "Número de días"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,name:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.ui.menu,name:hr_holidays.menu_open_view_holiday_status
 msgid "Holiday Status"
-msgstr "Estado de Vacaciones"
+msgstr "Estado vacaciones"
 
 #. module: hr_holidays
 #: wizard_view:hr.holidays.summary,init:0
 #: wizard_view:hr.holidays.summary.employee,init:0
 msgid "Report Options"
-msgstr "Opciones de Reporte"
+msgstr "Opciones del informe"
 
 #. module: hr_holidays
 #: constraint:ir.ui.view:0
@@ -368,7 +369,7 @@ msgstr "Lavanda"
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_log
 msgid "hr.holidays.log"
-msgstr "Log de Vacaciones"
+msgstr "hr.holidays.log"
 
 #. module: hr_holidays
 #: model:ir.actions.wizard,name:hr_holidays.wizard_holidays_summary
@@ -383,7 +384,7 @@ msgstr "Calendario"
 #. module: hr_holidays
 #: field:hr.holidays,date_from:0
 msgid "Vacation start day"
-msgstr "Inicio de Vacaciones"
+msgstr "Fecha inicio de vacaciones"
 
 #. module: hr_holidays
 #: model:ir.module.module,description:hr_holidays.module_meta_information
@@ -422,21 +423,36 @@ msgid ""
 "            for example, you maybe will do it for the user 'admin'.\n"
 msgstr ""
 "Recursos Humanos: Registro y seguimiento de Vacaciones\n"
-"Este modulo permite administrar las vacaciones y peticiones. Para cada "
-"empleado se puede definir un numero de vacaciones disponibles.\n"
-"Ademas:\n"
-"Sincronizacion con la agenda (usando el modulo de CRM) es posible: "
-"automatizar la creacion de casos cuando una peticion es aceptada, tiene un "
-"link para los estados de vacaciones. Puede configurar esta info en el color "
-"de su preferencia.\n"
-"Estado de Vacaciones:\n"
-"Un empleado puede crear peticiones negativas (pedir -2 dias por ejemplo). es "
-"es considerado por el sistema como una peticion de mas dias de ausencia.\n"
-"Hay 2 maneras para imprimir las vacaciones:\n"
-"Elegir empleados por departamento y usar un asistente.\n"
-"O imprimir un empleado especifico.\n"
-"Ademas el asistente permite elegir las vacaciones validadas y confirmadas o "
-"solo una.\n"
+"    Este módulo permite administrar las vacaciones y peticiones de "
+"vacaciones. Para cada empleado se puede definir un numero de vacaciones "
+"disponibles.\n"
+"    Además:\n"
+"    - Es posible sincronizar con la agenda (usando el módulo de CRM): Para "
+"poder automatizar la creación de casos cuando una petición es aceptada, "
+"tiene que relacionar un estado de vacaciones con una sección de casos. Puede "
+"configurar esta información y también el color preferido en RRHH / "
+"Configuración / Estado de vacaciones.\n"
+"    - Un empleado puede crear peticiones negativas (pedir -2 días por "
+"ejemplo). Esto el sistema lo considera como una petición de más días de "
+"ausencia. Incrementará su total de vacaciones disponibles de este tipo (si "
+"la petición es aceptada).\n"
+"    - Hay 2 maneras de imprimir las vacaciones:\n"
+"        * La primera permite seleccionar empleados por departamento y está "
+"disponible desde el menú\n"
+"              RRHH / Petición de vacaciones / Imprimir resumen de "
+"vacaciones\n"
+"        * La segunda permite seleccionar el informe de vacaciones para "
+"ciertos empleados. Desde la lista\n"
+"              RRHH / Empleados / Empleados\n"
+"          seleccione los empleados que desee, haga clic en el icono de "
+"imprimir y seleccione la opción\n"
+"              'Imprimir resumen de vacaciones de los empleados'\n"
+"    - El asistente permite elegir si quiere imprimir las vacaciones "
+"confirmadas y validadas o sólo las validadas. Estos estados deben "
+"configurarse por un usuario del grupo 'HR' con el rol de 'holidays'. Puede "
+"definirlo en la pestaña de seguridad en la ficha de usuario en el menú\n"
+"              Administración / Usuarios / Usuarios\n"
+"      por ejemplo, quizá quiere hacerlo para el usuario 'admin'.\n"
 
 #. module: hr_holidays
 #: wizard_view:hr.holidays.summary,notify:0
@@ -447,7 +463,7 @@ msgstr "Notificación"
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_holidaysrequest0
 msgid "Employee fills in a request for holidays"
-msgstr "Petición de Vacaciones"
+msgstr "Empleado rellena una petición de vacaciones"
 
 #. module: hr_holidays
 #: model:process.transition,note:hr_holidays.process_transition_setholiday0
@@ -508,7 +524,7 @@ msgstr "Mis peticiones de vacaciones"
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color of the status"
-msgstr "Color de Estado"
+msgstr "Color del estado"
 
 #. module: hr_holidays
 #: selection:hr.holidays.summary,init,holiday_type:0
@@ -569,7 +585,7 @@ msgstr "Activo"
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_draft
 msgid "My Holidays Request Draft"
-msgstr "Mis peticiones en Borrador"
+msgstr "Mis peticiones en borrador"
 
 #. module: hr_holidays
 #: model:process.transition,name:hr_holidays.process_transition_approvedrequest0
@@ -680,7 +696,7 @@ msgstr "Caso"
 #. module: hr_holidays
 #: field:hr.holidays,holiday_user_id:0
 msgid "Holiday per user"
-msgstr "Vacaiones por usuario"
+msgstr "Vacaciones por usuario"
 
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_holidays0
@@ -705,7 +721,7 @@ msgstr "Rojo"
 #. module: hr_holidays
 #: model:ir.module.module,shortdesc:hr_holidays.module_meta_information
 msgid "Human Resources: Holidays management"
-msgstr "Gestión de Vacaciones"
+msgstr "Recursos humanos: Gestión de vacaciones"
 
 #. module: hr_holidays
 #: model:process.process,name:hr_holidays.process_process_holidaysprocess0
diff --git a/addons/idea/__openerp__.py b/addons/idea/__openerp__.py
index c297d428eb3..0db86965870 100644
--- a/addons/idea/__openerp__.py
+++ b/addons/idea/__openerp__.py
@@ -45,7 +45,9 @@
     'demo_xml': [
         "idea_data.xml"
     ],
-    'test':['test/test_idea.yml'],
+    'test':[
+        'test/test_idea.yml'
+    ],
     'installable': True,
     'certificate': '0071515601309',
 }
diff --git a/addons/idea/test/test_idea.yml b/addons/idea/test/test_idea.yml
index c1ee6deb80f..6714fbfc7e2 100644
--- a/addons/idea/test/test_idea.yml
+++ b/addons/idea/test/test_idea.yml
@@ -87,9 +87,10 @@
 - 
   !record {model: idea.idea, id: idea.idea_idea_0}:
     comment_ids:
-      - content: We can learn many things from technical presentation
+      - content: "We can learn many things from technical presentation"
         idea_id: idea.idea_idea_0
         user_id: res_users_user1
+        
 - |
   I connect as Manager and  close this idea by click on "Close" button.
 -
@@ -100,4 +101,4 @@
 -
   !assert {model: idea.idea, id: idea_idea_0}: 
     - state == 'close'  
-    
\ No newline at end of file
+    
diff --git a/addons/idea/wizard/idea_post_vote.py b/addons/idea/wizard/idea_post_vote.py
index 73d917603a6..f68496c8ae5 100644
--- a/addons/idea/wizard/idea_post_vote.py
+++ b/addons/idea/wizard/idea_post_vote.py
@@ -93,19 +93,21 @@ class idea_post_vote(osv.osv_memory):
 
         for do_vote_obj in self.read(cr, uid, ids):
             score = str(do_vote_obj['vote'])
-            comment = do_vote_obj['note']
+            comment = do_vote_obj.get('note', False)
             vote = {
                 'idea_id': vote_id, 
                 'user_id': uid, 
                 'score': score
             }
-            comment = {
-                'user_id':uid,
-                'idea_id':vote_id,
-                'content': comment,
-            }
+            if comment:
+                comment = {
+                    'user_id':uid,
+                    'idea_id':vote_id,
+                    'content': comment,
+                }
+                comment = comment_pool.create(cr, uid, comment)
+                
             vote = vote_pool.create(cr, uid, vote)
-            comment = comment_pool.create(cr, uid, comment)
             return {}
 
 idea_post_vote()
diff --git a/addons/project/project.py b/addons/project/project.py
index 8bf8c6b118d..f96740219e5 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -550,12 +550,12 @@ class config_compute_remaining(osv.osv_memory):
         return False
 
     _columns = {
-        'remaining_hours' : fields.float('Remaining Hours', digits=(16,2), help="Re-estimated Time to change the remaining hours of the task"),
-            }
+        'remaining_hours' : fields.float('Remaining Hours', digits=(16,2), help="Put here the remaining hours required to close the task."),
+    }
 
     _defaults = {
         'remaining_hours': _get_remaining
-        }
+    }
 
     def compute_hours(self, cr, uid, ids, context=None):
         task_obj = self.pool.get('project.task')
diff --git a/addons/sale/i18n/pl.po b/addons/sale/i18n/pl.po
index 54f387c1bac..2016f908fe8 100644
--- a/addons/sale/i18n/pl.po
+++ b/addons/sale/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-18 05:15+0000\n"
+"X-Launchpad-Export-Date: 2010-05-19 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml
index 172d4b7605b..379dc66a4fd 100644
--- a/addons/scrum/scrum_view.xml
+++ b/addons/scrum/scrum_view.xml
@@ -40,9 +40,8 @@
                     <field name="sprint_id"/>
                     <field name="user_id"/>
                     <field name="progress" widget="progressbar"/>
-                    <field name="effective_hours" sum="Effective hours" widget="float_time"/>
-                    <field name="planned_hours" sum="Planned hours" widget="float_time"/>
                     <field name="expected_hours" sum="Expected hours" widget="float_time"/>
+                    <field name="effective_hours" sum="Effective hours" widget="float_time"/>
                     <field name="state"/>
                     <button type="object" string="Open" name="button_open" states="draft,pending" icon="gtk-jump-to"/>
                     <button type="action" string="Convert to Task" name="%(action_scrum_backlog_to_task)d" states="pending" icon="gtk-execute"/>
@@ -66,54 +65,47 @@
                         <field domain="[('project_id','=',project_id)]" name="sprint_id" select="1"/>
                         <field name="user_id" select="1"/>
                         <field name="sequence" groups="base.group_extended"/>
-           			    <field name="date"/>
+                           <field name="date"/>
                         <field name="progress" widget="progressbar"/>
-                      <!--  <group colspan="6" col="8">
-                            <field name="effective_hours" widget="float_time"/>
-                            <field name="planned_hours" widget="float_time"/>
-                            <field name="expected_hours" widget="float_time"/>
-                            <field name="progress" widget="progressbar"/>
-                        </group>-->
                     </group>
                     <notebook colspan="4">
                         <page string="Information">
-	                        <group colspan="6" col="8">
-	                            <field name="effective_hours" widget="float_time"/>
-	                            <field name="planned_hours" widget="float_time"/>
-	                            <field name="expected_hours" widget="float_time"/>
-	                        </group>
-	                        <separator string="Feature Description" colspan="4"/>
+                            <group colspan="6" col="8">
+                                <field name="expected_hours" widget="float_time"/>
+                                <field name="effective_hours" widget="float_time"/>
+                            </group>
+                            <separator string="Feature Description" colspan="4"/>
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
                         <page string="Tasks">
                             <field colspan="4" name="tasks_id" nolabel="1" widget="one2many_list" context="{'default_project_id':project_id, 'default_sprint_id':sprint_id, 'default_product_backlog_id':active_id}">
-            	                <tree colors="grey:state in ('cancelled','done');blue:remaining_hours&lt;0;red:bool(date_deadline) and (date_deadline&lt;current_date) and (state in ('draft','open'));black:state not in ('cancelled','done')" string="Tasks">
-					                    <field name="sequence" invisible="0"/>
-					                    <field name="name"/>
-					                    <field name="user_id"/>
-					                    <field name="delegated_user_id" invisible="context.get('show_delegated', True)"/>
-					                    <field name="planned_hours" widget="float_time" />
-					                    <field name="total_hours" widget="float_time"/>
-					                    <field name="remaining_hours" widget="float_time" sum="Remaining Hours" invisible="context.get('set_visible',False)"/>
-					                    <field name="date_deadline" invisible="context.get('set_visible',False)"/>
-					                    <field name="type" groups="base.group_extended" invisible="context.get('set_visible',False)"/>
-					                    <field name="date_start" invisible="1"/>
-					                    <field name="date_end" invisible="1"/>
-					                    <button name="next_type" invisible="context.get('set_visible',False)"
-					                        states="draft,open,pending"
-					                        string="Change Stage"
-					                        type="object"
-					                        icon="gtk-go-forward"
-					                        groups="base.group_extended"
-					                        help="Change Type"/>
-					                    <field name="progress" widget="progressbar" invisible="context.get('set_visible',False)"/>
-					                    <field name="state" invisible="context.get('set_visible',False)"/>
-					                    <button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
-					                    <button groups="base.group_extended" name="%(project.action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-execute" help="For changing to delegate state"/>
-					                    <button name="do_close" states="draft,pending,open" string="Done" type="object" icon="gtk-jump-to" help="For changing to done state"/>
-					                    <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
-				                </tree>
-				            </field>
+                                <tree colors="grey:state in ('cancelled','done');blue:remaining_hours&lt;0;red:bool(date_deadline) and (date_deadline&lt;current_date) and (state in ('draft','open'));black:state not in ('cancelled','done')" string="Tasks">
+                                        <field name="sequence" invisible="0"/>
+                                        <field name="name"/>
+                                        <field name="user_id"/>
+                                        <field name="delegated_user_id" invisible="context.get('show_delegated', True)"/>
+                                        <field name="planned_hours" widget="float_time" sum="Planned Hours"/>
+                                        <field name="total_hours" widget="float_time"/>
+                                        <field name="remaining_hours" widget="float_time" sum="Remaining Hours" invisible="context.get('set_visible',False)"/>
+                                        <field name="date_deadline" invisible="context.get('set_visible',False)"/>
+                                        <field name="type" groups="base.group_extended" invisible="context.get('set_visible',False)"/>
+                                        <field name="date_start" invisible="1"/>
+                                        <field name="date_end" invisible="1"/>
+                                        <button name="next_type" invisible="context.get('set_visible',False)"
+                                            states="draft,open,pending"
+                                            string="Change Stage"
+                                            type="object"
+                                            icon="gtk-go-forward"
+                                            groups="base.group_extended"
+                                            help="Change Type"/>
+                                        <field name="progress" widget="progressbar" invisible="context.get('set_visible',False)"/>
+                                        <field name="state" invisible="context.get('set_visible',False)"/>
+                                        <button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
+                                        <button groups="base.group_extended" name="%(project.action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-execute" help="For changing to delegate state"/>
+                                        <button name="do_close" states="draft,pending,open" string="Done" type="object" icon="gtk-jump-to" help="For changing to done state"/>
+                                        <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
+                                </tree>
+                            </field>
                         </page>
                     </notebook>
                     <group col="8" colspan="4">
@@ -148,14 +140,14 @@
                         <field name="name"/>
                         <field name="project_id" widget="selection"/>
                         <field name="sprint_id" widget="selection">
-                        	<filter icon="terp-project"
-                        		string="Sprints"
-                        		domain="[('sprint_id.state','=','open')]"
-                        		help="Backlogs Assigned To Current Sprints"/>
-                        	<filter icon="terp-project"
-                        		string="Sprints"
-                        		domain="[('sprint_id','=',False)]"
-                        		help="Backlogs Not Assigned To Sprints."/>
+                            <filter icon="terp-project"
+                                string="Sprints"
+                                domain="[('sprint_id.state','=','open')]"
+                                help="Backlogs Assigned To Current Sprints"/>
+                            <filter icon="terp-project"
+                                string="Sprints"
+                                domain="[('sprint_id','=',False)]"
+                                help="Backlogs Not Assigned To Sprints."/>
                         </field>
                         <field name="user_id" widget="selection">
                             <filter default="1"
@@ -222,10 +214,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Scrum Sprint">
-                	<group colspan="4" col="6">
-                    	<field name="name" select="1"/>
-                    	<field name="project_id" on_change="onchange_project_id(project_id)"/>
-                    	<field name="active"/>
+                    <group colspan="4" col="6">
+                        <field name="name" select="1"/>
+                        <field name="project_id" on_change="onchange_project_id(project_id)"/>
+                        <field name="active"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Sprint Info">
diff --git a/addons/scrum/wizard/scrum_backlog_create_task.py b/addons/scrum/wizard/scrum_backlog_create_task.py
index aad44634e63..fcade59bc2f 100644
--- a/addons/scrum/wizard/scrum_backlog_create_task.py
+++ b/addons/scrum/wizard/scrum_backlog_create_task.py
@@ -47,7 +47,7 @@ class backlog_create_task(osv.osv_memory):
                 'description': backlog.note,
                 'project_id': backlog.project_id.id,
                 'user_id': data['user_id'] or False,
-                'planned_hours': backlog.planned_hours,
+                'planned_hours': backlog.expected_hours,
                 'remaining_hours':backlog.expected_hours,
                 'sequence':backlog.sequence,
             }))
@@ -66,4 +66,4 @@ class backlog_create_task(osv.osv_memory):
 
 backlog_create_task()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/scrum/wizard/scrum_backlog_merger.py b/addons/scrum/wizard/scrum_backlog_merger.py
index 1a1ee79ba5b..9d204a70ad9 100644
--- a/addons/scrum/wizard/scrum_backlog_merger.py
+++ b/addons/scrum/wizard/scrum_backlog_merger.py
@@ -25,7 +25,7 @@ class scrum_backlog_merge(osv.osv_memory):
     _name = 'scrum.backlog.merge'
     _description = 'Merge Product Backlogs'
     _columns = {
-        'project_id': fields.many2one('project.project', 'Project', help="Select project for new product backlog"),
+        'project_id': fields.many2one('project.project', 'Project', help="Select project for the new product backlog"),
                }
 
     def check_backlogs(self, cr, uid, ids, context=None):
@@ -36,12 +36,11 @@ class scrum_backlog_merge(osv.osv_memory):
             context = {}
         #If only one product backlog selected for merging then show an exception
         if len(context['active_ids']) < 2:
-            raise osv.except_osv(_('Warning'),_('Please select at least two Product Backlogs'))
+            raise osv.except_osv(_('Warning'),_('Please select at least two product Backlogs'))
         #If any of the backlog state is done then it will show an exception
         for backlogs in backlog_obj.browse(cr, uid, context['active_ids'], context=context):
-            if backlogs.state == "done":
-                raise osv.except_osv(_('Warning'),_('Merging is not allowed for Product Backlogs with Done state'))
             p_list.append(backlogs.project_id.id)
+
         #For checking whether project id's are different or same.
         if len(set(p_list)) != 1:
             context.update({'scrum_projects': True})
@@ -63,9 +62,6 @@ class scrum_backlog_merge(osv.osv_memory):
         task_obj = self.pool.get('project.task')
         task_lines = []
         new_exp_hour = []
-        new_note = 'Merged Features :'
-        new_description = 'Merged Descriptions :'
-        count = 0
         if context is None:
             context = {}
         #This will check product backlog's project id if different then will accept a new id provided by the user.
@@ -78,24 +74,31 @@ class scrum_backlog_merge(osv.osv_memory):
             p_id = backlog_obj.read(cr, uid, context['active_id'], ['project_id'])
             new_project_id = p_id['project_id'][0]
         #To merge note and description of backlogs
+
+        new_note = ''
+        new_description = ''
         for backlogs in backlog_obj.browse(cr, uid, context['active_ids'], context=context):
-            count += 1
-            new_note += '\n' + str(count)+') ' + backlogs.name
-            new_description += '\n' + str(count)+') ' + (backlogs.note or backlogs.name or '')
+            if new_note:
+                new_note += ' + '
+                new_description += '\n\n'+('-'*50)+'\n'
+            new_note += backlogs.name
+            new_description += (backlogs.name or '') + '\n' + (backlogs.note or '')
+
             new_exp_hour.append(backlogs.expected_hours)
             for line in backlogs.tasks_id:
                 task_lines.append(line.id)
-        id_b = backlog_obj.create(cr, uid, {'name': 'Merged Product Backlogs', 'note': new_note + '\n\n' + new_description, 'project_id': new_project_id,
-                                            'expected_hours': round(max(new_exp_hour))
-                                            }, context=context)
+        id_b = backlog_obj.create(cr, uid, {
+            'name': new_note,
+            'note': new_description,
+            'project_id': new_project_id,
+            'expected_hours': round(max(new_exp_hour))
+        }, context=context)
+
         #To assing a new product backlog to merged tasks
-        for tasks in task_obj.browse(cr, uid, task_lines, context=context):
-            task_obj.copy(cr, uid, tasks.id, {'product_backlog_id': id_b})
-        # This is to change the status of the old product backlogs to done state
-        for backlogs in backlog_obj.browse(cr, uid, context['active_ids'], context=context):
-            backlog_obj.write(cr, uid, context['active_ids'], {'state':'done'}, context=context)
+        task_obj.write(cr, uid, task_lines, {'product_backlog_id': id_b})
+        backlog_obj.write(cr, uid, context['active_ids'], {'state':'done'}, context=context)
         return {}
 
 scrum_backlog_merge()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/scrum/wizard/scrum_backlog_merger_view.xml b/addons/scrum/wizard/scrum_backlog_merger_view.xml
index 3539d61166c..9e5a7d53a5f 100644
--- a/addons/scrum/wizard/scrum_backlog_merger_view.xml
+++ b/addons/scrum/wizard/scrum_backlog_merger_view.xml
@@ -1,43 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    	<record id="scrum_backlog_merge_view" model="ir.ui.view">
-            <field name="name">Merger Product Backlogs</field>
+        <record id="scrum_backlog_merge_view" model="ir.ui.view">
+            <field name="name">Merge Backlogs</field>
             <field name="model">scrum.backlog.merge</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                <form string="Merge Backlogs">
-               		<label colspan="4" string="This wizard merge backlogs and create one new backlog with draft state (Old backlogs state changed to Done). And it also merge old tasks from backlogs" />
-        			<separator string="Are you sure you want to merge these Backlogs?" colspan="4"/>
-					<button colspan="2" special="cancel" string="Cancel" icon="gtk-cancel"/>
-            	    <button colspan="2" default_focus="1" name="check_backlogs" string="Merge Backlogs" type="object" icon="gtk-execute"/>
-    			</form>
+                   <label colspan="4" string="This wizard merge backlogs and create one new backlog with draft state (Old backlogs state changed to Done). And it also merge old tasks from backlogs" />
+                   <separator string="Are you sure you want to merge these Backlogs?" colspan="4"/>
+                   <button colspan="2" special="cancel" string="Cancel" icon="gtk-cancel"/>
+                   <button colspan="2" default_focus="1" name="check_backlogs" string="Merge" type="object" icon="gtk-execute"/>
+               </form>
             </field>
-		</record>
+        </record>
 
-         <act_window name="Merge Product Backlogs"
-		    res_model="scrum.backlog.merge"
-		    src_model="scrum.product.backlog"
-		    view_mode="form"
-		    target="new"
+         <act_window name="Merge Backlogs"
+            res_model="scrum.backlog.merge"
+            src_model="scrum.product.backlog"
+            view_mode="form"
+            target="new"
             key2="client_action_multi"
-		    id="action_scrum_backlog_merge"/>
+            id="action_scrum_backlog_merge"/>
 
-    	<record id="scrum_merge_project_id_view" model="ir.ui.view">
-            <field name="name">Merger Backlogs</field>
+        <record id="scrum_merge_project_id_view" model="ir.ui.view">
+            <field name="name">Merge Backlogs</field>
             <field name="model">scrum.backlog.merge</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                <form string="Merge Backlogs">
-               		<separator string="Select the Project" colspan="4"/>
-               		<field name="project_id"/>
-        			<separator colspan="4"/>
-					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-            	    <button name="do_merge" string="Merge Backlogs" type="object" icon="gtk-execute"/>
-    			</form>
+                       <separator string="Select the Project" colspan="4"/>
+                       <field name="project_id"/>
+                    <separator colspan="4"/>
+                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                    <button name="do_merge" string="Merge Backlogs" type="object" icon="gtk-execute"/>
+                </form>
             </field>
-		</record>
+        </record>
 
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/stock/i18n/ca.po b/addons/stock/i18n/ca.po
index a48c0569f95..a0eb329b4e2 100644
--- a/addons/stock/i18n/ca.po
+++ b/addons/stock/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: 2009-12-31 12:47+0000\n"
-"Last-Translator: Albert Cervera i Areny - http://www.NaN-tic.com <albert@nan-"
-"tic.com>\n"
+"PO-Revision-Date: 2010-05-18 13:12+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-17 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-05-19 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
@@ -115,13 +115,13 @@ msgstr "Import"
 #. module: stock
 #: view:stock.picking:0
 msgid "Products Received"
-msgstr "Productes rebuts"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree4
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree4
 msgid "Incoming Products"
-msgstr "Productes entrants"
+msgstr ""
 
 #. module: stock
 #: field:stock.picking,name:0
@@ -268,7 +268,7 @@ msgstr "STOCK_GOTO_FIRST"
 #: model:ir.actions.act_window,name:stock.action_picking_tree6
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree6
 msgid "Internal Moves"
-msgstr "Moviments interns"
+msgstr "Albarans interns"
 
 #. module: stock
 #: field:stock.move,product_packaging:0
@@ -1432,7 +1432,7 @@ msgstr "Data prevista"
 #: model:ir.actions.act_window,name:stock.action_picking_tree
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree
 msgid "Outgoing Products"
-msgstr "Productes sortints"
+msgstr "Albarans de sortida"
 
 #. module: stock
 #: selection:stock.location,icon:0
diff --git a/addons/stock/i18n/es.po b/addons/stock/i18n/es.po
index 3673eeebe69..563a23a48e9 100644
--- a/addons/stock/i18n/es.po
+++ b/addons/stock/i18n/es.po
@@ -7,13 +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-29 11:22+0000\n"
-"Last-Translator: Shay <Unknown>\n"
+"PO-Revision-Date: 2010-05-18 13:11+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-05-05 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-05-19 05:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
@@ -120,7 +121,7 @@ msgstr "Productos recibidos"
 #: model:ir.actions.act_window,name:stock.action_picking_tree4
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree4
 msgid "Incoming Products"
-msgstr "Productos entrantes"
+msgstr "Albaranes de entrada"
 
 #. module: stock
 #: field:stock.picking,name:0
@@ -267,7 +268,7 @@ msgstr "STOCK_GOTO_FIRST"
 #: model:ir.actions.act_window,name:stock.action_picking_tree6
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree6
 msgid "Internal Moves"
-msgstr "Movimientos internos"
+msgstr "Albaranes internos"
 
 #. module: stock
 #: field:stock.move,product_packaging:0
@@ -1448,7 +1449,7 @@ msgstr "Fecha prevista"
 #: model:ir.actions.act_window,name:stock.action_picking_tree
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree
 msgid "Outgoing Products"
-msgstr "Productos salientes"
+msgstr "Albaranes de salida"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -2287,8 +2288,8 @@ msgid ""
 "Scheduled date for the movement of the products or real date if the move is "
 "done."
 msgstr ""
-"Fecha fijada para el movimiento de productos o fecha real si el movimiento "
-"ha sido realizado"
+"Fecha programada para el movimiento de productos o fecha real si el "
+"movimiento ha sido realizado."
 
 #. module: stock
 #: view:stock.picking:0