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

bzr revid: jam@tinyerp.com-20101229085843-w7ja82h0kz493wiq
2010-12-29 14:28:43 +05:30 · 2010-12-29 14:28:43 +05:30 · 3ce76c075a
parent 53a8f58b42 628debcf9b
commit 3ce76c075a
467 changed files with 4732 additions and 1627 deletions
--- a/addons/account/account.py
+++ b/addons/account/account.py
@ -204,7 +204,7 @@ class account_account(osv.osv):
                args[pos] = ('id', 'in', ids1)
            pos += 1

-        if context and context.has_key('consolidate_childs'): #add consolidated childs of accounts
+        if context and context.has_key('consolidate_children'): #add consolidated children of accounts
            ids = super(account_account, self).search(cr, uid, args, offset, limit,
                order, context=context, count=count)
            for consolidate_child in self.browse(cr, uid, context['account_id'], context=context).child_consol_ids:
@ -285,6 +285,7 @@ class account_account(osv.osv):
            children_and_consolidated.reverse()
            brs = list(self.browse(cr, uid, children_and_consolidated, context=context))
            sums = {}
+            currency_obj = self.pool.get('res.currency')
            while brs:
                current = brs[0]
 #                can_compute = True
@ -299,8 +300,11 @@ class account_account(osv.osv):
                brs.pop(0)
                for fn in field_names:
                    sums.setdefault(current.id, {})[fn] = accounts.get(current.id, {}).get(fn, 0.0)
-                    if current.child_id:
-                        sums[current.id][fn] += sum(sums[child.id][fn] for child in current.child_id)
+                    for child in current.child_id:
+                        if child.company_id.currency_id.id == current.company_id.currency_id.id:
+                            sums[current.id][fn] += sums[child.id][fn]
+                        else:
+                            sums[current.id][fn] += currency_obj.compute(cr, uid, child.company_id.currency_id.id, current.company_id.currency_id.id, sums[child.id][fn], context=context)
            res = {}
            null_result = dict((fn, 0.0) for fn in field_names)
            for id in ids:
@ -607,8 +611,8 @@ class account_journal(osv.osv):
    }

    _defaults = {
-        'user_id': lambda self,cr,uid,context: uid,
-        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
+        'user_id': lambda self, cr, uid, context: uid,
+        'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
    }
    _sql_constraints = [
        ('code_company_uniq', 'unique (code, company_id)', 'The code of the journal must be unique per company !'),
@ -708,7 +712,6 @@ class account_journal(osv.osv):

        return self.name_get(cr, user, ids, context=context)

-
    def onchange_type(self, cr, uid, ids, type, currency, context=None):
        obj_data = self.pool.get('ir.model.data')
        user_pool = self.pool.get('res.users')
@ -1278,6 +1281,8 @@ class account_move(osv.osv):
        return super(account_move, self).copy(cr, uid, id, default, context)

    def unlink(self, cr, uid, ids, context=None, check=True):
+        if context is None:
+            context = {}
        toremove = []
        obj_move_line = self.pool.get('account.move.line')
        for move in self.browse(cr, uid, ids, context=context):
@ -1916,7 +1921,7 @@ class account_tax(osv.osv):
        RETURN:
            [ tax ]
            tax = {'name':'', 'amount':0.0, 'account_collected_id':1, 'account_paid_id':2}
-            one tax for each tax id in IDS and their childs
+            one tax for each tax id in IDS and their children
        """
        res = self._unit_compute(cr, uid, taxes, price_unit, address_id, product, partner, quantity)
        total = 0.0
@ -2011,7 +2016,7 @@ class account_tax(osv.osv):
        RETURN:
            [ tax ]
            tax = {'name':'', 'amount':0.0, 'account_collected_id':1, 'account_paid_id':2}
-            one tax for each tax id in IDS and their childs
+            one tax for each tax id in IDS and their children
        """
        res = self._unit_compute_inv(cr, uid, taxes, price_unit, address_id, product, partner=None)
        total = 0.0
@ -2611,11 +2616,12 @@ class wizard_multi_charts_accounts(osv.osv_memory):
        cr.execute("SELECT company_id FROM account_account WHERE active = 't' AND account_account.parent_id IS NULL AND name != %s", ("Chart For Automated Tests",))
        configured_cmp = [r[0] for r in cr.fetchall()]
        unconfigured_cmp = list(set(company_ids)-set(configured_cmp))
-        if unconfigured_cmp:
-            cmp_select = [(line.id, line.name) for line in self.pool.get('res.company').browse(cr, uid, unconfigured_cmp)]
-            for field in res['fields']:
-               if field == 'company_id':
-                   res['fields'][field]['domain'] = unconfigured_cmp
+        for field in res['fields']:
+           if field == 'company_id':
+               res['fields'][field]['domain'] = unconfigured_cmp
+               res['fields'][field]['selection'] = [('', '')]
+               if unconfigured_cmp:
+                   cmp_select = [(line.id, line.name) for line in self.pool.get('res.company').browse(cr, uid, unconfigured_cmp)]
                   res['fields'][field]['selection'] = cmp_select
        return res

--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@ -50,11 +50,10 @@ class account_analytic_line(osv.osv):
        if context is None:
            context = {}
        if context.get('from_date',False):
-            args.append(['date', '>=',context['from_date']])
+            args.append(['date', '>=', context['from_date']])

        if context.get('to_date',False):
-            args.append(['date','<=',context['to_date']])
-
+            args.append(['date','<=', context['to_date']])
        return super(account_analytic_line, self).search(cr, uid, args, offset, limit,
                order, context=context, count=count)

@ -158,4 +157,4 @@ class res_partner(osv.osv):

 res_partner()

-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
--- a/addons/account/account_end_fy.xml
+++ b/addons/account/account_end_fy.xml
@ -14,7 +14,7 @@
            action="action_account_period_tree"
            id="menu_action_account_period_close_tree"
            parent="account.menu_account_end_year_treatments"
-            sequence="0" groups="base.group_extended,group_account_manager,group_account_user"/>
+            sequence="0" groups="base.group_extended"/>
        
    </data>
 </openerp>
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@ -26,14 +26,19 @@
        <menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration"/>
        <menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration" groups="analytic.group_analytic_accounting"/>
        <menuitem id="menu_analytic" parent="menu_analytic_accounting" name="Accounts" groups="analytic.group_analytic_accounting"/>
-        <menuitem id="menu_journals" sequence="9" name="Journals" parent="menu_finance_accounting" groups="base.group_extended,group_account_manager"/>
-        <menuitem id="menu_configuration_misc" name="Miscellaneous" parent="menu_finance_configuration" sequence="30" groups="group_account_manager"/>
+        <menuitem id="menu_journals" sequence="9" name="Journals" parent="menu_finance_accounting" groups="group_account_manager"/>
+        <menuitem id="menu_configuration_misc" name="Miscellaneous" parent="menu_finance_configuration" sequence="30"/>
        <menuitem id="base.menu_action_currency_form" parent="menu_configuration_misc" sequence="20"/>
        <menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="menu_finance_reporting" sequence="100"/>
        <menuitem id="menu_finance_entries" name="Journal Entries" parent="menu_finance" sequence="5" groups="group_account_user,group_account_manager"/>
-        <menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries" parent="menu_finance_periodical_processing" sequence="15" groups="base.group_extended,group_account_manager,group_account_user"/>

-        <menuitem id="menu_account_end_year_treatments" name="End of Period" parent="menu_finance_periodical_processing" groups="group_account_manager,group_account_user" sequence="25"/>
+        <menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries"
+            parent="menu_finance_periodical_processing" sequence="15"
+            groups="base.group_extended"/>
+
+        <menuitem id="menu_account_end_year_treatments"
+            name="End of Period" parent="menu_finance_periodical_processing"
+            sequence="25"/>
        <menuitem id="menu_finance_periodical_processing_billing" name="Billing" parent="menu_finance_periodical_processing" sequence="35"/>

        <menuitem id="menu_finance_statistic_report_statement" name="Statistic Reports" parent="menu_finance_reporting" sequence="300"/>
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@ -309,7 +309,7 @@ class account_move_line(osv.osv):
            context = {}
        c = context.copy()
        c['initital_bal'] = True
-        sql = """SELECT l2.id, SUM(l1.debit-l1.credit) 
+        sql = """SELECT l2.id, SUM(l1.debit-l1.credit)
                    FROM account_move_line l1, account_move_line l2
                    WHERE l2.account_id = l1.account_id
                      AND l1.id <= l2.id
@ -318,8 +318,7 @@ class account_move_line(osv.osv):
                " GROUP BY l2.id"

        cr.execute(sql, [tuple(ids)])
-        res = dict(cr.fetchall())
-        return res
+        return dict(cr.fetchall())

    def _invoice(self, cursor, user, ids, name, arg, context=None):
        invoice_obj = self.pool.get('account.invoice')
@ -887,7 +886,7 @@ class account_move_line(osv.osv):
        fld = []
        fields = {}
        flds = []
-        title = "Accounting Entries" #self.view_header_get(cr, uid, view_id, view_type, context)
+        title = _("Accounting Entries") #self.view_header_get(cr, uid, view_id, view_type, context)
        xml = '''<?xml version="1.0"?>\n<tree string="%s" editable="top" refresh="5" on_write="on_create_write" colors="red:state==\'draft\';black:state==\'valid\'">\n\t''' % (title)

        ids = journal_pool.search(cr, uid, [])
@ -906,8 +905,8 @@ class account_move_line(osv.osv):
                else:
                    fields.get(field.field).append(journal.id)
                    common_fields[field.field] = common_fields[field.field] + 1
-        fld.append(('period_id', 3, 'Period'))
-        fld.append(('journal_id', 10, 'Journal'))
+        fld.append(('period_id', 3, _('Period')))
+        fld.append(('journal_id', 10, _('Journal')))
        flds.append('period_id')
        flds.append('journal_id')
        fields['period_id'] = all_journal
@ -927,10 +926,10 @@ class account_move_line(osv.osv):
 #                state = 'colors="red:state==\'draft\'"'
            attrs = []
            if field == 'debit':
-                attrs.append('sum = "Total debit"')
+                attrs.append('sum = "%s"' % _("Total debit"))

            elif field == 'credit':
-                attrs.append('sum = "Total credit"')
+                attrs.append('sum = "%s"' % _("Total credit"))

            elif field == 'move_id':
                attrs.append('required = "False"')
@ -1284,4 +1283,4 @@ class account_move_line(osv.osv):

 account_move_line()

-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@ -276,6 +276,7 @@
                    <field name="company_currency_id"/>
                    <field name="company_id" groups="base.group_multi_company"/>
                    <field name="type"/>
+                    <field name="parent_id" invisible="1"/>
                </tree>
            </field>
        </record>
@ -762,7 +763,7 @@
            <field name="search_view_id" ref="view_account_type_search"/>
            <field name="help">An account type is used to determine how an account is used in each journal. The deferral method of an account type determines the process for the annual closing. Reports such as the Balance Sheet and the Profit and Loss report use the category (profit/loss or balance sheet). For example, the account type could be linked to an asset account, expense account or payable account. From this view, you can create and manage the account types you need for your company.</field>
        </record>
-        <menuitem action="action_account_type_form" groups="base.group_extended,group_account_manager" sequence="6" id="menu_action_account_type_form" parent="account_account_menu"/>
+        <menuitem action="action_account_type_form" sequence="6" id="menu_action_account_type_form" parent="account_account_menu"/>
        <!--
    Entries
    -->
@ -1227,7 +1228,7 @@
            id="menu_action_account_moves_all"
            parent="account.menu_finance_entries"
            sequence="1"
-            groups="group_account_user,group_account_manager"
+            groups="group_account_user"
        />

        <record id="action_move_line_select" model="ir.actions.act_window">
@ -1475,7 +1476,7 @@
            action="action_move_journal_line"
            id="menu_action_move_journal_line_form"
            parent="account.menu_finance_entries"
-            groups="group_account_user,group_account_manager"
+            groups="group_account_user"
            sequence="5"/>

        <record id="action_move_line_form" model="ir.actions.act_window">
@ -1742,7 +1743,7 @@
        </record>
        <menuitem
            action="action_model_form" id="menu_action_model_form" sequence="5"
-            parent="account.menu_configuration_misc" groups="base.group_extended,group_account_manager"/>
+            parent="account.menu_configuration_misc" groups="base.group_extended"/>

        <!--
            # Payment Terms
@ -1842,8 +1843,7 @@
            <field name="search_view_id" ref="view_payment_term_search"/>
        </record>
        <menuitem action="action_payment_term_form"
-            id="menu_action_payment_term_form" parent="menu_configuration_misc"
-            groups="group_account_manager"/>
+            id="menu_action_payment_term_form" parent="menu_configuration_misc"/>

        <!--
        # Account Subscriptions
@ -1958,7 +1958,7 @@
        </record>
        <menuitem
            name="Define Recurring Entries" action="action_subscription_form"
-            groups="base.group_extended,group_account_manager,group_account_user"
+            groups="base.group_extended"
            id="menu_action_subscription_form" sequence="1"
            parent="account.menu_finance_recurrent_entries"/>

@ -2063,7 +2063,7 @@

        <act_window context="{'search_default_reconcile_id':False, 'search_default_partner_id':[active_id]}" domain="[('account_id.reconcile', '=', True),('account_id.type', 'in', ['receivable', 'payable'])]" id="act_account_partner_account_move_all" name="Receivables &amp; Payables" res_model="account.move.line" src_model="res.partner" groups="base.group_extended"/>

-        <act_window context="{'search_default_partner_id':[active_id]}" id="act_account_partner_account_move" name="Journal Items" res_model="account.move.line" src_model="res.partner"/>
+        <act_window context="{'search_default_partner_id':[active_id]}" id="act_account_partner_account_move" name="Journal Items" res_model="account.move.line" src_model="res.partner" groups="account.group_account_user"/>

        <record id="view_account_addtmpl_wizard_form" model="ir.ui.view">
            <field name="name">Create Account</field>
@ -2095,17 +2095,17 @@
            id="account_template_folder"
            name="Templates"
            parent="menu_finance_accounting"
-            groups="base.group_multi_company,group_account_manager"/>
+            groups="base.group_multi_company"/>
        <menuitem
            id="account_template_taxes"
            name="Taxes"
            parent="account_template_folder"
-            groups="base.group_multi_company,group_account_manager" sequence="2"/>
+            sequence="2"/>
        <menuitem
            id="account_template_accounts"
            name="Accounts"
            parent="account_template_folder"
-            groups="base.group_multi_company,group_account_manager" sequence="1"/>
+            sequence="1"/>


        <record id="view_account_template_form" model="ir.ui.view">
@ -2751,8 +2751,8 @@ action = self.pool.get('res.config').next(cr, uid, [], context)
            <field name="view_id" ref="account_cash_statement_graph"/>
            <field name="act_window_id" ref="action_view_bank_statement_tree"/>
        </record>
-        <menuitem action="action_view_bank_statement_tree" id="journal_cash_move_lines" parent="menu_finance_bank_and_cash"
-            groups="group_account_user,group_account_manager"/>
+        <menuitem action="action_view_bank_statement_tree" id="journal_cash_move_lines"
+            parent="menu_finance_bank_and_cash"/>

        <record id="action_partner_all" model="ir.actions.act_window">
            <field name="name">Partners</field>
--- a/addons/account/i18n/account.pot
+++ b/addons/account/i18n/account.pot
@ -7426,7 +7426,7 @@ msgstr ""

 #. module: account
 #: help:account.bs.report,reserve_account_id:0
-msgid "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"
+msgid "This Account is used for transferring Profit/Loss(If It is Profit: Amount will be added, Loss : Amount will be duducted.), Which is calculated from Profilt & Loss Report"
 msgstr ""

 #. module: account
--- a/addons/account/i18n/ar.po
+++ b/addons/account/i18n/ar.po
@ -7845,7 +7845,7 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/bg.po
+++ b/addons/account/i18n/bg.po
@ -7876,7 +7876,7 @@ msgstr "Вид отпратка"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/br.po
+++ b/addons/account/i18n/br.po
@ -7843,7 +7843,7 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/bs.po
+++ b/addons/account/i18n/bs.po
@ -7900,7 +7900,7 @@ msgstr "Tip reference"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/ca.po
+++ b/addons/account/i18n/ca.po
@ -7935,7 +7935,7 @@ msgstr "Tipus referència"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/cs.po
+++ b/addons/account/i18n/cs.po
@ -7842,7 +7842,7 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/da.po
+++ b/addons/account/i18n/da.po
@ -7862,7 +7862,7 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@ -8408,7 +8408,7 @@ msgstr "Referenztyp"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/el.po
+++ b/addons/account/i18n/el.po
@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-25 22:00+0000\n"
+"PO-Revision-Date: 2010-12-27 14:04+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-26 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account
@ -962,7 +962,7 @@ msgstr ""
 #. module: account
 #: model:process.node,note:account.process_node_accountingstatemententries0
 msgid "Bank statement"
-msgstr ""
+msgstr "Κατάσταση κίνησης λογ. τραπέζης"

 #. module: account
 #: field:account.analytic.line,move_id:0
@ -1067,7 +1067,7 @@ msgstr ""
 #. module: account
 #: view:account.tax:0
 msgid "Applicability Options"
-msgstr ""
+msgstr "Επιλογές Προσαρμοστικότητας"

 #. module: account
 #: report:account.partner.balance:0
@ -1078,7 +1078,7 @@ msgstr "Με διαφορές"
 #: model:ir.actions.act_window,name:account.action_view_bank_statement_tree
 #: model:ir.ui.menu,name:account.journal_cash_move_lines
 msgid "Cash Registers"
-msgstr ""
+msgstr "Ταμειακές Μηχανές"

 #. module: account
 #: selection:account.account.type,report_type:0
@ -1219,7 +1219,7 @@ msgstr "Λογαριασμός"
 #. module: account
 #: field:account.tax,include_base_amount:0
 msgid "Included in base amount"
-msgstr ""
+msgstr "Περιλαμβάνεται στην τιμή βάσης"

 #. module: account
 #: view:account.entries.report:0
@ -1262,7 +1262,7 @@ msgstr "Πρότυπα για Λογαριασμούς"
 #. module: account
 #: view:account.tax.code.template:0
 msgid "Search tax template"
-msgstr ""
+msgstr "Αναζήτηση προτύπου φόρου"

 #. module: account
 #: view:account.move.reconcile:0
@ -1302,7 +1302,7 @@ msgstr "Επιλογές Αναφοράς"
 #. module: account
 #: model:ir.model,name:account.model_account_entries_report
 msgid "Journal Items Analysis"
-msgstr ""
+msgstr "Ανάλυση Στοιχείων Ημερολογίου"

 #. module: account
 #: model:ir.actions.act_window,name:account.action_partner_all
@ -1392,7 +1392,7 @@ msgstr "# ψηφίων"
 #. module: account
 #: field:account.journal,entry_posted:0
 msgid "Skip 'Draft' State for Manual Entries"
-msgstr ""
+msgstr "Παράβλεψη κατάστασης 'Πρόχειρου' για Χειροκίνητες Έισαγωγές"

 #. module: account
 #: view:account.bank.statement:0
@ -1435,6 +1435,9 @@ msgid ""
 "The payment term defined gives a computed amount greater than the total "
 "invoiced amount."
 msgstr ""
+"Δεν μπορεί να δημιουργηθεί τιμολόγιο !\n"
+"Ο όρος πληρωμής που ορίζεται δίνει υπολογιζόμενο ποσό μεγαλύτερο από το "
+"συνολικό ποσό τιμολόγισης."

 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree1
@ -1636,7 +1639,7 @@ msgstr "Εκτύπωση παραστατικού"
 #. module: account
 #: view:account.change.currency:0
 msgid "This wizard will change the currency of the invoice"
-msgstr ""
+msgstr "Ο οδηγός θα αλλάξει το νόμισμα στο τιμολόγιο"

 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_chart
@ -1655,7 +1658,7 @@ msgstr ""
 #: code:addons/account/account_move_line.py:0
 #, python-format
 msgid "The account is not defined to be reconciled !"
-msgstr ""
+msgstr "Ο λογαριασμός δεν ορίζεται για συμψηφισμό !"

 #. module: account
 #: field:account.cashbox.line,pieces:0
@ -7963,7 +7966,7 @@ msgstr "Τύπος Παραπομπής"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
@ -9603,7 +9606,7 @@ msgstr "Τραπεζικός Λογαριασμός"
 #: model:ir.actions.act_window,name:account.action_account_central_journal
 #: model:ir.model,name:account.model_account_central_journal
 msgid "Account Central Journal"
-msgstr ""
+msgstr "Κεντρικό Ημερολόγιο Λογαριασμού"

 #. module: account
 #: report:account.overdue:0
--- a/addons/account/i18n/es.po
+++ b/addons/account/i18n/es.po
@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-26 23:05+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-27 10:40+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@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-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account
@ -2370,6 +2369,13 @@ msgid ""
 "useful because it enables you to preview at any time the tax that you owe at "
 "the start and end of the month or quarter."
 msgstr ""
+"Este menú imprime una declaración de IVA basada en facturas o pagos. "
+"Seleccione uno o varios periodos del ejercicio fiscal. La información "
+"necesaria para la declaración de IVA es generada automáticamente por OpenERP "
+"a partir de las facturas (o pagos, en algunos países). Esta información se "
+"actualiza en tiempo real. Es muy útil porque le permite previsualizar en "
+"cualquier momento los impuestos que debe al principio y fin del mes o "
+"trimestre."

 #. module: account
 #: selection:account.move.line,centralisation:0
@ -3077,6 +3083,15 @@ msgid ""
 " 'Unreconciled' will copy only the journal items that were unreconciled on "
 "the first day of the new fiscal year."
 msgstr ""
+"Establezca aquí el método que se usará, el asistente genérico, para crear el "
+"asiento de cierre de ejercicio para todas las cuentas de este tipo.\n"
+"\n"
+" 'Ninguno' significa que no se hará nada.\n"
+" 'Saldo' normalmente se usará para cuentas de efectivo.\n"
+" 'Detallado' copiará cada apunte del ejercicio anterior, incluso los no "
+"conciliados.\n"
+" 'Sin conciliar' copiará sólo los apuntes aun no conciliados el primer día "
+"del nuevo ejercicio fiscal."

 #. module: account
 #: view:account.tax:0
@ -5677,6 +5692,12 @@ msgid ""
 "all lines of your statement. When you are in the Payment column of the a "
 "line, you can press F1 to open the reconciliation form."
 msgstr ""
+"Un extracto bancario es un resumen de todas las transacciones financieras "
+"ocurridas durante un periodo determinado de tiempo en una cuenta bancaria, "
+"tarjeta de crédito o cualquier otro tipo de cuenta. Comience introduciendo "
+"el saldo de apertura y cierre, y luego introduzca todas las lineas de su "
+"extracto. Situándose en la columna Pago de una línea, puede pulsar F1 para "
+"abrir el formulario de conciliación."

 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
@ -6400,6 +6421,11 @@ msgid ""
 "reconcile in a series of accounts. It finds entries for each partner where "
 "the amounts correspond."
 msgstr ""
+"Para que una factura se considere pagada, los apuntes contables de la "
+"factura deben estar conciliados con sus contrapartidas, normalmente pagos. "
+"Con la funcionalidad de reconciliación automática, OpenERP realiza su propia "
+"búsqueda de apuntes a conciliar en una serie de cuentas. Encuentra los "
+"apuntes, para cada tercero, donde las cantidades se correspondan."

 #. module: account
 #: view:account.move:0
@ -6533,6 +6559,9 @@ msgid ""
 "Account Voucher module includes all the basic requirements of Voucher "
 "Entries for Bank, Cash, Sales, Purchase, Expenses, Contra, etc... "
 msgstr ""
+"El módulo de recibos (justificantes) contables incluye todos los requisitos "
+"básicos de justificantes bancarios, de caja, ventas, compras, gastos, "
+"contrapartidas, etc... "

 #. module: account
 #: view:account.chart.template:0
@ -6733,6 +6762,13 @@ msgid ""
 "Most of the OpenERP operations (invoices, timesheets, expenses, etc) "
 "generate analytic entries on the related account."
 msgstr ""
+"El plan de cuentas normales tiene una estructura predefinida por los "
+"requisitos legales del país. La estructura del plan de cuentas analíticas "
+"debería reflejar las necesidades de su negocio de cara al análisis de costes "
+"e ingresos. Por lo general se estructuran por contratos, proyectos, "
+"productos o departamentos. La mayoría de las operaciones de OpenERP "
+"(facturas, hojas de servicio, gastos, etc) generan asientos analíticos en la "
+"cuenta asociada."

 #. module: account
 #: field:account.analytic.journal,line_ids:0
@ -6807,6 +6843,26 @@ msgid ""
 "module named account_voucher.\n"
 "    "
 msgstr ""
+"Módulo financiero y contable que cubre:\n"
+"    Contabilidad general\n"
+"    Contabilidad analítica / de costes\n"
+"    Gestión de terceros\n"
+"    Gestión de impuestos\n"
+"    Presupuestos\n"
+"    Facturación de clientes y proveedores\n"
+"    Extractos bancarios\n"
+"    Conciliación por tercero\n"
+"    Crea un cuadro de mandos para contables que incluye:\n"
+"    * Lista de presupuestos sin facturar\n"
+"    * Gráfica de cuentas vencidas a cobrar\n"
+"    * Gráfica de efectos a cobrar\n"
+"\n"
+"Los procesos, como el mantenimiento del libro mayor se realizan a través de "
+"los diarios financieros definidos\n"
+"(los asientos se agrupan por diario) para un ejercicio fiscal determinado; y "
+"para la preparación de recibos \n"
+"existe un módulo llamado account_voucher.\n"
+"    "

 #. module: account
 #: report:account.invoice:0
@ -8250,7 +8306,7 @@ msgstr "Tipo de referencia"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
@ -8395,6 +8451,10 @@ msgid ""
 "depending on the country and sometimes industry sector. OpenERP allows you "
 "to define and manage them from this menu."
 msgstr ""
+"Un código de impuesto es una referencia al tipo impositivo a aplicar sobre "
+"la base imponible (o descontar sobre el bruto) dependiente del país y a "
+"veces del sector industrial. OpenERP le permite definirlos y gestionarlos "
+"desde este menú."

 #. module: account
 #: report:account.overdue:0
@ -8416,6 +8476,12 @@ msgid ""
 "accounts of a company are required by law to disclose a certain amount of "
 "information. They have to be certified by an external auditor yearly."
 msgstr ""
+"Cree y gestione las cuentas que necesite para registrar los asientos "
+"financieros. Las cuentas son registros de su compañía para apuntar todas las "
+"transacciones financieras. Las compañías resumen sus cuentas anuales en dos "
+"informes principales: el balance y el informe de pérdidas y ganancias. "
+"Habitualmente la presentación de las cuentas anuales es una exigencia legal, "
+"y en algunos países deben ser certificadas anualmente por un auditor externo."

 #. module: account
 #: code:addons/account/account.py:0
@ -9669,7 +9735,7 @@ msgstr "Imprimir diarios analíticos"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Fin.Account"
-msgstr ""
+msgstr "Cuenta fin."

 #. module: account
 #: model:ir.actions.act_window,name:account.action_aged_receivable_graph
--- a/addons/account/i18n/es_AR.po
+++ b/addons/account/i18n/es_AR.po
@ -7937,7 +7937,7 @@ msgstr "Tipo de referencia"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/es_EC.po
+++ b/addons/account/i18n/es_EC.po
@ -8249,11 +8249,11 @@ msgstr "Tipo de referencia"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"

--- a/addons/account/i18n/et.po
+++ b/addons/account/i18n/et.po
@ -7843,7 +7843,7 @@ msgstr "Viite tüüp"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/eu.po
+++ b/addons/account/i18n/eu.po
@ -7843,7 +7843,7 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/fa.po
+++ b/addons/account/i18n/fa.po
@ -7843,7 +7843,7 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/fi.po
+++ b/addons/account/i18n/fi.po
@ -7907,7 +7907,7 @@ msgstr "Viitetyyppi"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/fr.po
+++ b/addons/account/i18n/fr.po
@ -8353,7 +8353,7 @@ msgstr "Type de référence"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/gl.po
+++ b/addons/account/i18n/gl.po
@ -7843,7 +7843,7 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/gu.po
+++ b/addons/account/i18n/gu.po
@ -7843,7 +7843,7 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/he.po
+++ b/addons/account/i18n/he.po
@ -7843,7 +7843,7 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/hi.po
+++ b/addons/account/i18n/hi.po
@ -7844,7 +7844,7 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/hr.po
+++ b/addons/account/i18n/hr.po
@ -7872,7 +7872,7 @@ msgstr "Tip veze"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/hu.po
+++ b/addons/account/i18n/hu.po
@ -7846,7 +7846,7 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/id.po
+++ b/addons/account/i18n/id.po
@ -7847,7 +7847,7 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-26 20:22+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2010-12-27 07:54+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-27 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account
@ -8139,7 +8139,7 @@ msgstr "Tipo riferimento"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/kab.po
+++ b/addons/account/i18n/kab.po
@ -7843,7 +7843,7 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/ko.po
+++ b/addons/account/i18n/ko.po
@ -7843,7 +7843,7 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/lt.po
+++ b/addons/account/i18n/lt.po
@ -7886,7 +7886,7 @@ msgstr "Nuorodos tipas"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/lv.po
+++ b/addons/account/i18n/lv.po
@ -7855,7 +7855,7 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/mn.po
+++ b/addons/account/i18n/mn.po
@ -8039,7 +8039,7 @@ msgstr "Дугаарлалтын төрөл"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/nb.po
+++ b/addons/account/i18n/nb.po
@ -7843,7 +7843,7 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/nl.po
+++ b/addons/account/i18n/nl.po
@ -7968,7 +7968,7 @@ msgstr "Referentietype"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/nl_BE.po
+++ b/addons/account/i18n/nl_BE.po
@ -7874,7 +7874,7 @@ msgstr "Referentietype"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/oc.po
+++ b/addons/account/i18n/oc.po
@ -7843,7 +7843,7 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/pl.po
+++ b/addons/account/i18n/pl.po
@ -7970,7 +7970,7 @@ msgstr "Typ odnośnika"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/pt.po
+++ b/addons/account/i18n/pt.po
@ -7985,7 +7985,7 @@ msgstr "Tipo de referência"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/pt_BR.po
+++ b/addons/account/i18n/pt_BR.po
@ -7938,7 +7938,7 @@ msgstr "Tipo de referência"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/ro.po
+++ b/addons/account/i18n/ro.po
@ -7919,7 +7919,7 @@ msgstr "Tipul referinţei"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.po
@ -7897,7 +7897,7 @@ msgstr "Тип ссылки"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/si.po
+++ b/addons/account/i18n/si.po
@ -7843,7 +7843,7 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/sk.po
+++ b/addons/account/i18n/sk.po
@ -7846,7 +7846,7 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/sl.po
+++ b/addons/account/i18n/sl.po
@ -7864,7 +7864,7 @@ msgstr "Vrsta sklica"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/sq.po
+++ b/addons/account/i18n/sq.po
@ -7859,7 +7859,7 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/sr.po
+++ b/addons/account/i18n/sr.po
@ -7901,7 +7901,7 @@ msgstr "Tip reference"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/sr@latin.po
+++ b/addons/account/i18n/sr@latin.po
@ -7901,7 +7901,7 @@ msgstr "Tip reference"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/sv.po
+++ b/addons/account/i18n/sv.po
@ -7946,7 +7946,7 @@ msgstr "Referenstyp"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/ta.po
+++ b/addons/account/i18n/ta.po
@ -7843,7 +7843,7 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/te.po
+++ b/addons/account/i18n/te.po
@ -7843,7 +7843,7 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/th.po
+++ b/addons/account/i18n/th.po
@ -7843,7 +7843,7 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/tlh.po
+++ b/addons/account/i18n/tlh.po
@ -7842,7 +7842,7 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/tr.po
+++ b/addons/account/i18n/tr.po
@ -8115,11 +8115,11 @@ msgstr "Referans Tipi"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"

--- a/addons/account/i18n/ug.po
+++ b/addons/account/i18n/ug.po
@ -7843,7 +7843,7 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/uk.po
+++ b/addons/account/i18n/uk.po
@ -7848,7 +7848,7 @@ msgstr "Тип посилання"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/vi.po
+++ b/addons/account/i18n/vi.po
@ -8238,11 +8238,11 @@ msgstr "Lọai tham chiếu"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"

--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@ -7849,7 +7849,7 @@ msgstr "关联类型"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/zh_HK.po
+++ b/addons/account/i18n/zh_HK.po
@ -7843,7 +7843,7 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/i18n/zh_TW.po
+++ b/addons/account/i18n/zh_TW.po
@ -7842,7 +7842,7 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
 "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
 "& Loss Report"
 msgstr ""
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@ -95,7 +95,7 @@ class account_installer(osv.osv_memory):
        'bank_accounts_id': _get_default_accounts,
        'charts': _get_default_charts
    }
-    
+
    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
        res = super(account_installer, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
        configured_cmp = []
@ -106,11 +106,12 @@ class account_installer(osv.osv_memory):
        cr.execute("SELECT company_id FROM account_account WHERE active = 't' AND account_account.parent_id IS NULL AND name != %s", ("Chart For Automated Tests",))
        configured_cmp = [r[0] for r in cr.fetchall()]
        unconfigured_cmp = list(set(company_ids)-set(configured_cmp))
-        if unconfigured_cmp:
-            cmp_select = [(line.id, line.name) for line in self.pool.get('res.company').browse(cr, uid, unconfigured_cmp)]
-            for field in res['fields']:
-               if field == 'company_id':
-                   res['fields'][field]['domain'] = unconfigured_cmp
+        for field in res['fields']:
+           if field == 'company_id':
+               res['fields'][field]['domain'] = unconfigured_cmp
+               res['fields'][field]['selection'] = [('', '')]
+               if unconfigured_cmp:
+                   cmp_select = [(line.id, line.name) for line in self.pool.get('res.company').browse(cr, uid, unconfigured_cmp)]
                   res['fields'][field]['selection'] = cmp_select
        return res

--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@ -95,7 +95,7 @@ class account_invoice(osv.osv):
        cur_obj = self.pool.get('res.currency')
        data_inv = self.browse(cr, uid, ids, context=context)
        for inv in data_inv:
-            if inv.reconciled: 
+            if inv.reconciled:
                res[inv.id] = 0.0
                continue
            inv_total = inv.amount_total
@ -111,7 +111,7 @@ class account_invoice(osv.osv):
                   amount_in_invoice_currency = cur_obj.compute(cr, uid, inv.company_id.currency_id.id, inv.currency_id.id,abs(lines.debit-lines.credit),round=False,context=context_unreconciled)
                   inv_total -= amount_in_invoice_currency

-            result = inv_total 
+            result = inv_total
            res[inv.id] =  self.pool.get('res.currency').round(cr, uid, inv.currency_id, result)
        return res

@ -246,7 +246,7 @@ class account_invoice(osv.osv):
        'invoice_line': fields.one2many('account.invoice.line', 'invoice_id', 'Invoice Lines', readonly=True, states={'draft':[('readonly',False)]}),
        'tax_line': fields.one2many('account.invoice.tax', 'invoice_id', 'Tax Lines', readonly=True, states={'draft':[('readonly',False)]}),

-        'move_id': fields.many2one('account.move', 'Journal Entry', readonly=True, select=1, help="Link to the automatically generated Journal Items."),
+        'move_id': fields.many2one('account.move', 'Journal Entry', readonly=True, select=1, ondelete='restrict', help="Link to the automatically generated Journal Items."),
        'amount_untaxed': fields.function(_amount_all, method=True, digits_compute=dp.get_precision('Account'), string='Untaxed',
            store={
                'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 20),
@ -947,22 +947,22 @@ class account_invoice(osv.osv):
    def line_get_convert(self, cr, uid, x, part, date, context=None):
        return {
            'date_maturity': x.get('date_maturity', False),
-            'partner_id':part,
-            'name':x['name'][:64],
+            'partner_id': part,
+            'name': x['name'][:64],
            'date': date,
-            'debit':x['price']>0 and x['price'],
-            'credit':x['price']<0 and -x['price'],
-            'account_id':x['account_id'],
-            'analytic_lines':x.get('analytic_lines', []),
-            'amount_currency':x['price']>0 and abs(x.get('amount_currency', False)) or -abs(x.get('amount_currency', False)),
-            'currency_id':x.get('currency_id', False),
+            'debit': x['price']>0 and x['price'],
+            'credit': x['price']<0 and -x['price'],
+            'account_id': x['account_id'],
+            'analytic_lines': x.get('analytic_lines', []),
+            'amount_currency': x['price']>0 and abs(x.get('amount_currency', False)) or -abs(x.get('amount_currency', False)),
+            'currency_id': x.get('currency_id', False),
            'tax_code_id': x.get('tax_code_id', False),
            'tax_amount': x.get('tax_amount', False),
-            'ref':x.get('ref',False),
-            'quantity':x.get('quantity',1.00),
-            'product_id':x.get('product_id', False),
-            'product_uom_id':x.get('uos_id',False),
-            'analytic_account_id':x.get('account_analytic_id',False),
+            'ref': x.get('ref', False),
+            'quantity': x.get('quantity',1.00),
+            'product_id': x.get('product_id', False),
+            'product_uom_id': x.get('uos_id', False),
+            'analytic_account_id': x.get('account_analytic_id', False),
        }

    def action_number(self, cr, uid, ids, context=None):
@ -1132,6 +1132,7 @@ class account_invoice(osv.osv):
                invoice[field] = invoice[field] and invoice[field][0]
            # create the new invoice
            new_ids.append(self.create(cr, uid, invoice))
+
        return new_ids

    def pay_and_reconcile(self, cr, uid, ids, pay_amount, pay_account_id, period_id, pay_journal_id, writeoff_acc_id, writeoff_period_id, writeoff_journal_id, context=None, name=''):
@ -1232,6 +1233,7 @@ class account_invoice(osv.osv):
        # Update the stored value (fields.function), so we write to trigger recompute
        self.pool.get('account.invoice').write(cr, uid, ids, {}, context=context)
        return True
+
 account_invoice()

 class account_invoice_line(osv.osv):
@ -1643,6 +1645,7 @@ class account_invoice_tax(osv.osv):
                'tax_amount': t['tax_amount']
            })
        return res
+
 account_invoice_tax()


--- a/addons/account/project/project.py
+++ b/addons/account/project/project.py
@ -24,6 +24,7 @@ from osv import osv

 class account_analytic_journal(osv.osv):
    _name = 'account.analytic.journal'
+    _description = 'Analytic Journal'
    _columns = {
        'name': fields.char('Journal Name', size=64, required=True),
        'code': fields.char('Journal Code', size=8),
@ -49,4 +50,4 @@ class account_journal(osv.osv):

 account_journal()

-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
--- a/addons/account/project/project_report.xml
+++ b/addons/account/project/project_report.xml
@ -1,15 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
    <data>
-        <report auto="False" id="analytic_journal_print" menu="False" model="account.analytic.journal" name="account.analytic.account.journal" rml="account/project/report/analytic_journal.rml" string="Analytic Journal"/>
+        <report auto="False" id="analytic_journal_print" menu="False"
+            model="account.analytic.journal" name="account.analytic.account.journal"
+            rml="account/project/report/analytic_journal.rml" string="Analytic Journal"/>

-        <report auto="False" id="account_analytic_account_balance" menu="False" model="account.analytic.account" name="account.analytic.account.balance" rml="account/project/report/analytic_balance.rml" string="Analytic Balance"/>
+        <report auto="False" id="account_analytic_account_balance" menu="False"
+            model="account.analytic.account" name="account.analytic.account.balance"
+            rml="account/project/report/analytic_balance.rml" string="Analytic Balance"/>

-        <report auto="False" id="account_analytic_account_inverted_balance" menu="False" model="account.analytic.account" name="account.analytic.account.inverted.balance" rml="account/project/report/inverted_analytic_balance.rml" string="Inverted Analytic Balance"/>
+        <report auto="False" id="account_analytic_account_inverted_balance"
+            menu="False" model="account.analytic.account"
+            name="account.analytic.account.inverted.balance"
+            rml="account/project/report/inverted_analytic_balance.rml"
+            string="Inverted Analytic Balance"/>

-        <report auto="False" id="account_analytic_account_cost_ledger" menu="False" model="account.analytic.account" name="account.analytic.account.cost_ledger" rml="account/project/report/cost_ledger.rml" string="Cost Ledger"/>
+        <report auto="False" id="account_analytic_account_cost_ledger" menu="False"
+            model="account.analytic.account" name="account.analytic.account.cost_ledger"
+            rml="account/project/report/cost_ledger.rml" string="Cost Ledger"/>

-        <report auto="False" id="account_analytic_account_quantity_cost_ledger" menu="False" model="account.analytic.account" name="account.analytic.account.quantity_cost_ledger" rml="account/project/report/quantity_cost_ledger.rml" string="Cost Ledger (Only quantities)"/>
+        <report auto="False" id="account_analytic_account_quantity_cost_ledger" 
+            menu="False" model="account.analytic.account" 
+            name="account.analytic.account.quantity_cost_ledger" 
+            rml="account/project/report/quantity_cost_ledger.rml" 
+            string="Cost Ledger (Only quantities)"/>

    </data>
 </openerp>
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@ -82,12 +82,13 @@
                        <field name="name" select="1" colspan="4"/>
                        <field name="code" select="1"/>
                        <field name="parent_id" on_change="on_change_parent(parent_id)" groups="base.group_extended"/>
-                        <field name="company_id" select="2" widget="selection" groups="base.group_multi_company"/>
+                        <field name="company_id" on_change="on_change_company(company_id)" select="2" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
                        <field name="type" select="2"/>
                    </group>
                    <notebook colspan="4">
                        <page string="Account Data">
                            <field name="partner_id" select="1"/>
+                            <field name="currency_id" select="1"/>
                            <newline/>
                            <field name="date_start"/>
                            <field name="date" select="2"/>
@ -112,7 +113,9 @@
            <field name="view_id" ref="view_account_analytic_account_tree"/>
            <field name="search_view_id" ref="account.view_account_analytic_account_search"/>
        </record>
-        <menuitem action="action_account_analytic_account_form" id="account_analytic_def_account" parent="menu_analytic_accounting" groups="analytic.group_analytic_accounting,group_account_manager"/>
+        <menuitem action="action_account_analytic_account_form" id="account_analytic_def_account"
+            parent="menu_analytic_accounting"
+            groups="analytic.group_analytic_accounting"/>

        <record id="act_account_renew_view" model="ir.actions.act_window">
            <field name="name">Accounts to Renew</field>
@ -133,7 +136,9 @@
            <field name="help">The normal chart of accounts has a structure defined by the legal requirement of the country. The analytic chart of account structure should reflect your own business needs in term of costs/revenues reporting. They are usually structured by contracts, projects, products or departements. Most of the OpenERP operations (invoices, timesheets, expenses, etc) generate analytic entries on the related account.</field>
        </record>

-        <menuitem groups="analytic.group_analytic_accounting,group_account_manager,group_account_user" id="next_id_40" name="Analytic" parent="account.menu_finance_generic_reporting" sequence="4"/>
+        <menuitem groups="analytic.group_analytic_accounting" id="next_id_40" 
+            name="Analytic" parent="account.menu_finance_generic_reporting"
+            sequence="4"/>

        <record id="view_account_analytic_line_form" model="ir.ui.view">
            <field name="name">account.analytic.line.form</field>
@ -340,7 +345,7 @@
            <field name="view_mode">tree,form</field>
            <field name="search_view_id" ref="view_analytic_journal_search" />
        </record>
-        <menuitem groups="analytic.group_analytic_accounting,group_account_manager" action="action_account_analytic_journal_form" id="account_def_analytic_journal" parent="menu_analytic_accounting" sequence="5"/>
+        <menuitem groups="analytic.group_analytic_accounting" action="action_account_analytic_journal_form" id="account_def_analytic_journal" parent="menu_analytic_accounting" sequence="5"/>

        #
        # Open journal entries
@ -352,7 +357,10 @@
            <field name="view_type">form</field>
            <field name="view_mode">tree,form</field>
        </record>
-        <menuitem groups="analytic.group_analytic_accounting,group_account_manager,group_account_user" action="action_account_analytic_journal_open_form" id="account_analytic_journal_entries" parent="menu_finance_entries"/>
+        <menuitem groups="analytic.group_analytic_accounting"
+            action="action_account_analytic_journal_open_form"
+            id="account_analytic_journal_entries"
+            parent="menu_finance_entries"/>

        #
        # Reporting
@ -364,7 +372,9 @@
            <field name="view_type">tree</field>
            <field name="help">To print an analytics (or costs) journal for a given period. The report give code, move name, account number, general amount and analytic amount.</field>
        </record>
-        <menuitem groups="analytic.group_analytic_accounting,group_account_manager,group_account_user" action="action_account_analytic_journal_tree" id="account_analytic_journal_print" parent="account.next_id_40"/>
+        <menuitem groups="analytic.group_analytic_accounting"
+            action="action_account_analytic_journal_tree" 
+            id="account_analytic_journal_print" parent="account.next_id_40"/>

        #
        # Statistics
--- a/addons/account/project/wizard/account_analytic_chart_view.xml
+++ b/addons/account/project/wizard/account_analytic_chart_view.xml
@ -39,7 +39,7 @@
            action="action_account_analytic_chart"
            id="menu_action_analytic_account_tree2"
            icon="STOCK_INDENT"
-            groups="analytic.group_analytic_accounting,group_account_manager,group_account_user"/>
+            groups="analytic.group_analytic_accounting"/>

    </data>
 </openerp>
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@ -100,7 +100,7 @@

    <menuitem action="action_analytic_entries_report"
        id="menu_action_analytic_entries_report"
-        groups="analytic.group_analytic_accounting,group_account_manager"
+        groups="analytic.group_analytic_accounting"
        parent="account.menu_finance_statistic_report_statement" sequence="4"/>

 </data>
--- a/addons/account/report/account_balance.py
+++ b/addons/account/report/account_balance.py
@ -70,6 +70,9 @@ class account_balance(report_sxw.rml_parse, common_report_header):
    def lines(self, form, ids=[], done=None):#, level=1):
        def _process_child(accounts, disp_acc, parent):
                account_rec = [acct for acct in accounts if acct['id']==parent][0]
+                currency_obj = self.pool.get('res.currency')
+                acc_id = self.pool.get('account.account').browse(self.cr, self.uid, account_rec['id'])
+                currency = acc_id.currency_id and acc_id.currency_id or acc_id.company_id.currency_id
                res = {
                    'id': account_rec['id'],
                    'type': account_rec['type'],
@ -84,12 +87,11 @@ class account_balance(report_sxw.rml_parse, common_report_header):
                }
                self.sum_debit += account_rec['debit']
                self.sum_credit += account_rec['credit']
-                acc_digit = self.pool.get('decimal.precision').precision_get(self.cr, 1, 'Account')
                if disp_acc == 'bal_movement':
-                    if round(res['credit'], acc_digit) > 0  or round(res['debit'], acc_digit) > 0 or round(res['balance'], acc_digit) != 0:
+                    if currency_obj.is_zero(self.cr, self.uid, currency, res['credit']) > 0 or currency_obj.is_zero(self.cr, self.uid, currency, res['debit']) > 0 or currency_obj.is_zero(self.cr, self.uid, currency, res['balance']) != 0:
                        self.result_acc.append(res)
                elif disp_acc == 'bal_solde':
-                    if round(res['balance'], acc_digit) != 0:
+                    if currency_obj.is_zero(self.cr, self.uid, currency, res['debit']) != 0:
                        self.result_acc.append(res)
                else:
                    self.result_acc.append(res)
--- a/addons/account/report/account_balance_landscape_old_backup.rml
+++ b/addons/account/report/account_balance_landscape_old_backup.rml
--- a/addons/account/report/account_balance_old_backup.rml
+++ b/addons/account/report/account_balance_old_backup.rml
--- a/addons/account/report/account_balance_sheet.py
+++ b/addons/account/report/account_balance_sheet.py
@ -89,6 +89,7 @@ class report_balancesheet_horizontal(report_sxw.rml_parse, common_report_header)
        self.res_bl = self.obj_pl.final_result()

        account_pool = db_pool.get('account.account')
+        currency_pool = db_pool.get('res.currency')

        types = [
            'liability',
@ -136,16 +137,16 @@ class report_balancesheet_horizontal(report_sxw.rml_parse, common_report_header)
                        'level': account.level,
                        'balance':account.balance,
                    }
-                    acc_digit = self.pool.get('decimal.precision').precision_get(self.cr, 1, 'Account')
+                    currency = account.currency_id and account.currency_id or account.company_id.currency_id
                    if typ == 'liability' and account.type <> 'view' and (account.debit <> account.credit):
                        self.result_sum_dr += account.balance
                    if typ == 'asset' and account.type <> 'view' and (account.debit <> account.credit):
                        self.result_sum_cr += account.balance
                    if data['form']['display_account'] == 'bal_movement':
-                        if round(account.credit, acc_digit) > 0  or round(account.debit, acc_digit) > 0 or round(account.balance, acc_digit) != 0:
+                        if currency_pool.is_zero(self.cr, self.uid, currency, account.credit) > 0 or currency_pool.is_zero(self.cr, self.uid, currency, account.debit) > 0 or currency_pool.is_zero(self.cr, self.uid, currency, account.balance) != 0:
                            accounts_temp.append(account_dict)
                    elif data['form']['display_account'] == 'bal_solde':
-                        if round(account.balance, acc_digit) != 0:
+                        if currency_pool.is_zero(self.cr, self.uid, currency, account.balance) != 0:
                            accounts_temp.append(account_dict)
                    else:
                        accounts_temp.append(account_dict)
--- a/addons/account/report/account_general_ledger.rml
+++ b/addons/account/report/account_general_ledger.rml
@ -341,7 +341,7 @@
    <para style="terp_default_8">
      <font color="white"> </font>
    </para>
-    <blockTable colWidths="82.0,82.0,82.0,128.0,82.0,82.0" style="Table13">
+    <blockTable colWidths="102.0,102.0,102.0,130.0,102.0" style="Table13">
      <tr>
        <td>
          <para style="terp_tblheader_General_Centre">Chart of Account</para>
@ -355,15 +355,12 @@
        <td>
          <para style="terp_tblheader_General_Centre">Filters By [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para>
        </td>
-        <td>
-          <para style="terp_tblheader_General_Centre">Partner's</para>
-        </td>
        <td>
          <para style="terp_tblheader_General_Centre">Target Moves</para>
        </td>
      </tr>
    </blockTable>
-    <blockTable colWidths="82.0,82.0,82.0,128.0,82.0,82.0" style="Table1">
+    <blockTable colWidths="102.0,102.0,102.0,130.0,102.0" style="Table1">
      <tr>
        <td>
          <para style="terp_default_Centre_8">[[ get_account(data) or '' ]]</para>
@ -420,9 +417,6 @@
            <font color="white"> </font>
          </para>
        </td>
-        <td>
-          <para style="terp_default_Centre_8">[[ get_partners() ]]</para>
-        </td>
        <td>
          <para style="terp_default_Centre_8">[[ get_target_move(data) ]]</para>
        </td>
--- a/addons/account/report/account_invoice_report.py
+++ b/addons/account/report/account_invoice_report.py
@ -36,7 +36,7 @@ class account_invoice_report(osv.osv):
            ('10','October'), ('11','November'), ('12','December')], 'Month', readonly=True),
        'product_id': fields.many2one('product.product', 'Product', readonly=True),
        'product_qty':fields.float('Qty', readonly=True),
-        'uom_name': fields.char('Default UoM', size=128, readonly=True),
+        'uom_name': fields.char('Reference UoM', size=128, readonly=True),
        'payment_term': fields.many2one('account.payment.term', 'Payment Term', readonly=True),
        'period_id': fields.many2one('account.period', 'Force Period', domain=[('state','<>','done')], readonly=True),
        'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position', readonly=True),
@ -88,7 +88,11 @@ class account_invoice_report(osv.osv):
                    ai.partner_id as partner_id,
                    ai.payment_term as payment_term,
                    ai.period_id as period_id,
-                    u.name as uom_name,
+                    (case when u.uom_type not in ('reference') then
+                        (select name from product_uom where uom_type='reference' and category_id=u.category_id)
+                    else
+                        u.name
+                    end) as uom_name,
                    ai.currency_id as currency_id,
                    ai.journal_id as journal_id,
                    ai.fiscal_position as fiscal_position,
@ -104,9 +108,9 @@ class account_invoice_report(osv.osv):
                    ai.account_id as account_id,
                    ai.partner_bank_id as partner_bank_id,
                    sum(case when ai.type in ('out_refund','in_invoice') then
-                         ail.quantity * u.factor * -1
+                         ail.quantity / u.factor * -1
                        else
-                         ail.quantity * u.factor
+                         ail.quantity / u.factor
                        end) as product_qty,
                    sum(case when ai.type in ('out_refund','in_invoice') then
                         ail.quantity*ail.price_unit * -1
@ -125,9 +129,9 @@ class account_invoice_report(osv.osv):
                    else
                      sum(ail.quantity*ail.price_unit)
                    end)/(case when ai.type in ('out_refund','in_invoice') then
-                      sum(ail.quantity*u.factor*-1)
+                      sum(ail.quantity/u.factor*-1)
                    else
-                      sum(ail.quantity*u.factor)
+                      sum(ail.quantity/u.factor)
                    end) / cr.rate as price_average,
                    cr.rate as currency_rate,
                    sum((select extract(epoch from avg(date_trunc('day',aml.date_created)-date_trunc('day',l.create_date)))/(24*60*60)::decimal(16,2)
@ -179,7 +183,9 @@ class account_invoice_report(osv.osv):
                    ai.account_id,
                    ai.partner_bank_id,
                    ai.residual,
-                    ai.amount_total
+                    ai.amount_total,
+                    u.uom_type,
+                    u.category_id
            )
        """)

--- a/addons/account/report/account_profit_loss.py
+++ b/addons/account/report/account_profit_loss.py
@ -82,6 +82,7 @@ class report_pl_account_horizontal(report_sxw.rml_parse, common_report_header):
        db_pool = pooler.get_pool(self.cr.dbname)

        account_pool = db_pool.get('account.account')
+        currency_pool = db_pool.get('res.currency')

        types = [
            'expense',
@ -106,16 +107,16 @@ class report_pl_account_horizontal(report_sxw.rml_parse, common_report_header):
            accounts_temp = []
            for account in accounts:
                if (account.user_type.report_type) and (account.user_type.report_type == typ):
-                    acc_digit = self.pool.get('decimal.precision').precision_get(self.cr, 1, 'Account')
+                    currency = account.currency_id and account.currency_id or account.company_id.currency_id
                    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 data['form']['display_account'] == 'bal_movement':
-                        if round(account.credit, acc_digit) > 0  or round(account.debit, acc_digit) > 0 or round(account.balance, acc_digit) != 0:
+                        if currency_pool.is_zero(self.cr, self.uid, currency, account.credit) > 0 or currency_pool.is_zero(self.cr, self.uid, currency, account.debit) > 0 or currency_pool.is_zero(self.cr, self.uid, currency, account.balance) != 0:
                            accounts_temp.append(account)
                    elif data['form']['display_account'] == 'bal_solde':
-                        if round(account.balance, acc_digit) != 0:
+                        if currency_pool.is_zero(self.cr, self.uid, currency, account.balance) != 0:
                            accounts_temp.append(account)
                    else:
                        accounts_temp.append(account)
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@ -9,7 +9,9 @@
 "access_account_account_user","account.account user","model_account_account","base.group_user",1,0,0,0
 "access_account_account_partner_manager","account.account partner manager","model_account_account","base.group_partner_manager",1,0,0,0
 "access_account_journal_view","account.journal.view","model_account_journal_view","account.group_account_user",1,0,0,0
+"access_account_journal_view_hruser","account.journal.view hruser","model_account_journal_view","base.group_hr_user",1,0,0,0
 "access_account_journal_column","account.journal.column","model_account_journal_column","account.group_account_user",1,0,0,0
+"access_account_journal_column_hruser","account.journal.column hruser","model_account_journal_column","base.group_hr_user",1,0,0,0
 "access_account_journal","account.journal","model_account_journal","account.group_account_user",1,0,0,0
 "access_account_period","account.period","model_account_period","account.group_account_user",1,0,0,0
 "access_account_journal_period_manager","account.journal.period manager","model_account_journal_period","account.group_account_manager",1,0,0,0
@ -31,7 +33,7 @@
 "access_account_tax_code_template","account.tax.code.template","model_account_tax_code_template","account.group_account_manager",1,1,1,1
 "access_account_chart_template","account.chart.template","model_account_chart_template","account.group_account_manager",1,1,1,1
 "access_account_tax_template","account.tax.template","model_account_tax_template","account.group_account_manager",1,1,1,1
-"access_account_bank_statement","account.bank.statement","model_account_bank_statement","account.group_account_user",1,0,0,0
+"access_account_bank_statement","account.bank.statement","model_account_bank_statement","account.group_account_user",1,1,1,1
 "access_account_bank_statement_line","account.bank.statement.line","model_account_bank_statement_line","account.group_account_user",1,1,1,1
 "access_account_analytic_line","account.analytic.line","model_account_analytic_line","account.group_account_user",1,1,1,1
 "access_account_analytic_line_manager","account.analytic.line manager","model_account_analytic_line","account.group_account_manager",1,0,0,0
@ -69,8 +71,8 @@
 "access_account_invoice_user","account.invoice.line user","model_account_invoice_line","base.group_user",1,0,0,0
 "access_account_payment_term_partner_manager","account.payment.term partner manager","model_account_payment_term","base.group_user",1,0,0,0
 "access_account_payment_term_line_partner_manager","account.payment.term.line partner manager","model_account_payment_term_line","base.group_user",1,0,0,0
-"access_account_account_product_manager","account.account product manager","model_account_account","product.group_product_manager",1,0,0,0
-"access_account_journal_product_manager","account.journal product manager","model_account_journal","product.group_product_manager",1,0,0,0
+"access_account_account_sale_manager","account.account sale manager","model_account_account","base.group_sale_manager",1,0,0,0
+"access_account_journal_sale_manager","account.journal sale manager","model_account_journal","base.group_sale_manager",1,0,0,0
 "access_account_fiscal_position_product_manager","account.fiscal.position account.manager","model_account_fiscal_position","account.group_account_manager",1,1,1,1
 "access_account_fiscal_position_tax_product_manager","account.fiscal.position.tax account.manager","model_account_fiscal_position_tax","account.group_account_manager",1,1,1,1
 "access_account_fiscal_position_account_product_manager","account.fiscal.position account.manager","model_account_fiscal_position_account","account.group_account_manager",1,1,1,1
@ -97,6 +99,7 @@
 "access_account_invoice_manager","account.invoice manager","model_account_invoice","account.group_account_manager",1,0,0,0
 "access_account_bank_statement_manager","account.bank.statement manager","model_account_bank_statement","account.group_account_manager",1,1,1,1
 "access_account_entries_report_manager","account.entries.report","model_account_entries_report","account.group_account_manager",1,1,1,1
+"access_account_entries_report_user","account.entries.report","model_account_entries_report","account.group_account_user",1,0,0,0
 "access_analytic_entries_report_manager","analytic.entries.report","model_analytic_entries_report","account.group_account_manager",1,0,0,0
 "access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_manager",1,1,1,1
 "access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_user",1,1,1,1
@ -116,5 +119,8 @@
 "access_report_account_receivable_invoice","report.account.receivable.invoice","model_report_account_receivable","account.group_account_invoice",1,1,1,1
 "access_report_account_receivable_user","report.account.receivable.user","model_report_account_receivable","account.group_account_user",1,1,1,1
 "access_account_sequence_fiscal_year_invoice","account.sequence.fiscalyear invoice","model_account_sequence_fiscalyear","account.group_account_invoice",1,1,1,1
+"access_account_tax_sale_manager","account.tax sale manager","model_account_tax","base.group_sale_salesman",1,0,0,0
+"access_account_journal_sale_manager","account.journal sale manager","model_account_journal","base.group_sale_salesman",1,0,0,0
+"access_account_invoice_tax_sale_manager","account.invoice.tax  sale manager","model_account_invoice_tax","base.group_sale_salesman",1,0,0,0
 "access_account_sequence_fiscal_year_sale_user","account.sequence.fiscalyear.sale.user","model_account_sequence_fiscalyear","base.group_sale_salesman",1,1,1,0
 "access_account_sequence_fiscal_year_sale_manager","account.sequence.fiscalyear.sale.manager","model_account_sequence_fiscalyear","base.group_sale_manager",1,1,1,1
--- a/addons/account/wizard/account_automatic_reconcile_view.xml
+++ b/addons/account/wizard/account_automatic_reconcile_view.xml
@ -52,7 +52,7 @@
            action="action_account_automatic_reconcile"
            id="menu_automatic_reconcile"
            parent="periodical_processing_reconciliation"
-            groups="base.group_extended,group_account_manager,group_account_user"/>
+            groups="base.group_extended"/>

        <record id="account_automatic_reconcile_view1" model="ir.ui.view">
             <field name="name">Automatic reconcile unreconcile</field>
--- a/addons/account/wizard/account_change_currency.py
+++ b/addons/account/wizard/account_change_currency.py
@ -72,7 +72,7 @@ class account_change_currency(osv.osv_memory):
                new_price = (line.price_unit / old_rate ) * rate
            obj_inv_line.write(cr, uid, [line.id], {'price_unit': new_price})
        obj_inv.write(cr, uid, [invoice.id], {'currency_id': new_currency}, context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}

 account_change_currency()

--- a/addons/account/wizard/account_fiscalyear_close.py
+++ b/addons/account/wizard/account_fiscalyear_close.py
@ -215,7 +215,7 @@ class account_fiscalyear_close(osv.osv_memory):
        cr.execute('UPDATE account_fiscalyear ' \
                    'SET end_journal_period_id = %s ' \
                    'WHERE id = %s', (ids[0], old_fyear.id))
-        return {}
+        return {'type': 'ir.actions.act_window_close'}

 account_fiscalyear_close()

--- a/addons/account/wizard/account_fiscalyear_close_state.py
+++ b/addons/account/wizard/account_fiscalyear_close_state.py
@ -57,7 +57,7 @@ class account_fiscalyear_close_state(osv.osv_memory):
            fy_pool = self.pool.get('account.fiscalyear')
            fy_code = fy_pool.browse(cr, uid, fy_id, context=context).code
            fy_pool.log(cr, uid, fy_id, "Fiscal year '%s' is closed, no more modification allowed." % (fy_code))
-            return {}
+            return {'type': 'ir.actions.act_window_close'}

 account_fiscalyear_close_state()

--- a/addons/account/wizard/account_invoice_state.py
+++ b/addons/account/wizard/account_invoice_state.py
@ -43,7 +43,7 @@ class account_invoice_confirm(osv.osv_memory):
            if record['state'] not in ('draft','proforma','proforma2'):
                raise osv.except_osv(_('Warning'), _("Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-Forma' state!"))
            wf_service.trg_validate(uid, 'account.invoice', record['id'], 'invoice_open', cr)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}

 account_invoice_confirm()

@ -67,7 +67,7 @@ class account_invoice_cancel(osv.osv_memory):
            if record['state'] in ('cancel','paid'):
                raise osv.except_osv(_('Warning'), _("Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' or 'Done' state!"))
            wf_service.trg_validate(uid, 'account.invoice', record['id'], 'invoice_cancel', cr)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}

 account_invoice_cancel()

--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@ -92,12 +92,14 @@ class account_move_journal(osv.osv_memory):
        journal = False
        if journal_id:
            journal = journal_pool.read(cr, uid, [journal_id], ['name'])[0]['name']
+            journal_string = _("Journal: %s") % tools.ustr(journal)
        else:
-            journal = "All"
+            journal_string = _("Journal: All")

        period = False
        if period_id:
            period = period_pool.browse(cr, uid, [period_id], ['name'])[0]['name']
+            period_string = _("Period: %s") % tools.ustr(period)

        view = """<?xml version="1.0" encoding="utf-8"?>
        <form string="Standard entries">
@ -105,16 +107,16 @@ class account_move_journal(osv.osv_memory):
            <field name="target_move" />
            <newline/>
            <group colspan="4" >
-                <label width="300" string="Journal: %s"/>
+                <label width="300" string="%s"/>
                <newline/>
-                <label width="300" string="Period:  %s"/>
+                <label width="300" string="%s"/>
            </group>
            <group colspan="4" col="4">
                <label string ="" colspan="2"/>
                <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                <button icon="terp-gtk-go-back-rtl" string="Open" name="action_open_window" default_focus="1" type="object"/>
            </group>
-        </form>""" % (tools.ustr(journal), tools.ustr(period))
+        </form>""" % (journal_string, period_string)

        view = etree.fromstring(view.encode('utf8'))
        xarch, xfields = self._view_look_dom_arch(cr, uid, view, view_id, context=context)
@ -190,4 +192,4 @@ class account_move_journal(osv.osv_memory):

 account_move_journal()

-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
--- a/addons/account/wizard/account_move_line_select.py
+++ b/addons/account/wizard/account_move_line_select.py
@ -63,7 +63,7 @@ class account_move_line_select(osv.osv_memory):
        if context['active_id']:
            acc_data = account_obj.browse(cr, uid, context['active_id']).child_consol_ids
            if acc_data:
-                result['context'].update({'consolidate_childs': True})
+                result['context'].update({'consolidate_children': True})
        result['domain']=result['domain'][0:-1]+','+domain+result['domain'][-1]
        return result

--- a/addons/account/wizard/account_open_closed_fiscalyear.py
+++ b/addons/account/wizard/account_open_closed_fiscalyear.py
@ -42,7 +42,7 @@ class account_open_closed_fiscalyear(osv.osv_memory):
        ids_move = move_obj.search(cr, uid, [('journal_id','=',period_journal.journal_id.id),('period_id','=',period_journal.period_id.id)])
        if ids_move:
            cr.execute('delete from account_move where id IN %s', (tuple(ids_move),))
-        return {}
+        return {'type': 'ir.actions.act_window_close'}

 account_open_closed_fiscalyear()

--- a/addons/account/wizard/account_period_close.py
+++ b/addons/account/wizard/account_period_close.py
@ -50,7 +50,7 @@ class account_period_close(osv.osv_memory):
                    # Log message for Period
                    for period_id, name in period_pool.name_get(cr, uid, [id]):
                        period_pool.log(cr, uid, period_id, "Period '%s' is closed, no more modification allowed for this period." % (name))
-        return {}
+        return {'type': 'ir.actions.act_window_close'}

 account_period_close()

--- a/addons/account/wizard/account_reconcile.py
+++ b/addons/account/wizard/account_reconcile.py
@ -101,7 +101,7 @@ class account_move_line_reconcile(osv.osv_memory):
                context.update({'stop_reconcile': True})
        account_move_line_obj.reconcile(cr, uid, context['active_ids'], 'manual', account_id,
                                        period_id, journal_id, context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}

 account_move_line_reconcile()

@ -145,7 +145,7 @@ class account_move_line_reconcile_writeoff(osv.osv_memory):
        if context is None:
            context = {}
        account_move_line_obj.reconcile_partial(cr, uid, context['active_ids'], 'manual', context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}

    def trans_rec_reconcile(self, cr, uid, ids, context=None):
        account_move_line_obj = self.pool.get('account.move.line')
@ -169,7 +169,7 @@ class account_move_line_reconcile_writeoff(osv.osv_memory):
        context.update({'stop_reconcile': True})
        account_move_line_obj.reconcile(cr, uid, context['active_ids'], 'manual', account_id,
                period_id, journal_id, context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}

 account_move_line_reconcile_writeoff()

--- a/addons/account/wizard/account_reconcile_partner_process.py
+++ b/addons/account/wizard/account_reconcile_partner_process.py
@ -83,7 +83,7 @@ class account_partner_reconcile_process(osv.osv_memory):
            res_partner_obj.write(cr, uid, partner_id[0], {'last_reconciliation_date': time.strftime('%Y-%m-%d')}, context)
        #TODO: we have to find a way to update the context of the current tab (we could open a new tab with the context but it's not really handy)
        #TODO: remove that comments when the client side dev is done
-        return {}
+        return {'type': 'ir.actions.act_window_close'}

    _columns = {
        'to_reconcile': fields.float('Remaining Partners', readonly=True, help='This is the remaining partners for who you should check if there is something to reconcile or not. This figure already count the current partner as reconciled.'),
--- a/addons/account/wizard/account_report_account_balance.py
+++ b/addons/account/wizard/account_report_account_balance.py
@ -19,8 +19,6 @@
 #
 ##############################################################################

-from lxml import etree
-
 from osv import osv

 class account_balance_report(osv.osv_memory):
@ -32,21 +30,10 @@ class account_balance_report(osv.osv_memory):
        'journal_ids': [],
    }

-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        mod_obj = self.pool.get('ir.model.data')
-        res = super(account_balance_report, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
-        doc = etree.XML(res['arch'])
-        nodes = doc.xpath("//field[@name='journal_ids']")
-        for node in nodes:
-            node.set('readonly', '1')
-            node.set('required', '0')
-        res['arch'] = etree.tostring(doc)
-        return res
-
    def _print_report(self, cr, uid, ids, data, context=None):
        data = self.pre_print_report(cr, uid, ids, data, context=context)
        return {'type': 'ir.actions.report.xml', 'report_name': 'account.account.balance', 'datas': data}

 account_balance_report()

-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
--- a/addons/account/wizard/account_report_account_balance_view.xml
+++ b/addons/account/wizard/account_report_account_balance_view.xml
@ -10,6 +10,9 @@
          <field name="inherit_id" ref="account_common_report_view" />
          <field name="arch" type="xml">
            <data>
+            <xpath expr="//field[@name='journal_ids']" position="replace">
+                <field name="journal_ids" colspan="4" nolabel="1" required="0" readonly="1"/>
+            </xpath>
            <xpath expr="/form/label[@string='']" position="replace">
                <separator string="Trial Balance" colspan="4"/>
                <label nolabel="1" colspan="4" string="This report allows you to print or generate a pdf of your trial balance allowing you to quickly check the balance of each of your accounts in a single report"/>
--- a/addons/account/wizard/account_report_aged_partner_balance.py
+++ b/addons/account/wizard/account_report_aged_partner_balance.py
@ -22,8 +22,6 @@
 import time
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
-from lxml import etree
-
 from osv import osv, fields
 from tools.translate import _

@ -44,16 +42,6 @@ class account_aged_trial_balance(osv.osv_memory):
        'direction_selection': 'past',
    }

-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        res = super(account_aged_trial_balance, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
-        doc = etree.XML(res['arch'])
-        nodes = doc.xpath("//field[@name='journal_ids']")
-        for node in nodes:
-            node.set('invisible', '1')
-            node.set('required', '0')
-        res['arch'] = etree.tostring(doc)
-        return res
-
    def _print_report(self, cr, uid, ids, data, context=None):
        res = {}
        if context is None:
--- a/addons/account/wizard/account_report_aged_partner_balance_view.xml
+++ b/addons/account/wizard/account_report_aged_partner_balance_view.xml
@ -20,7 +20,7 @@
                    <newline/>
                    <field name="result_selection"/>
                    <field name="direction_selection"/>
-                    <field name="journal_ids"/>
+                    <field name="journal_ids" required="0" invisible="1"/>
                    <newline/>
                    <separator colspan="4"/>
                    <group col="4" colspan="4">
--- a/addons/account/wizard/account_report_balance_sheet.py
+++ b/addons/account/wizard/account_report_balance_sheet.py
@ -19,8 +19,6 @@
 #
 ##############################################################################

-from lxml import etree
-
 from osv import osv, fields
 from tools.translate import _

@ -32,36 +30,45 @@ class account_bs_report(osv.osv_memory):
    _inherit = "account.common.account.report"
    _description = 'Account Balance Sheet Report'

+    def _get_def_reserve_account(self, cr, uid, context=None):
+        chart_id = self._get_account(cr, uid, context=context)
+        res = self.onchange_chart_id(cr, uid, [], chart_id, context=context)
+        if not res:
+            return False
+        return res['value']['reserve_account_id']
+
    _columns = {
        'display_type': fields.boolean("Landscape Mode"),
-        'reserve_account_id': fields.many2one('account.account', 'Reserve & Profit/Loss 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')]),
+        'reserve_account_id': fields.many2one('account.account', 'Reserve & Profit/Loss Account',
+                                      required=True,
+                                      help='This Account is used for transfering Profit/Loss ' \
+                                           '(Profit: Amount will be added, Loss: Amount will be duducted), ' \
+                                           'which is calculated from Profilt & Loss Report',
+                                      domain = [('type','=','payable')]),
    }

    _defaults={
        'display_type': True,
        'journal_ids': [],
+        'reserve_account_id': _get_def_reserve_account,
    }

-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        res = super(account_bs_report, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
-        doc = etree.XML(res['arch'])
-        nodes = doc.xpath("//field[@name='journal_ids']")
-        for node in nodes:
-            node.set('readonly', '1')
-            node.set('required', '0')
-        res['arch'] = etree.tostring(doc)
-        return res
+    def onchange_chart_id(self, cr, uid, ids, chart_id, context=None):
+        if not chart_id:
+            return {}
+        account = self.pool.get('account.account').browse(cr, uid, chart_id , context=context)
+        if not account.company_id.property_reserve_and_surplus_account:
+            return {'value': {'reserve_account_id': False}}
+        return {'value': {'reserve_account_id': account.company_id.property_reserve_and_surplus_account.id}}
+

    def _print_report(self, cr, uid, ids, data, context=None):
        if context is None:
            context = {}
-        data = self.pre_print_report(cr, uid, ids, data, context=context)
-        account = self.pool.get('account.account').browse(cr, uid, data['form']['chart_account_id'], context=context)
-        if not account.company_id.property_reserve_and_surplus_account:
+        data['form'].update(self.read(cr, uid, ids, ['display_type','reserve_account_id'])[0])
+        if not data['form']['reserve_account_id']:
            raise osv.except_osv(_('Warning'),_('Please define the Reserve and Profit/Loss account for current user company !'))
-        data['form']['reserve_account_id'] = account.company_id.property_reserve_and_surplus_account.id
-        data['form'].update(self.read(cr, uid, ids, ['display_type'])[0])
+        data = self.pre_print_report(cr, uid, ids, data, context=context)
        if data['form']['display_type']:
            return {
                'type': 'ir.actions.report.xml',
--- a/addons/account/wizard/account_report_balance_sheet_view.xml
+++ b/addons/account/wizard/account_report_balance_sheet_view.xml
@ -9,14 +9,20 @@
            <field name="inherit_id" ref="account.account_common_report_view" />
            <field name="arch" type="xml">
            <data>
+            <xpath expr="//field[@name='chart_account_id']" position="replace">
+                <field name="chart_account_id" widget="selection" on_change="onchange_chart_id(chart_account_id)"/>
+            </xpath>
+            <xpath expr="//field[@name='journal_ids']" position="replace">
+                <field name="journal_ids" colspan="4" nolabel="1" required="0" readonly="1"/>
+            </xpath>
            <xpath expr="/form/label[@string='']" position="replace">
                <separator string="Balance Sheet" colspan="4"/>
                <label nolabel="1" colspan="4" string="This report allows you to print or generate a pdf of your trial balance allowing you to quickly check the balance of each of your accounts in a single report"/>
            </xpath>
            <xpath expr="//field[@name='target_move']" position="after">
                <field name="display_account"/>
+                <field name="reserve_account_id" required="1"/>
                <field name="display_type"/>
-                <field name="reserve_account_id" required="0" invisible="1"/>
                <newline/>
            </xpath>
            </data>
--- a/addons/account/wizard/account_report_common.py
+++ b/addons/account/wizard/account_report_common.py
@ -86,7 +86,7 @@ class account_common_report(osv.osv_memory):
        return res

    def _get_account(self, cr, uid, context=None):
-        accounts = self.pool.get('account.account').search(cr, uid, [], limit=1)
+        accounts = self.pool.get('account.account').search(cr, uid, [('parent_id', '=', False)], limit=1)
        return accounts and accounts[0] or False

    def _get_fiscalyear(self, cr, uid, context=None):
--- a/addons/account/wizard/account_report_profit_loss.py
+++ b/addons/account/wizard/account_report_profit_loss.py
@ -19,8 +19,6 @@
 #
 ##############################################################################

-from lxml import etree
-
 from osv import osv, fields

 class account_pl_report(osv.osv_memory):
@ -40,21 +38,6 @@ class account_pl_report(osv.osv_memory):
        'target_move': False
    }

-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        mod_obj = self.pool.get('ir.model.data')
-        res = super(account_pl_report, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
-        doc = etree.XML(res['arch'])
-        nodes = doc.xpath("//field[@name='journal_ids']")
-        for node in nodes:
-            node.set('readonly', '1')
-            node.set('required', '0')
-        nodes = doc.xpath("//field[@name='target_move']")
-        for node in nodes:
-            node.set('readonly', '1')
-            node.set('required', '0')
-        res['arch'] = etree.tostring(doc)
-        return res
-
    def _print_report(self, cr, uid, ids, data, context=None):
        if context is None:
            context = {}
@ -75,4 +58,4 @@ class account_pl_report(osv.osv_memory):

 account_pl_report()

-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
--- a/addons/account/wizard/account_report_profit_loss_view.xml
+++ b/addons/account/wizard/account_report_profit_loss_view.xml
@ -9,6 +9,12 @@
            <field name="inherit_id" ref="account.account_common_report_view" />
            <field name="arch" type="xml">
            <data>
+            <xpath expr="//field[@name='target_move']" position="replace">
+                <field name="target_move" required="0" readonly="1"/>
+            </xpath>
+            <xpath expr="//field[@name='journal_ids']" position="replace">
+                <field name="journal_ids" required="0" colspan="4" nolabel="1" readonly="1"/>
+            </xpath>
            <xpath expr="/form/label[@string='']" position="replace">
                <separator string="Profit And Loss" colspan="4"/>
                <label nolabel="1" colspan="4" string="The Profit and Loss report gives you an overview of your company profit and loss in a single document"/>
--- a/addons/account/wizard/account_state_open.py
+++ b/addons/account/wizard/account_state_open.py
@ -37,7 +37,7 @@ class account_state_open(osv.osv_memory):
                raise osv.except_osv(_('Warning'), _('Invoice is already reconciled'))
            wf_service = netsvc.LocalService("workflow")
            res = wf_service.trg_validate(uid, 'account.invoice', context['active_ids'][0], 'open_test', cr)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}

 account_state_open()

--- a/Show More
+++ b/Show More