[MERGE]: Merge with lp:openobject-addons-trunk

bzr revid: ksa@tinyerp.co.in-20100819064459-p6a7lt1zfe364tzr
2010-08-19 12:14:59 +05:30 · 2010-08-19 12:14:59 +05:30 · 388427f4b4
parent dc0d1eee58 78e8b8168e
commit 388427f4b4
260 changed files with 2477 additions and 1631 deletions
--- a/addons/account/account.py
+++ b/addons/account/account.py
@ -197,19 +197,6 @@ class account_account(osv.osv):
    _parent_store = True
    logger = netsvc.Logger()

-    def _get_children_and_consol(self, cr, uid, ids, context={}):
-        ids2=[]
-        temp=[]
-        read_data= self.read(cr, uid, ids,['id','child_id'], context)
-        for data in read_data:
-            ids2.append(data['id'])
-            if data['child_id']:
-                temp=[]
-                for x in data['child_id']:
-                    temp.append(x)
-                ids2 += self._get_children_and_consol(cr, uid, temp, context)
-        return ids2
-
    def search(self, cr, uid, args, offset=0, limit=None, order=None,
            context=None, count=False):
        if context is None:
@ -244,7 +231,9 @@ class account_account(osv.osv):
        return super(account_account, self).search(cr, uid, args, offset, limit,
                order, context=context, count=count)

-    def _get_children_and_consol(self, cr, uid, ids, context={}):
+    def _get_children_and_consol(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
        #this function search for all the children and all consolidated children (recursively) of the given account ids
        ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)], context=context)
        ids3 = []
@ -418,16 +407,9 @@ class account_account(osv.osv):
        'level': fields.function(_get_level, string='Level', method=True, store=True, type='integer'),
    }

-    def _default_company(self, cr, uid, context={}):
-        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        if user.company_id:
-            return user.company_id.id
-        return self.pool.get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
-
    _defaults = {
        'type': lambda *a : 'view',
        'reconcile': lambda *a: False,
-        'company_id': _default_company,
        'active': lambda *a: True,
        'check_history': lambda *a: True,
        'currency_mode': lambda *a: 'current',
@ -795,10 +777,8 @@ class account_fiscalyear(osv.osv):
        'date_start': fields.date('Start Date', required=True),
        'date_stop': fields.date('End Date', required=True),
        'period_ids': fields.one2many('account.period', 'fiscalyear_id', 'Periods'),
-        'state': fields.selection([('draft','Draft'), ('done','Done')], 'State', readonly=True,
-                                  help='When fiscal year is created. The state is \'Draft\'. At the end of the year it is in \'Done\' state.'),
+        'state': fields.selection([('draft','Open'), ('done','Closed')], 'State', readonly=True),
    }
-
    _defaults = {
        'state': lambda *a: 'draft',
        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
@ -875,11 +855,10 @@ class account_period(osv.osv):
        'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', required=True, states={'done':[('readonly',True)]}, select=True),
        'state': fields.selection([('draft','Draft'), ('done','Done')], 'State', readonly=True,
                                  help='When monthly periods are created. The state is \'Draft\'. At the end of monthly period it is in \'Done\' state.'),
-        'company_id': fields.related('fiscalyear_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True)
+        'company_id': fields.related('fiscalyear_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True)
    }
    _defaults = {
        'state': lambda *a: 'draft',
-        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
    }
    _order = "date_start"

@ -1010,7 +989,6 @@ class account_journal_period(osv.osv):
    _defaults = {
        'state': lambda *a: 'draft',
        'active': lambda *a: True,
-        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
    }
    _order = "period_id"

@ -1055,13 +1033,13 @@ class account_move(osv.osv):
        ids = []
        if name:
            ids += self.search(cr, user, [('name','ilike',name)]+args, limit=limit, context=context)
-        
+
        if not ids and name and type(name) == int:
            ids += self.search(cr, user, [('id','=',name)]+args, limit=limit, context=context)

        if not ids:
            ids += self.search(cr, user, args, limit=limit, context=context)
-        
+
        return self.name_get(cr, user, ids, context=context)

    def name_get(self, cursor, user, ids, context=None):
@ -1171,7 +1149,7 @@ class account_move(osv.osv):
                if move.name =='/':
                    new_name = False
                    journal = move.journal_id
-                    
+
                    if invoice and invoice.internal_number:
                        new_name = invoice.internal_number
                    else:
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@ -153,7 +153,7 @@
                        <field domain="[('type', '=', 'purchase')]" name="journal_id"/>
                        <field name="number" readonly="1"/>
                        <field name="type" invisible="1"/>
-                        <field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
+                        <field name="currency_id" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
                        <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
                        <newline/>
                        <field name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" context="{'default_customer': 0}"/>
@ -262,7 +262,7 @@
                    <field name="journal_id" groups="base.group_user"/>
                    <field name="number"/>
                    <field name="type" invisible="1"/>
-                    <field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
+                    <field name="currency_id" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
                    <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
                    <newline/>
                    <field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" groups="base.group_user"/>
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@ -660,7 +660,7 @@
            <field name="view_type">form</field>
            <field name="view_mode">tree,form</field>
        </record>
-        <menuitem action="action_account_type_form" groups="base.group_extended,base.group_system" id="menu_action_account_type_form" parent="menu_low_level"/>
+        <menuitem action="action_account_type_form" groups="base.group_extended" id="menu_action_account_type_form" parent="menu_low_level"/>
        <!--
    Entries
    -->
@ -676,6 +676,7 @@
                    <field name="period_id"/>
                    <field name="journal_id"/>
                    <field name="partner_id"/>
+                    <field name="reconcile_id"/>
                    <field name="amount" sum="Total Amount"/>
                    <field name="state"/>
                </tree>
@ -2142,7 +2143,7 @@
            <field name="view_mode">tree,form,search</field>
        </record>

-        <menuitem action="action_account_chart_template_form" id="menu_action_account_chart_template_form" parent="account_template_accounts"/>
+        <menuitem action="action_account_chart_template_form" id="menu_action_account_chart_template_form" parent="account_template_accounts" sequence="1"/>

        <!-- Account Tax Templates -->

@ -2326,8 +2327,7 @@
                          <attribute name='string'></attribute>
                  </xpath>
                <group string="res_config_contents" position="replace">
-                  <field name="company_id"  widget="selection"
-                         />
+                  <field name="company_id" widget="selection"/>
                  <field name ="code_digits" />
                  <field name="chart_template_id"/>
                  <field name ="seq_journal" />
@ -2428,7 +2428,7 @@
        <menuitem
            action="action_account_fiscal_position_template_form"
            id="menu_action_account_fiscal_position_form_template"
-            parent="account_template_folder" sequence="20"/>
+            parent="account_template_taxes" sequence="20"/>

        <!-- Cash Statement -->
        <record id="view_cash_statement_tree" model="ir.ui.view">
--- a/addons/account/i18n/da.po
+++ b/addons/account/i18n/da.po
@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 11:32+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:26+0000\n"
+"Last-Translator: vra (openerp) <Unknown>\n"
 "Language-Team: Danish <da@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-08-18 10:32+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 11:15+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:23+0000\n"
+"Last-Translator: vra (openerp) <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-08-18 10:32+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account
--- a/addons/account/i18n/es_EC.po
+++ b/addons/account/i18n/es_EC.po
@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 00:05+0000\n"
+"PO-Revision-Date: 2010-08-18 18:15+0000\n"
 "Last-Translator: Cristian Salamea (GnuThink) <ovnicraft@gmail.com>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@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-08-18 10:33+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account
@ -903,13 +903,13 @@ msgstr "Cuenta de gastos"
 #. module: account
 #: wizard_field:account.move.line.reconcile,addendum,journal_id:0
 msgid "Write-Off Journal"
-msgstr ""
+msgstr "Diario de desajuste"

 #. module: account
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
 msgid "Amount Currency"
-msgstr ""
+msgstr "Importe de Moneda"

 #. module: account
 #: field:account.chart.template,property_account_expense_categ:0
@ -919,7 +919,7 @@ msgstr ""
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,fy2_id:0
 msgid "New Fiscal Year"
-msgstr ""
+msgstr "Nuevo ejercicio fiscal"

 #. module: account
 #: help:account.tax,tax_group:0
@ -933,12 +933,12 @@ msgstr ""
 #. module: account
 #: wizard_field:account.open_closed_fiscalyear,init,fyear_id:0
 msgid "Fiscal Year to Open"
-msgstr ""
+msgstr "Ejercicio fiscal a abrir"

 #. module: account
 #: view:account.config.wizard:0
 msgid "Select Chart of Accounts"
-msgstr ""
+msgstr "Seleccionar plan contable"

 #. module: account
 #: field:account.analytic.account,quantity:0
@ -964,7 +964,7 @@ msgstr "Fecha final"
 #. module: account
 #: field:account.invoice.tax,base_amount:0
 msgid "Base Code Amount"
-msgstr ""
+msgstr "Importe código base"

 #. module: account
 #: help:account.journal,user_id:0
@ -980,7 +980,7 @@ msgstr "Cuenta debe por defecto"
 #: model:ir.actions.act_window,name:account.action_bank_statement_tree
 #: model:ir.ui.menu,name:account.menu_bank_statement_tree
 msgid "Entries by Statements"
-msgstr ""
+msgstr "Asientos por extractos bancarios"

 #. module: account
 #: model:process.transition,name:account.process_transition_analyticinvoice0
@ -1039,7 +1039,7 @@ msgstr "Posición fiscal"
 #: field:account.analytic.line,product_uom_id:0
 #: field:account.move.line,product_uom_id:0
 msgid "UoM"
-msgstr ""
+msgstr "UdM"

 #. module: account
 #: wizard_field:account.third_party_ledger.report,init,page_split:0
@ -1055,7 +1055,7 @@ msgstr "Hijos"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
 msgid "Fiscal Position Taxes Mapping"
-msgstr ""
+msgstr "Mapeo de Impuestos segun tipo de Contribuyente"

 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new
--- a/addons/account/i18n/hu.po
+++ b/addons/account/i18n/hu.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 11:28+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:17+0000\n"
+"Last-Translator: vra (openerp) <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-08-18 10:32+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account
--- 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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 11:33+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 20:38+0000\n"
+"Last-Translator: Andrea <amarin@mr-service.it>\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-08-18 10:32+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account
@ -6271,33 +6271,33 @@ msgstr ""
 #. module: account
 #: field:temp.range,name:0
 msgid "Range"
-msgstr ""
+msgstr "Intervallo"

 #. module: account
 #: model:ir.module.module,description:report_account.module_meta_information
 msgid "A module that adds new reports based on the account module."
-msgstr ""
+msgstr "Modulo che aggiunge nuovi report basati sul modulo Conti (Account)"

 #. module: account
 #: model:ir.module.module,shortdesc:report_account.module_meta_information
 msgid "Account Reporting - Reporting"
-msgstr ""
+msgstr "Resoconto - Rapporto"

 #. module: account
 #: model:ir.actions.act_window,name:report_account.action_account_receivable_graph
 #: model:ir.ui.menu,name:report_account.menu_account_receivable_graph
 msgid "Balance by Type of Account"
-msgstr ""
+msgstr "Saldo per Tipo Conto"

 #. module: account
 #: field:report.account.receivable,name:0
 msgid "Week of Year"
-msgstr ""
+msgstr "Settimana dell'anno"

 #. module: account
 #: field:report.invoice.created,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Data di Creazione"

 #. module: account
 #: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph
@ -6308,7 +6308,7 @@ msgstr ""
 #. module: account
 #: view:report.invoice.created:0
 msgid "Untaxed Amount"
-msgstr ""
+msgstr "Importo non tassato"

 #~ msgid "account.config.wizard"
 #~ msgstr "account.config.wizard"
--- a/addons/account/i18n/lt.po
+++ b/addons/account/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 11:28+0000\n"
+"PO-Revision-Date: 2010-08-18 13:14+0000\n"
 "Last-Translator: Giedrius Slavinskas <giedrius.slavinskas@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-08-18 10:32+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account
--- a/addons/account/i18n/pl.po
+++ b/addons/account/i18n/pl.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 11:28+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:14+0000\n"
+"Last-Translator: vra (openerp) <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-08-18 10:33+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account
--- a/addons/account/i18n/sq.po
+++ b/addons/account/i18n/sq.po
@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: ASTRIT BOKSHI <astritbokshi@gmail.com>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 08:43+0000\n"
+"PO-Revision-Date: 2010-08-18 13:08+0000\n"
 "Last-Translator: bokshas <astritbokshi@gmail.com>\n"
 "Language-Team: Albanian <sq@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-08-18 10:32+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account
--- a/addons/account/i18n/sv.po
+++ b/addons/account/i18n/sv.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 11:29+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:18+0000\n"
+"Last-Translator: vra (openerp) <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-08-18 10:33+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account
--- a/addons/account/i18n/tr.po
+++ b/addons/account/i18n/tr.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 11:31+0000\n"
+"PO-Revision-Date: 2010-08-18 13:19+0000\n"
 "Last-Translator: Omer Barlas <omer@barlas.com.tr>\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-08-18 10:33+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 08:40+0000\n"
+"PO-Revision-Date: 2010-08-18 13:13+0000\n"
 "Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-18 10:33+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@ -539,22 +539,21 @@ class account_invoice(osv.osv):
            if journal_ids:
                val['journal_id'] = journal_ids[0]
            else:
-                raise osv.except_osv(_('Configuration Error !'),
-                                _('Can not find account journal for this company in invoice, Please Create journal.'))
+                raise osv.except_osv(_('Configuration Error !'), _('Can\'t find any account journal of %s type for this company.\n\nYou can create one in the menu: \nConfiguration\Financial Accounting\Accounts\Journals.' % (journal_type)))
            dom = {'journal_id':  [('id', 'in', journal_ids)]}
        else:
            journal_ids = obj_journal.search(cr, uid, [])

        if currency_id and company_id:
            currency = self.pool.get('res.currency').browse(cr, uid, currency_id)
-            if currency.company_id.id != company_id:
+            if currency.company_id and currency.company_id.id != company_id:
                val['currency_id'] = False
            else:
                val['currency_id'] = currency.id

        if company_id:
            company = self.pool.get('res.company').browse(cr, uid, company_id)
-            if company.currency_id.company_id.id != company_id:
+            if company.currency_id.company_id and company.currency_id.company_id.id != company_id:
                val['currency_id'] = False
            else:
                val['currency_id'] = company.currency_id.id
@ -1386,10 +1385,6 @@ class account_invoice_line(osv.osv):
        company = self.pool.get('res.company').browse(cr, uid, company_id)
        currency = self.pool.get('res.currency').browse(cr, uid, currency_id)

-        if not currency.company_id.id == company.id:
-            raise osv.except_osv(_('Configuration Error !'),
-                        _('Can not select currency that is not related to any company.\nPlease select accordingly !.'))
-
        if company.currency_id.id != currency.id:
            new_price = res_final['value']['price_unit'] * currency.rate
            res_final['value']['price_unit'] = new_price
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@ -34,10 +34,6 @@
        <field eval="[(6,0,[ref('group_account_invoice'), ref('group_account_user'),ref('group_account_manager')])]" name="groups_id"/>
    </record>

-    <record id="menu_automatic_reconcile" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
-    </record>
-
    <record id="menu_finance_charts" model="ir.ui.menu">
        <field eval="[(6,0,[ref('group_account_user'), ref('group_account_manager')])]" name="groups_id"/>
    </record>
@ -102,10 +98,6 @@
        <field eval="[(6,0,[ref('group_account_user'),ref('group_account_manager'),ref('base.group_system')])]" name="groups_id"/>
    </record>

-    <record id="menu_action_analytic_account_tree2" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
-    </record>
-
    <record id="menu_finance_periodical_processing" model="ir.ui.menu">
        <field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
    </record>
@ -134,10 +126,6 @@
        <field eval="[(6,0,[ref('group_account_manager'),ref('base.group_system')])]" name="groups_id"/>
    </record>

-    <record id="next_id_40" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_manager'),ref('base.group_system')])]" name="groups_id"/>
-    </record>
-
    <record id="menu_action_account_invoice_report_all" model="ir.ui.menu">
        <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
    </record>
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@ -47,6 +47,8 @@ class account_move_journal(osv.osv_memory):
        journal_pool = self.pool.get('account.journal')
        if context.get('journal_type', False):
            jids = journal_pool.search(cr, uid, [('type','=', context.get('journal_type'))])
+            if not jids:
+                raise osv.except_osv(_('Configuration Error !'), _('Can\'t find any account journal of %s type for this company.\n\nYou can create one in the menu: \nConfiguration\Financial Accounting\Accounts\Journals.' % (context.get('journal_type'))))
            journal_id = jids[0]

        return journal_id
--- a/addons/account_analytic_analysis/i18n/bg.po
+++ b/addons/account_analytic_analysis/i18n/bg.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 11:21+0000\n"
+"PO-Revision-Date: 2010-08-18 13:07+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-18 10:33+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_analytic_analysis
--- a/addons/account_analytic_analysis/i18n/fi.po
+++ b/addons/account_analytic_analysis/i18n/fi.po
@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 11:13+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:22+0000\n"
+"Last-Translator: vra (openerp) <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-18 10:33+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_analytic_analysis
--- a/addons/account_analytic_analysis/i18n/it.po
+++ b/addons/account_analytic_analysis/i18n/it.po
@ -1,19 +1,19 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* account_analytic_analysis
+# 	* account_analytic_analysis
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 15:51+0000\n"
+"PO-Revision-Date: 2010-08-18 12:15+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \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-08-12 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_analytic_analysis
@ -22,6 +22,8 @@ msgid ""
 "Number of hours that can be invoiced plus those that already have been "
 "invoiced."
 msgstr ""
+"Numero di ore che possono essere fatturate più quelle che sono già state "
+"fatturate."

 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
@ -31,17 +33,18 @@ msgstr "Riepilogo ore per utente"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
-msgstr ""
+msgstr "Ultima data di fatturazione"

 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_ca:0
 msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr ""
+"Calcolato usando la formula: Prezzo massimo fattura - Importo fattura."

 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours:0
 msgid "Computed using the formula: Maximum Quantity - Hours Tot."
-msgstr ""
+msgstr "Calcolato usando la formula: Quantità massima - Ore Totali."

 #. module: account_analytic_analysis
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all
@ -52,7 +55,7 @@ msgstr "Elenco contabilità analitiche"
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_open
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_open
 msgid "My Current Accounts"
-msgstr ""
+msgstr "I miei attuali Conti"

 #. module: account_analytic_analysis
 #: constraint:ir.ui.view:0
@ -62,17 +65,17 @@ msgstr "XML non valido per Visualizzazione Architettura!"
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
 msgid "Date of the last invoice created for this analytic account."
-msgstr ""
+msgstr "Data dell'ultima fattura creata per questo conto analitico"

 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_theorical:0
 msgid "Theorical Revenue"
-msgstr ""
+msgstr "Reddito teorico"

 #. module: account_analytic_analysis
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome del modello non valido nella definizione dell'azione."

 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@ -101,13 +104,13 @@ msgstr "Margine teorico"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin_rate:0
 msgid "Real Margin Rate (%)"
-msgstr ""
+msgstr "Tasso di margine reale (%)"

 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_open
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_open
 msgid "Current Analytic Accounts"
-msgstr ""
+msgstr "Conto analitico attuale"

 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_date:0
@ -144,6 +147,8 @@ msgid ""
 "Number of hours you spent on the analytic account (from timesheet). It "
 "computes on all journal of type 'general'."
 msgstr ""
+"Numero di ore dedicate al conto analitico (dal Foglio ore). E stato "
+"calcolato da tutti i Giornali di tipo 'Generale'."

 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_hours:0
@ -157,6 +162,9 @@ msgid ""
 "if all these costs have been invoiced at the normal sale price provided by "
 "the pricelist."
 msgstr ""
+"Basato sul costo che hai sul Progetto, che cosa sarebbe stato il reddito se "
+"tutti questi costi fossero stati fatturati al normale prezzo di vendita "
+"fornito dal listino."

 #. module: account_analytic_analysis
 #: field:account.analytic.account,user_ids:0
@ -168,7 +176,7 @@ msgstr "Utente"
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_pending
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_pending
 msgid "My Pending Accounts"
-msgstr ""
+msgstr "Conti personali pendenti"

 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_my
@ -185,7 +193,7 @@ msgstr "Calcolato utilizzando la formula: importo fatturato - totale costi"
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_managed
 msgid "My Accounts"
-msgstr ""
+msgstr "Conti personali"

 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
@ -194,6 +202,10 @@ msgid ""
 "important data for project manager of services companies.\n"
 "Add menu to show relevant information for each manager."
 msgstr ""
+"Modifica la vista dei conti analitici per mostrare\n"
+"dati importanti per il Responsabile dei Progetti di una Compagnia di "
+"servizi.\n"
+"Aggiunge un menù per mostrare informazioni di nota per ogni Responsabile."

 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_non_invoiced:0
@ -213,7 +225,7 @@ msgstr "Contabilità Analitica"
 #. module: account_analytic_analysis
 #: model:ir.module.module,shortdesc:account_analytic_analysis.module_meta_information
 msgid "report_account_analytic"
-msgstr ""
+msgstr "report_account_analytic"

 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_invoiced:0
@ -254,7 +266,7 @@ msgstr "Margine reale"
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_invoiced:0
 msgid "Total customer invoiced amount for this account."
-msgstr ""
+msgstr "Importo totale fatture cliente  per questo conto"

 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_month
@ -284,7 +296,7 @@ msgstr "Contabilità Analitica"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_ca:0
 msgid "Remaining Revenue"
-msgstr ""
+msgstr "Reddito rimanente"

 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_to_invoice:0
@ -292,6 +304,8 @@ msgid ""
 "If invoice from analytic account, the remaining amount you can invoice to "
 "the customer based on the total costs."
 msgstr ""
+"Se fattura generata dal conto analitico, il rimanente importo lo puoi "
+"fatturare al cliente basandosi sui costi totali."

 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
@ -301,7 +315,7 @@ msgstr "Calcolato utilizzando la formula: Totale fatturato / tot. ore"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
 msgid "Revenue per Hours (real)"
-msgstr ""
+msgstr "Reddito orario (reale)"

 #. module: account_analytic_analysis
 #: field:account_analytic_analysis.summary.month,unit_amount:0
@ -325,13 +339,13 @@ msgstr "Contabilità Analitica"
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_overpassed
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_managed_overpassed
 msgid "Overpassed Accounts"
-msgstr ""
+msgstr "Conti oltrepassati"

 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_all
 msgid "All Uninvoiced Entries"
-msgstr ""
+msgstr "Tutte le voci fatturate"

 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0
@ -339,3 +353,5 @@ msgid ""
 "Total of costs for this account. It includes real costs (from invoices) and "
 "indirect costs, like time spent on timesheets."
 msgstr ""
+"Totale dei costi per questo conto. Include i costi reali (dalle fatture) e i "
+"costi indiretti, come il tempo speso sul Foglio Orario."
--- a/addons/account_analytic_analysis/i18n/lt.po
+++ b/addons/account_analytic_analysis/i18n/lt.po
@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 11:34+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:28+0000\n"
+"Last-Translator: vra (openerp) <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-08-18 10:33+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_analytic_analysis
--- a/addons/account_analytic_analysis/i18n/tr.po
+++ b/addons/account_analytic_analysis/i18n/tr.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 11:17+0000\n"
+"PO-Revision-Date: 2010-08-18 13:06+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-18 10:33+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_analytic_analysis
--- a/addons/account_analytic_default/i18n/lt.po
+++ b/addons/account_analytic_default/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 11:21+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:07+0000\n"
+"Last-Translator: vra (openerp) <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-08-18 10:33+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_analytic_default
--- a/addons/account_analytic_default/i18n/tr.po
+++ b/addons/account_analytic_default/i18n/tr.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 11:17+0000\n"
+"PO-Revision-Date: 2010-08-18 13:06+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-18 10:33+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_analytic_default
--- a/addons/account_analytic_plans/i18n/lt.po
+++ b/addons/account_analytic_plans/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 11:19+0000\n"
+"PO-Revision-Date: 2010-08-18 13:07+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-18 10:33+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_analytic_plans
--- a/addons/account_analytic_plans/i18n/tr.po
+++ b/addons/account_analytic_plans/i18n/tr.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 11:27+0000\n"
+"PO-Revision-Date: 2010-08-18 13:14+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-18 10:33+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_analytic_plans
--- a/addons/account_budget/i18n/lt.po
+++ b/addons/account_budget/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 11:35+0000\n"
+"PO-Revision-Date: 2010-08-18 13:28+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-18 10:34+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_budget
--- a/addons/account_budget/i18n/tr.po
+++ b/addons/account_budget/i18n/tr.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 11:36+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:28+0000\n"
+"Last-Translator: vra (openerp) <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-08-18 10:34+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_budget
--- a/addons/account_coda/i18n/ar.po
+++ b/addons/account_coda/i18n/ar.po
@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-11-24 13:11+0000\n"
-"PO-Revision-Date: 2010-08-17 08:53+0000\n"
+"PO-Revision-Date: 2010-08-18 13:22+0000\n"
 "Last-Translator: bamuhrez <bamuhrez@gmail.com>\n"
 "Language-Team: Arabic <ar@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-08-18 10:34+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_coda
--- a/addons/account_followup/i18n/lt.po
+++ b/addons/account_followup/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 11:27+0000\n"
+"PO-Revision-Date: 2010-08-18 13:14+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-18 10:32+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_followup
--- a/addons/account_followup/i18n/tr.po
+++ b/addons/account_followup/i18n/tr.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 11:16+0000\n"
+"PO-Revision-Date: 2010-08-18 13:06+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-18 10:32+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_followup
--- a/addons/account_invoice_layout/i18n/it.po
+++ b/addons/account_invoice_layout/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 21:43+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-08-18 16:43+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet <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-08-12 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_invoice_layout
@ -37,7 +37,7 @@ msgstr ""
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Cancelled Invoice"
-msgstr ""
+msgstr "Fattura cancellata"

 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@ -48,7 +48,7 @@ msgstr "Titolo"
 #. module: account_invoice_layout
 #: model:ir.actions.wizard,name:account_invoice_layout.wizard_notify_message
 msgid "Invoices with Layout and Message"
-msgstr ""
+msgstr "Fatture con Layout e Messaggi"

 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
@ -58,7 +58,7 @@ msgstr "Sconto (%)"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "(Incl. taxes):"
-msgstr ""
+msgstr "(Tasse Incluse):"

 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@ -86,7 +86,7 @@ msgstr "Prezzo Unitario"
 #. module: account_invoice_layout
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome modello non valido nella definizione dell'azione."

 #. module: account_invoice_layout
 #: model:ir.model,name:account_invoice_layout.model_notify_message
@ -121,7 +121,7 @@ msgstr "Rif. Cliente:"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid ")"
-msgstr ""
+msgstr ")"

 #. module: account_invoice_layout
 #: field:account.invoice.line,state:0
@ -136,7 +136,7 @@ msgstr "Prezzo"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "/ ("
-msgstr ""
+msgstr "/ ("

 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
@ -151,7 +151,7 @@ msgstr "Account origine"
 #. module: account_invoice_layout
 #: model:ir.actions.act_window,name:account_invoice_layout.notify_mesage_tree_form
 msgid "Write Messages"
-msgstr ""
+msgstr "Scrivi Messaggi"

 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
@ -191,7 +191,7 @@ msgstr "Interruzione di pagina"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Document:"
-msgstr ""
+msgstr "Documento:"

 #. module: account_invoice_layout
 #: wizard_view:wizard.notify_message,init:0
@ -211,12 +211,12 @@ msgstr "Prodotto"
 #. module: account_invoice_layout
 #: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_1
 msgid "Invoices with Layout"
-msgstr ""
+msgstr "Fattura con Layout"

 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Description / Taxes"
-msgstr ""
+msgstr "Descrizione / Tasse"

 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
@ -226,7 +226,7 @@ msgstr "Importo"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Description/Taxes"
-msgstr ""
+msgstr "Descrizione / Tasse"

 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
@ -266,7 +266,7 @@ msgstr "Fattura Fornitore"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Note :"
-msgstr ""
+msgstr "Annotazioni:"

 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
@ -276,12 +276,12 @@ msgstr "Tassa"
 #. module: account_invoice_layout
 #: model:ir.module.module,shortdesc:account_invoice_layout.module_meta_information
 msgid "account_invoice_layout"
-msgstr ""
+msgstr "account_invoice_layout"

 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Total (Excl. taxes):"
-msgstr ""
+msgstr "Totale (Tasse Escluse)"

 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
--- a/addons/account_invoice_layout/i18n/lt.po
+++ b/addons/account_invoice_layout/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 11:27+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:13+0000\n"
+"Last-Translator: vra (openerp) <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-08-18 10:33+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_invoice_layout
--- a/addons/account_invoice_layout/i18n/tr.po
+++ b/addons/account_invoice_layout/i18n/tr.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 11:38+0000\n"
+"PO-Revision-Date: 2010-08-18 13:37+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-18 10:33+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_invoice_layout
--- a/addons/account_payment/i18n/lt.po
+++ b/addons/account_payment/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 11:13+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:22+0000\n"
+"Last-Translator: vra (openerp) <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-08-18 10:33+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_payment
--- a/addons/account_payment/i18n/tr.po
+++ b/addons/account_payment/i18n/tr.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 11:14+0000\n"
+"PO-Revision-Date: 2010-08-18 13:23+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-18 10:33+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_payment
--- a/addons/account_payment/wizard/account_payment_pay.py
+++ b/addons/account_payment/wizard/account_payment_pay.py
@ -38,15 +38,15 @@ class account_payment_make_payment(osv.osv_memory):
            obj_payment_order.set_done(cr,uid,context['active_id'],context)
            return {}

-        gw= obj_payment_order.get_wizard(t)
+        gw = obj_payment_order.get_wizard(t)
        if not gw:
            obj_payment_order.set_done(cr,uid,context['active_id'],context)
            return {}

        module, wizard= gw
-        result = mod_obj._get_id(cr, uid, module, wizard)
-        id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
-        return act_obj.read(cr, uid, [id])[0]
+        result = obj_model._get_id(cr, uid, module, wizard)
+        id = obj_model.read(cr, uid, [result], ['res_id'])[0]['res_id']
+        return obj_act.read(cr, uid, [id])[0]
        #result['context'] = str({'fiscalyear': data['form']['fiscalyear']})


--- a/addons/account_report/i18n/it.po
+++ b/addons/account_report/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-16 14:41+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-08-18 16:40+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet <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-08-12 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_report
@ -21,17 +21,17 @@ msgstr ""
 #: selection:account.report.report,type:0
 #: model:ir.model,name:account_report.model_account_report_history
 msgid "Indicator"
-msgstr ""
+msgstr "Indicatore"

 #. module: account_report
 #: wizard_field:print.indicators.pdf,init,file:0
 msgid "Select a PDF File"
-msgstr ""
+msgstr "Seleziona un file PDF"

 #. module: account_report
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome modello non valido nella definizione dell'azione."

 #. module: account_report
 #: view:account.report.report:0
@ -46,7 +46,7 @@ msgstr "Genitore"
 #. module: account_report
 #: field:account.report.report,disp_graph:0
 msgid "Display As Graph"
-msgstr ""
+msgstr "Visualizza come Grafico"

 #. module: account_report
 #: view:account.report.report:0
@ -66,7 +66,7 @@ msgstr ""
 #. module: account_report
 #: rml:print.indicators:0
 msgid "Tabular Summary"
-msgstr ""
+msgstr "Tabella di Riepilogo"

 #. module: account_report
 #: view:account.report.report:0
@ -81,7 +81,7 @@ msgstr ""
 #. module: account_report
 #: view:account.report.report:0
 msgid "Very bad"
-msgstr ""
+msgstr "Pessima"

 #. module: account_report
 #: field:account.report.history,val:0
@ -103,7 +103,7 @@ msgstr "Cattiva"
 #. module: account_report
 #: wizard_view:print.indicators.pdf,init:0
 msgid "Select the PDF file on which Indicators will be printed."
-msgstr ""
+msgstr "Seleziona il file PDF su cui gli indicatori saranno stampati"

 #. module: account_report
 #: view:account.report.report:0
@ -118,12 +118,12 @@ msgstr ""
 #. module: account_report
 #: selection:account.report.report,status:0
 msgid "Very Bad"
-msgstr ""
+msgstr "Pessima"

 #. module: account_report
 #: model:ir.actions.act_window,name:account_report.account_report_history_record_structure
 msgid "Indicator history"
-msgstr ""
+msgstr "Storico dell'indicatore"

 #. module: account_report
 #: view:account.report.report:0
@ -143,18 +143,18 @@ msgstr ""
 #. module: account_report
 #: wizard_button:print.indicators,init,next:0
 msgid "Next"
-msgstr ""
+msgstr "Prossimo"

 #. module: account_report
 #: model:ir.module.module,shortdesc:account_report.module_meta_information
 msgid "Reporting for accounting"
-msgstr ""
+msgstr "Stampe per personale contabile"

 #. module: account_report
 #: wizard_button:print.indicators,next,print:0
 #: wizard_button:print.indicators.pdf,init,print:0
 msgid "Print"
-msgstr ""
+msgstr "Stampa"

 #. module: account_report
 #: field:account.report.report,type:0
@ -164,7 +164,7 @@ msgstr "Tipo"
 #. module: account_report
 #: model:ir.actions.report.xml,name:account_report.report_indicator_pdf
 msgid "Print Indicators in PDF"
-msgstr ""
+msgstr "Stampa gli indicatori in PDF"

 #. module: account_report
 #: view:account.report.report:0
@ -180,7 +180,7 @@ msgstr "Buona"
 #. module: account_report
 #: view:account.report.history:0
 msgid "Account Report History"
-msgstr ""
+msgstr "Report Storico Conti"

 #. module: account_report
 #: constraint:ir.ui.view:0
@ -190,12 +190,12 @@ msgstr "XML non valido per Visualizzazione Architettura!"
 #. module: account_report
 #: help:account.report.report,badness_limit:0
 msgid "This Value sets the limit of badness."
-msgstr ""
+msgstr "Questo valore è impostato al limite del peggiore."

 #. module: account_report
 #: wizard_field:print.indicators,init,select_base:0
 msgid "Choose Criteria"
-msgstr ""
+msgstr "Seleziona il criterio"

 #. module: account_report
 #: view:account.report.report:0
@ -264,27 +264,27 @@ msgstr "Attivo"
 #. module: account_report
 #: field:account.report.report,disp_tree:0
 msgid "Display Tree"
-msgstr ""
+msgstr "Visualizza ad Albero"

 #. module: account_report
 #: selection:print.indicators,init,select_base:0
 msgid "Based On Fiscal Years"
-msgstr ""
+msgstr "Basato su anni fiscali"

 #. module: account_report
 #: model:ir.model,name:account_report.model_account_report_report
 msgid "Account reporting"
-msgstr ""
+msgstr "Stampe del piano dei conti"

 #. module: account_report
 #: view:account.report.report:0
 msgid "Account Balance:"
-msgstr ""
+msgstr "Saldo Contabile:"

 #. module: account_report
 #: rml:print.indicators:0
 msgid "Expression :"
-msgstr ""
+msgstr "Espressione :"

 #. module: account_report
 #: view:account.report.report:0
@ -299,7 +299,7 @@ msgstr "Espressione"
 #. module: account_report
 #: view:account.report.report:0
 msgid "Accounting reporting"
-msgstr ""
+msgstr "Report per personale Contabile"

 #. module: account_report
 #: model:ir.actions.act_window,name:account_report.action_account_report_form
@ -316,12 +316,12 @@ msgstr "Codice"
 #. module: account_report
 #: field:account.report.history,tmp:0
 msgid "temp"
-msgstr ""
+msgstr "temporaneo"

 #. module: account_report
 #: field:account.report.history,period_id:0
 msgid "Period"
-msgstr ""
+msgstr "Periodo"

 #. module: account_report
 #: view:account.report.report:0
@ -331,19 +331,19 @@ msgstr "Generale"
 #. module: account_report
 #: view:account.report.report:0
 msgid "Legend of operators"
-msgstr ""
+msgstr "Legenda degli operatori"

 #. module: account_report
 #: wizard_button:print.indicators,init,end:0
 #: wizard_button:print.indicators,next,end:0
 #: wizard_button:print.indicators.pdf,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Annulla"

 #. module: account_report
 #: field:account.report.report,child_ids:0
 msgid "Children"
-msgstr ""
+msgstr "Figlio"

 #. module: account_report
 #: constraint:ir.model:0
@ -364,7 +364,7 @@ msgstr ""
 #: wizard_view:print.indicators,init:0
 #: wizard_view:print.indicators,next:0
 msgid "Print Indicators"
-msgstr ""
+msgstr "Stampa Indicatori"

 #. module: account_report
 #: view:account.report.report:0
@ -380,7 +380,7 @@ msgstr "Data di stampa:"
 #. module: account_report
 #: model:ir.actions.wizard,name:account_report.wizard_indicators_with_pdf
 msgid "Indicators in PDF"
-msgstr ""
+msgstr "Indicatori in PDF"

 #. module: account_report
 #: rml:accounting.report:0
@ -391,7 +391,7 @@ msgstr "a"
 #. module: account_report
 #: rml:accounting.report:0
 msgid "Accounting Report"
-msgstr ""
+msgstr "Stampe per personale contabile"

 #. module: account_report
 #: field:account.report.report,goodness_limit:0
@ -402,7 +402,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_other
 #: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view_other
 msgid "Other reports"
-msgstr ""
+msgstr "Modulo: account_report"

 #. module: account_report
 #: view:account.report.report:0
@ -414,7 +414,7 @@ msgstr ""
 #. module: account_report
 #: rml:print.indicators:0
 msgid ")"
-msgstr ""
+msgstr ")"

 #. module: account_report
 #: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_fiscal
@ -425,13 +425,13 @@ msgstr ""
 #. module: account_report
 #: selection:print.indicators,init,select_base:0
 msgid "Based on Fiscal Periods"
-msgstr ""
+msgstr "Basato su Periodi Fiscali"

 #. module: account_report
 #: model:ir.actions.report.xml,name:account_report.report_print_indicators
 #: rml:print.indicators:0
 msgid "Indicators"
-msgstr ""
+msgstr "Indicatori"

 #. module: account_report
 #: wizard_view:print.indicators.pdf,init:0
@ -454,7 +454,7 @@ msgstr "Nome"
 #. module: account_report
 #: wizard_field:print.indicators,next,base_selection:0
 msgid "Select Criteria"
-msgstr ""
+msgstr "Seleziona il criterio"

 #. module: account_report
 #: view:account.report.report:0
@ -464,7 +464,7 @@ msgstr ""
 #. module: account_report
 #: field:account.report.history,fiscalyear_id:0
 msgid "Fiscal Year"
-msgstr ""
+msgstr "Anno Fiscale"

 #. module: account_report
 #: model:ir.actions.act_window,name:account_report.action_account_report_tree
@ -477,17 +477,17 @@ msgstr "Report personalizzato"
 #. module: account_report
 #: rml:print.indicators:0
 msgid "Page"
-msgstr ""
+msgstr "Pagina"

 #. module: account_report
 #: selection:account.report.report,type:0
 msgid "View"
-msgstr ""
+msgstr "Visualizza"

 #. module: account_report
 #: rml:print.indicators:0
 msgid "Indicators -"
-msgstr ""
+msgstr "Indicatori -"

 #. module: account_report
 #: help:account.report.report,disp_graph:0
@ -495,11 +495,13 @@ msgid ""
 "If the field is set to True, information will be printed as a Graph, "
 "otherwise as an array."
 msgstr ""
+"Se il campo è impostato a Vero, l'informazione verrà stampante come un "
+"Grafico, altrimenti come una lista."

 #. module: account_report
 #: view:account.report.report:0
 msgid "Return value for status"
-msgstr ""
+msgstr "Valore ritornato per lo Stato"

 #. module: account_report
 #: field:account.report.report,sequence:0
@ -514,7 +516,7 @@ msgstr "Importo"
 #. module: account_report
 #: rml:print.indicators:0
 msgid "1cm 27.7cm 20cm 27.7cm"
-msgstr ""
+msgstr "1cm 27.7cm 20cm 27.7cm"

 #. module: account_report
 #: model:ir.module.module,description:account_report.module_meta_information
--- a/addons/account_report/i18n/lt.po
+++ b/addons/account_report/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 11:38+0000\n"
+"PO-Revision-Date: 2010-08-18 13:21+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-18 10:31+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_report
--- a/addons/account_report/i18n/tr.po
+++ b/addons/account_report/i18n/tr.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 11:32+0000\n"
+"PO-Revision-Date: 2010-08-18 13:25+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-18 10:31+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_report
--- a/addons/account_reporting/i18n/it.po
+++ b/addons/account_reporting/i18n/it.po
@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-18 10:34+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_reporting
--- a/addons/account_reporting/i18n/lt.po
+++ b/addons/account_reporting/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 09:28+0000\n"
+"PO-Revision-Date: 2010-08-18 13:19+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-18 10:34+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_reporting
--- a/addons/account_reporting/i18n/tr.po
+++ b/addons/account_reporting/i18n/tr.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 11:31+0000\n"
+"PO-Revision-Date: 2010-08-18 13:19+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-18 10:34+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_reporting
--- a/addons/account_tax_include/i18n/tr.po
+++ b/addons/account_tax_include/i18n/tr.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 11:38+0000\n"
+"PO-Revision-Date: 2010-08-18 13:21+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-18 10:32+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_tax_include
--- a/addons/account_voucher/openerp.py
+++ b/addons/account_voucher/openerp.py
@ -41,10 +41,11 @@
        "voucher_sequence.xml",
        "voucher_workflow.xml",
        "voucher_report.xml",
-        "voucher_view.xml",
-        "voucher_wizard.xml",
        "wizard/account_voucher_open_view.xml",
-
+        "voucher_view.xml",
+        "voucher_sales_purchase_view.xml",
+        "voucher_payment_receipt_view.xml",
+        "voucher_wizard.xml"
    ],
    "test" : [
         "test/account_voucher.yml",
--- a/addons/account_voucher/i18n/lt.po
+++ b/addons/account_voucher/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 11:37+0000\n"
+"PO-Revision-Date: 2010-08-18 13:34+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-18 10:34+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_voucher
--- a/addons/account_voucher/i18n/tr.po
+++ b/addons/account_voucher/i18n/tr.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 11:38+0000\n"
+"PO-Revision-Date: 2010-08-18 13:21+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-18 10:34+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_voucher
--- a/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@ -25,24 +25,6 @@ from osv import fields
 from osv import osv
 from tools.translate import _

-journal2type = {
-    'bank':'receipt',
-    'cash':'receipt',
-    'sale':'sale',
-    'purchase':'purchase'
-}
-
-type2journal = {
-    'rec_voucher': 'cash',
-    'bank_rec_voucher': 'bank',
-    'pay_voucher': 'cash',
-    'bank_pay_voucher': 'bank',
-    'cont_voucher': 'cash',
-    'journal_sale_vou': 'sale',
-    'journal_pur_voucher': 'purchase',
-    'journal_voucher':'general'
-}
-
 class ir_sequence_type(osv.osv):
    _inherit = "ir.sequence.type"
    _columns = {
@ -58,6 +40,71 @@ class account_journal(osv.osv):
    }
 account_journal()

+class account_move(osv.osv):
+    _inherit = 'account.move'
+    
+    def _get_line_ids(self, cr, uid, ids, context=None):
+        result = {}
+        for line in self.pool.get('account.move.line').browse(cr, uid, ids, context=context):
+            result[line.move_id.id] = True
+        return result.keys()
+    
+    def _amount_all(self, cr, uid, ids, name, args, context=None):
+        res = {}
+        for move in self.browse(cr, uid, ids, context=context):
+            rs = {
+                'reconcile_id': False,
+            }
+            for line in move.line_id:
+                if line.reconcile_id:
+                    rs.update({
+                        'reconcile_id': line.reconcile_id.id
+                    })
+                    break
+            res[move.id] = rs
+        return res
+    
+    _columns = {
+        'reconcile_id': fields.function(_amount_all, method=True, type="many2one", relation="account.move.reconcile", select=True, string='Reconcile',
+            store=True,
+            multi='all'),
+    }
+    
+    def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
+        """
+        Returns a list of ids based on search domain {args}
+    
+        @param cr: A database cursor
+        @param user: ID of the user currently logged in
+        @param args: list of conditions to be applied in search opertion
+        @param offset: default from first record, you can start from nth record
+        @param limit: number of records to be obtained as a result of search opertion
+        @param order: ordering on any field(s)
+        @param context: context arguments, like lang, time zone
+        @param count: 
+        
+        @return: Returns a list of ids based on search domain
+        """
+        if not context:
+            context = {}
+        ttype = context.get('type', False)
+        partner = context.get('partner_id', False)
+        voucher = context.get('voucher', False)
+        if voucher and not partner:
+            raise osv.except_osv(_('Invalid Partner !'), _('Please select the partner !'))
+            
+        if ttype and ttype in ('receipt'):
+            args += [('journal_id.type','in', ['sale', 'purchase_refund'])]
+        elif ttype and ttype in ('payment'):
+            args += [('journal_id.type','in', ['purchase', 'sale_refund'])]
+        elif ttype and ttype in('sale', 'purchase'):
+            raise osv.except_osv(_('Invalid action !'), _('You can not reconcile sales, purchase, or journal voucher with invoice !'))
+            args += [('journal_id.type','=', 'do_not_allow_search')]
+        res = super(account_move, self).search(cr, user, args, offset, limit, order, {}, count)
+        return res
+    
+account_move()
+
 class account_voucher(osv.osv):

    def _get_period(self, cr, uid, context={}):
@ -71,9 +118,8 @@ class account_voucher(osv.osv):
            return False

    def _get_type(self, cr, uid, context={}):
-        vtype = context.get('type', 'bank')
-        voucher_type = journal2type.get(vtype)
-        return voucher_type
+        vtype = context.get('type', False)
+        return vtype

    def _get_reference_type(self, cursor, user, context=None):
        return [('none', 'Free Reference')]
@ -122,7 +168,7 @@ class account_voucher(osv.osv):
            ('receipt', 'Receipt'),
            ('sale', 'Sales'),
            ('purchase', 'Purchase')],
-            'Default Type', select=True , size=128, readonly=True, states={'draft':[('readonly',False)]}),
+            'Type', select=True , size=128, readonly=True),
        'date':fields.date('Date', readonly=True, states={'draft':[('readonly',False)]}, help="Effective date for accounting entries"),
        'journal_id':fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft':[('readonly',False)]}),
        'account_id':fields.many2one('account.account', 'Account', required=True, readonly=True, states={'draft':[('readonly',False)]}, domain=[('type','<>','view')]),
@ -151,10 +197,14 @@ class account_voucher(osv.osv):
        'move_ids': fields.related('move_id','line_id', type='many2many', relation='account.move.line', string='Journal Items', readonly=True, states={'draft':[('readonly',False)]}),
        'partner_id':fields.many2one('res.partner', 'Partner', readonly=True, states={'draft':[('readonly',False)]}),
        'audit': fields.related('move_id','to_check', type='boolean', relation='account.move', string='Audit Complete ?'),
-        'pay_now':fields.boolean('Pay Now ?', required=False),
+        'pay_now':fields.selection([
+            ('pay_now','Pay Now'),
+            ('pay_later','Pay Later'),
+        ],'Payment', select=True, readonly=True, states={'draft':[('readonly',False)]}),
        'pay_journal_id':fields.many2one('account.journal', 'Payment Journal', readonly=True, states={'draft':[('readonly',False)]}, domain=[('type','in',['bank','cash'])]),
        'pay_account_id':fields.many2one('account.account', 'Payment Account', readonly=True, states={'draft':[('readonly',False)]}, domain=[('type','<>','view')]),
-        'pay_amount':fields.float('Payment Amount'),
+        'pay_amount':fields.float('Payment Amount', readonly=True, states={'draft':[('readonly',False)]}),
+        'tax_id':fields.many2one('account.tax', 'Tax', required=False),
    }
    
    _defaults = {
@ -163,14 +213,84 @@ class account_voucher(osv.osv):
        'journal_id':_get_journal,
        'currency_id': _get_currency,
        'state': lambda *a: 'draft',
-        'pay_now':lambda *a: True,
+        'pay_now':lambda *a: 'pay_now',
        'name': lambda *a: '/',
        'date' : lambda *a: time.strftime('%Y-%m-%d'),
        'reference_type': lambda *a: "none",
        'audit': lambda *a: False,
        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.voucher',context=c),
    }
-
+    
+    def onchange_partner_id(self, cr, uid, ids, partner_id, ttype, context={}):
+        """
+        Returns a dict that contains new values and context
+    
+        @param cr: A database cursor
+        @param user: ID of the user currently logged in
+        @param partner_id: latest value from user input for field partner_id
+        @param args: other arguments
+        @param context: context arguments, like lang, time zone
+        
+        @return: Returns a dict which contains new values, and context
+        """
+        move_pool = self.pool.get('account.move')
+        line_pool = self.pool.get('account.voucher.line')
+        res = []
+        
+        context.update({
+            'type':ttype, 
+            'partner_id':partner_id, 
+            'voucher':True,
+        })
+        
+        default = {
+            'value':{},
+            'context':context,
+        }
+        if not partner_id or not ttype:
+            if ids:
+                line_ids = line_pool.search(cr, uid, [('voucher_id','=',ids[0])])
+                if line_ids:
+                    line_pool.unlink(cr, uid, line_ids)
+            return default
+        
+        if ttype not in ('payment', 'receipt'):
+            return default
+        
+        if not ids:
+            raise osv.except_osv(_('Invalid !'), _('Please save voucher before selection partner !'))
+        
+        line_ids = line_pool.search(cr, uid, [('voucher_id','=',ids[0])])
+        if line_ids:
+            line_pool.unlink(cr, uid, line_ids)
+        
+        voucher_id = ids[0]
+        ids = move_pool.search(cr, uid, [('reconcile_id','=', False), ('state','=','posted'), ('partner_id','=',partner_id)], context=context)
+        for move in move_pool.browse(cr, uid, ids):
+            rs = {
+                'ref':move.ref or '/',
+                'move_id':move.id,
+                'voucher_id':voucher_id,
+            }
+            if ttype == 'payment':
+                rs.update({
+                    'account_id':move.partner_id.property_account_payable.id,
+                    'type':'dr',
+                    'amount':move.amount
+                })
+            elif ttype == 'receipt':
+                rs.update({
+                    'account_id':move.partner_id.property_account_receivable.id,
+                    'type':'cr',
+                    'amount':move.amount
+                })
+            line_id = line_pool.create(cr, uid, rs)
+            res += [line_id]
+        return {
+            'value':{'payment_ids':res},
+            'context':context,
+        }
+    
    def onchange_date(self, cr, user, ids, date, context={}):
        """
        Returns a dict that contains new values and context
@ -486,7 +606,7 @@ class account_voucher(osv.osv):
            line_ids += [move_line_pool.create(cr, uid, move_line)]
            rec_ids = []
            
-            if inv.type == 'sale' and inv.pay_now:
+            if inv.type == 'sale' and inv.pay_now == 'pay_now':
                if not inv.pay_account_id or not inv.pay_journal_id:
                    raise osv.except_osv(_('Payment Error !'), _('Please define Payment Journal and Account !'))
                    
@ -606,7 +726,43 @@ class account_voucher(osv.osv):
        if 'date' not in default:
            default['date'] = time.strftime('%Y-%m-%d')
        return super(account_voucher, self).copy(cr, uid, id, default, context)
+    
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        """
+        Returns views and fields for current model where view will depend on {view_type}.
+        @param cr: A database cursor
+        @param user: ID of the user currently logged in
+        @param view_id: list of fields, which required to read signatures
+        @param view_type: defines a view type. it can be one of (form, tree, graph, calender, gantt, search, mdx)
+        @param context: context arguments, like lang, time zone
+        @param toolbar: contains a list of reports, wizards, and links related to current model
+        
+        @return: Returns a dict that contains definition for fields, views, and toolbars
+        """
+        data_pool = self.pool.get('ir.model.data')
+        journal_pool = self.pool.get('account.journal')
+        
+        voucher_type = {
+            'sale':'view_sale_receipt_form',
+            'purchase':'view_purchase_receipt_form',
+            'payment':'view_vendor_payment_form',
+            'receipt':'view_vendor_receipt_form'
+        }

+        if view_type == 'form':
+            tview = voucher_type.get(context.get('type'))
+            result = data_pool._get_id(cr, uid, 'account_voucher', tview)
+            view_id = data_pool.browse(cr, uid, result, context=context).res_id
+        
+        res = super(account_voucher, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu)
+        
+        #Restrict the list of journal view in search view
+        if view_type == 'search':
+            journal_list = journal_pool.name_search(cr, uid, '', [], context=context)
+            res['fields']['journal_id']['selection'] = journal_list        
+        
+        return res
+        
 account_voucher()

 class account_voucher_line(osv.osv):
@ -619,10 +775,11 @@ class account_voucher_line(osv.osv):
        'account_id':fields.many2one('account.account','Account', required=True, domain=[('type','<>','view')]),
        'partner_id':fields.related('voucher_id', 'partner_id', type='many2one', relation='res.partner', string='Partner'),
        'amount':fields.float('Amount'),
-        'type':fields.selection([('dr','Debit'),('cr','Credit')], 'Type'),
+        'type':fields.selection([('dr','Debit'),('cr','Credit')], 'Cr/Dr'),
        'ref':fields.char('Reference', size=32),
        'account_analytic_id':  fields.many2one('account.analytic.account', 'Analytic Account'),
        'is_tax':fields.boolean('Tax ?', required=False),
+        'stype':fields.selection([('service','Service'),('other','Other')], 'Product Type'),
    }
    _defaults = {
        'type': lambda *a: 'cr'
@ -704,7 +861,7 @@ class account_voucher_line(osv.osv):

        elif type1 in ('payment'):
            account_id = partner.property_account_payable.id
-            balance = partner.debit
+            balance = -partner.debit
            ttype = 'dr'

        elif type1 in ('sale'):
@ -717,7 +874,10 @@ class account_voucher_line(osv.osv):

        if company.currency_id != currency:
            balance = currency_pool.compute(cr, uid, company.currency_id.id, currency, balance)
-
+        
+        if ttype == 'dr' and balance:
+            balance = -balance
+            
        vals.update({
            'account_id': account_id,
            'type': ttype,
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="view_vendor_payment_form">
+            <field name="name">account.voucher.payment.form</field>
+            <field name="model">account.voucher</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Bill Payment">
+                    <group col="6" colspan="4">
+                        <field name="partner_id" on_change="onchange_partner_id(partner_id, type)"/>
+                        <field name="name" colspan="4"/>
+                        <field name="journal_id" domain="[('type','in',['bank', 'cash'])]" widget="selection" select="1" on_change="onchange_journal(journal_id,type)"/>
+                        <field name="account_id" domain="[('type','=','other')]" widget="selection" on_change="onchange_account(account_id)" readonly="1"/>
+                        <field name="number"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Payment Information">
+                            <field name="payment_ids" colspan="4" nolabel="1" height="180">
+                                <tree string="Payment Lines" editable="top">
+                                    <field name="ref" on_change="onchange_partner(parent.partner_id,type,parent.type, parent.currency_id)"/>
+                                    <field name="amount"/>
+                                    <field name="account_id"/>
+                                    <field name="type" on_change="onchange_type(parent.partner_id,type,parent.type, parent.currency_id)"/>
+                                    <field name="account_analytic_id"/>
+                                </tree>
+                            </field>
+                            <group col="2" colspan="3">
+                                <separator string="Narration" colspan="2"/>
+                                <field name="narration" colspan="2" nolabel="1"/>
+                            </group>
+                            <group col="2" colspan="1">
+                                <separator string="Other Information" colspan="2"/>
+                                <field name="reference" select="1"/>
+                                <field name="date" select="1" on_change="onchange_date(date)"/>
+                                <field name="currency_id" select="1" attrs="{'readonly':[('type','in',['sale', 'purchase'])]}"/>
+                                <field name="type" on_change="onchange_journal(journal_id,type)"/>
+                            </group>
+                        </page>
+                        <page string="Journal Items">
+                            <group col="6" colspan="4">
+                                <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
+                                <field name="period_id"/>
+                                <field name="audit"/>
+                            </group>
+                            <separator string="Journal Items" colspan="4"/>
+                            <field name="move_ids" colspan="4" nolabel="1" readonly="1"/>
+                        </page>
+                    </notebook>
+                    <group col="10" colspan="4">
+                        <field name="state"/>
+                        <button name="proforma_voucher" string="Create" states="draft" icon="terp-document-new"/>
+                        <button name="recheck_voucher" string="Approve" states="recheck" icon="terp-check"/>
+                        <button name="cancel_voucher" string="Cancel" states="draft,proforma,recheck"  icon="gtk-cancel"/>
+                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+        
+        <record id="action_vendor_payment" model="ir.actions.act_window">
+            <field name="name">Vendor Payment</field>
+            <field name="res_model">account.voucher.open</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','payment')]</field>
+            <field name="context">{'journal_type':'bank', 'type':'payment'}</field>
+            <field name="view_id" ref="account_open_vouchers_view"/>
+            <field name="target">new</field>
+        </record>
+        <menuitem action="action_vendor_payment" icon="STOCK_JUSTIFY_FILL" sequence="16"
+            id="menu_action_vendor_payment"  parent="account.menu_finance_payables"/>
+
+        <record model="ir.ui.view" id="view_vendor_receipt_form">
+            <field name="name">account.voucher.receipt.form</field>
+            <field name="model">account.voucher</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Sales Payment">
+                    <group col="6" colspan="4">
+                        <field name="partner_id" on_change="onchange_partner_id(partner_id, type)"/>
+                        <field name="name" colspan="4"/>
+                        <field name="journal_id" domain="[('type','in',['bank', 'cash'])]" widget="selection" select="1" on_change="onchange_journal(journal_id,type)"/>
+                        <field name="account_id" domain="[('type','=','other')]" widget="selection" on_change="onchange_account(account_id)" readonly="1"/>
+                        <field name="number"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Payment Information">
+                            <field name="payment_ids" colspan="4" nolabel="1" height="180">
+                                <tree string="Payment Lines" editable="top">
+                                    <field name="ref" on_change="onchange_partner(parent.partner_id,type,parent.type, parent.currency_id)"/>
+                                    <field name="amount"/>
+                                    <field name="account_id"/>
+                                    <field name="type" on_change="onchange_type(parent.partner_id,type,parent.type, parent.currency_id)"/>
+                                    <field name="account_analytic_id"/>
+                                </tree>
+                            </field>
+                            <group col="2" colspan="3">
+                                <separator string="Narration" colspan="2"/>
+                                <field name="narration" colspan="2" nolabel="1"/>
+                            </group>
+                            <group col="2" colspan="1">
+                                <separator string="Other Information" colspan="2"/>
+                                <field name="reference" select="1"/>
+                                <field name="date" select="1" on_change="onchange_date(date)"/>
+                                <field name="currency_id" select="1" attrs="{'readonly':[('type','in',['sale', 'purchase'])]}"/>
+                                <field name="type" on_change="onchange_journal(journal_id,type)"/>
+                            </group>
+                        </page>
+                        <page string="Journal Items">
+                            <group col="6" colspan="4">
+                                <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
+                                <field name="period_id"/>
+                                <field name="audit"/>
+                            </group>
+                            <separator string="Journal Items" colspan="4"/>
+                            <field name="move_ids" colspan="4" nolabel="1" readonly="1"/>
+                        </page>
+                    </notebook>
+                    <group col="10" colspan="4">
+                        <field name="state"/>
+                        <button name="proforma_voucher" string="Create" states="draft" icon="terp-document-new"/>
+                        <button name="recheck_voucher" string="Approve" states="recheck" icon="terp-check"/>
+                        <button name="cancel_voucher" string="Cancel" states="draft,proforma,recheck"  icon="gtk-cancel"/>
+                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+        
+        <record id="action_vendor_receipt" model="ir.actions.act_window">
+            <field name="name">Sales Payment</field>
+            <field name="res_model">account.voucher.open</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','receipt')]</field>
+            <field name="context">{'journal_type':'bank', 'type':'receipt'}</field>
+            <field name="view_id" ref="account_open_vouchers_view"/>
+            <field name="target">new</field>
+        </record>
+        <menuitem action="action_vendor_receipt" icon="STOCK_JUSTIFY_FILL" sequence="16"
+            id="menu_action_vendor_receipt"  parent="account.menu_finance_receivables"/>
+        
+        <record id="action_cheque_pay" model="ir.actions.act_window">
+            <field name="name">Cheques</field>
+            <field name="res_model">account.voucher.open</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('journal_id.type', 'in', ['bank']), ('type','=','payment')]</field>
+            <field name="context">{'journal_type':'bank', 'type':'payment'}</field>
+            <field name="view_id" ref="account_open_vouchers_view"/>
+            <field name="target">new</field>
+        </record>
+
+        <menuitem action="action_cheque_pay" icon="STOCK_JUSTIFY_FILL" sequence="16"
+            id="menu_action_cheque_pay" parent="account.menu_finance_bank_and_cash"/>
+    </data>
+</openerp>
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="view_sale_receipt_form">
+            <field name="name">account.voucher.sale.form</field>
+            <field name="model">account.voucher</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Sales Receipt">
+                    <group col="6" colspan="4">
+                        <field name="partner_id" on_change="onchange_partner_id(partner_id, type)"/>
+                        <field name="name" colspan="4"/>
+                        <field name="journal_id"  domain="[('type','=','sale')]" widget="selection" select="1" on_change="onchange_journal(journal_id,type)"/>
+                        <field name="account_id" domain="[('type','=','other')]" widget="selection" on_change="onchange_account(account_id)"/>
+                        <field name="number"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Sales Information">
+                            <field name="payment_ids" colspan="4" nolabel="1" height="180">
+                                <tree string="Sales Lines" editable="top">
+                                    <field name="stype" on_change="onchange_partner(parent.partner_id,type,parent.type, parent.currency_id)"/>
+                                    <field name="ref" on_change="onchange_partner(parent.partner_id,type,parent.type, parent.currency_id)"/>
+                                    <field name="amount" />
+                                    <field name="account_id"/>
+                                    <field name="type" on_change="onchange_type(parent.partner_id,type,parent.type, parent.currency_id)"/>
+                                    <field name="account_analytic_id"/>
+                                </tree>
+                            </field>
+                            <group col="2" colspan="3">
+                                <separator string="Narration" colspan="2"/>
+                                <field name="narration" colspan="2" nolabel="1"/>
+                            </group>
+                            <group col="2" colspan="1">
+                                <group col="2" colspan="1">
+                                    <separator string="Payment Options" colspan="2"/>
+                                    <field name="pay_now"/>
+                                    <field name="pay_journal_id" on_change="onchange_pay_journal(pay_journal_id,type)" attrs="{'readonly': [('pay_now','=','pay_later')], 'required': [('pay_now','=','pay_now')]}"/>
+                                    <field name="pay_account_id" attrs="{'readonly': [('pay_now','=','pay_later')], 'required': [('pay_now','=','pay_now')]}"/>
+                                    <field name="pay_amount" attrs="{'readonly': [('pay_now','=','pay_later')], 'required': [('pay_now','=','pay_now')]}"/>
+                                </group>
+                                <group col="2" colspan="1">
+                                    <separator string="Other Information" colspan="2"/>
+                                    <field name="reference" select="1"/>
+                                    <field name="tax_id"/>
+                                    <field name="amount"/>
+                                    <field name="date" select="1" on_change="onchange_date(date)"/>
+                                    <field name="type" on_change="onchange_journal(journal_id,type)"/>
+                                </group>
+                            </group>
+                        </page>
+                        <page string="Journal Items">
+                            <group col="6" colspan="4">
+                                <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
+                                <field name="period_id"/>
+                                <field name="audit"/>
+                            </group>
+                            <separator string="Journal Items" colspan="4"/>
+                            <field name="move_ids" colspan="4" nolabel="1" readonly="1"/>
+                        </page>
+                    </notebook>
+                    <group col="10" colspan="4">
+                        <field name="state"/>
+                        <button name="proforma_voucher" string="Create" states="draft" icon="terp-document-new"/>
+                        <button name="recheck_voucher" string="Approve" states="recheck" icon="terp-check"/>
+                        <button name="cancel_voucher" string="Cancel" states="draft,proforma,recheck"  icon="gtk-cancel"/>
+                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+        
+        <!-- Sales Voucher -->
+        <record id="action_sale_receipt" model="ir.actions.act_window">
+            <field name="name">Sales Receipt</field>
+            <field name="res_model">account.voucher.open</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('journal_id.type','=','sale')]</field>
+            <field name="context">{'journal_type':'sale', 'type':'sale'}</field>
+            <field name="view_id" ref="account_open_vouchers_view"/>
+            <field name="target">new</field>
+        </record>
+        <menuitem id="menu_action_sale_receipt" icon="STOCK_JUSTIFY_FILL"
+        action="action_sale_receipt" parent="account.menu_finance_receivables" sequence="14"/>
+        
+        <!--  Purchase Vouchers -->
+        <record model="ir.ui.view" id="view_purchase_receipt_form">
+            <field name="name">account.voucher.purchase.form</field>
+            <field name="model">account.voucher</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Vendor Bills">
+                    <group col="6" colspan="4">
+                        <field name="partner_id" on_change="onchange_partner_id(partner_id, type)"/>
+                        <field name="name" colspan="4"/>
+                        <field name="journal_id"  domain="[('type','=','purchase')]" widget="selection" select="1" on_change="onchange_journal(journal_id,type)"/>
+                        <field name="account_id" domain="[('type','=','other')]" widget="selection" on_change="onchange_account(account_id)"/>
+                        <field name="number"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Bill Information">
+                            <field name="payment_ids" colspan="4" nolabel="1" height="180">
+                                <tree string="Voucher Lines" editable="top">
+                                    <field name="stype" on_change="onchange_partner(parent.partner_id,type,parent.type, parent.currency_id)"/>
+                                    <field name="ref" on_change="onchange_partner(parent.partner_id,type,parent.type, parent.currency_id)"/>
+                                    <field name="amount"/>
+                                    <field name="account_id"/>
+                                    <field name="type" on_change="onchange_type(parent.partner_id,type,parent.type, parent.currency_id)"/>
+                                    <field name="account_analytic_id"/>
+                                </tree>
+                            </field>
+                            <group col="2" colspan="3">
+                                <separator string="Narration" colspan="2"/>
+                                <field name="narration" colspan="2" nolabel="1"/>
+                            </group>
+                            <group col="2" colspan="1">
+                                <separator string="Other Information" colspan="2"/>
+                                <field name="reference" select="1"/>
+                                <field name="date" select="1" on_change="onchange_date(date)"/>
+                                <field name="type" on_change="onchange_journal(journal_id,type)"/>
+                            </group>
+                        </page>
+                        <page string="Journal Items">
+                            <group col="6" colspan="4">
+                                <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
+                                <field name="period_id"/>
+                                <field name="audit"/>
+                            </group>
+                            <separator string="Journal Items" colspan="4"/>
+                            <field name="move_ids" colspan="4" nolabel="1" readonly="1"/>
+                        </page>
+                    </notebook>
+                    <group col="10" colspan="4">
+                        <field name="state"/>
+                        <button name="proforma_voucher" string="Create" states="draft" icon="terp-document-new"/>
+                        <button name="recheck_voucher" string="Approve" states="recheck" icon="terp-check"/>
+                        <button name="cancel_voucher" string="Cancel" states="draft,proforma,recheck"  icon="gtk-cancel"/>
+                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+        <record id="action_purchase_receipt" model="ir.actions.act_window">
+            <field name="name">Vendor Bills</field>
+            <field name="res_model">account.voucher.open</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('journal_id.type','=','purchase')]</field>
+            <field name="context">{'journal_type':'purchase', 'type':'purchase'}</field>
+            <field name="view_id" ref="account_open_vouchers_view"/>
+            <field name="target">new</field>
+        </record>
+        <menuitem id="menu_action_purchase_receipt" icon="STOCK_JUSTIFY_FILL" 
+        action="action_purchase_receipt" parent="account.menu_finance_payables" sequence="14"/>        
+        
+    </data>
+</openerp>
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@ -31,7 +31,7 @@
            <field name="arch" type="xml">
                <form string="Accounting Voucher">
                    <group col="6" colspan="4">
-                        <field name="partner_id"/>
+                        <field name="partner_id" on_change="onchange_partner_id(partner_id, type)"/>
                        <field name="name" colspan="4"/>
                        <field name="journal_id" widget="selection" select="1" on_change="onchange_journal(journal_id,type)"/>
                        <field name="account_id" widget="selection" on_change="onchange_account(account_id)" readonly="1"/>
@ -189,19 +189,19 @@
         </record>
        
        <!--  Receipt Vouchers -->
-        <record model="ir.actions.act_window" id="action_receipt_vou_voucher_list">
-            <field name="name">Sales Receipt</field>
-            <field name="res_model">account.voucher</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,graph</field>
-            <field name="view_id" eval="view_voucher_tree"/>
-            <field name="domain">[('journal_id.type','=','sale')]</field>
-            <field name="context">{'type':'sale'}</field>
-            <field name="search_view_id" ref="view_voucher_filter_new"/>
-        </record>
-        <menuitem id="menu_action_receipt_vou_voucher_list"
-        action="action_receipt_vou_voucher_list" parent="account.menu_finance_receivables" sequence="12"/>
-        
+<!--        <record model="ir.actions.act_window" id="action_receipt_vou_voucher_list">-->
+<!--            <field name="name">Sales Receipt</field>-->
+<!--            <field name="res_model">account.voucher</field>-->
+<!--            <field name="view_type">form</field>-->
+<!--            <field name="view_mode">tree,form,graph</field>-->
+<!--            <field name="view_id" eval="view_voucher_tree"/>-->
+<!--            <field name="domain">[('journal_id.type','=','sale')]</field>-->
+<!--            <field name="context">{'type':'sale'}</field>-->
+<!--            <field name="search_view_id" ref="view_voucher_filter_new"/>-->
+<!--        </record>-->
+<!--        <menuitem id="menu_action_receipt_vou_voucher_list"-->
+<!--        action="action_receipt_vou_voucher_list" parent="account.menu_finance_receivables" sequence="12"/>-->
+<!--        -->
        <!--  Sale Receipt Vouchers -->
 <!--        <record model="ir.actions.act_window" id="action_receipt_vou_voucher_list_pay_now">-->
 <!--            <field name="name">Sales Receipt Payment</field>-->
@ -217,18 +217,18 @@
 <!--        action="action_receipt_vou_voucher_list_pay_now" parent="account.menu_finance_receivables" sequence="12"/>-->

        <!--  Purchase Vouchers -->
-        <record model="ir.actions.act_window" id="action_pay_vou_voucher_list">
-            <field name="name">Vendor Bills</field>
-            <field name="res_model">account.voucher</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,graph</field>
-            <field name="view_id" eval="view_voucher_tree"/>
-            <field name="domain">[('journal_id.type','=','purchase')]</field>
-            <field name="context">{'type':'purchase'}</field>
-            <field name="search_view_id" ref="view_voucher_filter_new"/>
-        </record>
-        <menuitem id="menu_action_pay_vou_voucher_list"
-        action="action_pay_vou_voucher_list" parent="account.menu_finance_payables" sequence="12"/>
+<!--        <record model="ir.actions.act_window" id="action_pay_vou_voucher_list">-->
+<!--            <field name="name">Vendor Bills</field>-->
+<!--            <field name="res_model">account.voucher</field>-->
+<!--            <field name="view_type">form</field>-->
+<!--            <field name="view_mode">tree,form,graph</field>-->
+<!--            <field name="view_id" eval="view_voucher_tree"/>-->
+<!--            <field name="domain">[('journal_id.type','=','purchase')]</field>-->
+<!--            <field name="context">{'type':'purchase'}</field>-->
+<!--            <field name="search_view_id" ref="view_voucher_filter_new"/>-->
+<!--        </record>-->
+<!--        <menuitem id="menu_action_pay_vou_voucher_list"-->
+<!--        action="action_pay_vou_voucher_list" parent="account.menu_finance_payables" sequence="12"/>-->

        <!-- Journal Vouchers -->
        <record model="ir.actions.act_window" id="action_voucher_list">
@ -242,50 +242,50 @@
        </record>
        <menuitem action="action_voucher_list" id="menu_encode_entries_by_voucher" parent="account.menu_finance_entries" sequence="6"/>

-        <record id="action_cheque_register" model="ir.actions.act_window">
-            <field name="name">Sales Payments</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.voucher</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','receipt')]</field>
-            <field name="context">{'type':'bank'}</field>
-            <field name="view_id" ref="view_voucher_tree"/>
-            <field name="search_view_id" ref="view_voucher_filter_new"/>
-        </record>
-        <menuitem action="action_cheque_register" 
-            id="menu_action_cheque_register" 
-            parent="account.menu_finance_receivables"/>
+<!--        <record id="action_cheque_register" model="ir.actions.act_window">-->
+<!--            <field name="name">Sales Payments</field>-->
+<!--            <field name="type">ir.actions.act_window</field>-->
+<!--            <field name="res_model">account.voucher</field>-->
+<!--            <field name="view_type">form</field>-->
+<!--            <field name="view_mode">tree,form</field>-->
+<!--            <field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','receipt')]</field>-->
+<!--            <field name="context">{'type':'bank'}</field>-->
+<!--            <field name="view_id" ref="view_voucher_tree"/>-->
+<!--            <field name="search_view_id" ref="view_voucher_filter_new"/>-->
+<!--        </record>-->
+<!--        <menuitem action="action_cheque_register" -->
+<!--            id="menu_action_cheque_register" -->
+<!--            parent="account.menu_finance_receivables"/>-->
        
-        <record id="action_cheque_pay" model="ir.actions.act_window">
-            <field name="name">Vendor Payment</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.voucher</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','payment')]</field>
-            <field name="context">{'type':'bank'}</field>
-            <field name="view_id" ref="view_voucher_tree"/>
-            <field name="search_view_id" ref="view_voucher_filter_new"/>
-        </record>
-        <menuitem action="action_cheque_pay" 
-            id="menu_action_cheque_pay" 
-            parent="account.menu_finance_payables"/>
+<!--        <record id="action_cheque_pay" model="ir.actions.act_window">-->
+<!--            <field name="name">Vendor Payment</field>-->
+<!--            <field name="type">ir.actions.act_window</field>-->
+<!--            <field name="res_model">account.voucher</field>-->
+<!--            <field name="view_type">form</field>-->
+<!--            <field name="view_mode">tree,form</field>-->
+<!--            <field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','payment')]</field>-->
+<!--            <field name="context">{'type':'bank'}</field>-->
+<!--            <field name="view_id" ref="view_voucher_tree"/>-->
+<!--            <field name="search_view_id" ref="view_voucher_filter_new"/>-->
+<!--        </record>-->
+<!--        <menuitem action="action_cheque_pay" -->
+<!--            id="menu_action_cheque_pay" -->
+<!--            parent="account.menu_finance_payables"/>-->
        
-        <record id="action_cheque_pay_voucher" model="ir.actions.act_window">
-            <field name="name">Cheques</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.voucher</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('journal_id.type', 'in', ['bank']), ('type','=','payment')]</field>
-            <field name="context">{'type':'bank'}</field>
-            <field name="view_id" ref="view_voucher_tree"/>
-            <field name="search_view_id" ref="view_voucher_filter_new"/>
-        </record>
-        <menuitem action="action_cheque_pay_voucher" 
-            id="menu_action_cheque_pay_voucher" 
-            parent="account.menu_finance_bank_and_cash"/>
+<!--        <record id="action_cheque_pay_voucher" model="ir.actions.act_window">-->
+<!--            <field name="name">Cheques</field>-->
+<!--            <field name="type">ir.actions.act_window</field>-->
+<!--            <field name="res_model">account.voucher</field>-->
+<!--            <field name="view_type">form</field>-->
+<!--            <field name="view_mode">tree,form</field>-->
+<!--            <field name="domain">[('journal_id.type', 'in', ['bank']), ('type','=','payment')]</field>-->
+<!--            <field name="context">{'type':'bank'}</field>-->
+<!--            <field name="view_id" ref="view_voucher_tree"/>-->
+<!--            <field name="search_view_id" ref="view_voucher_filter_new"/>-->
+<!--        </record>-->
+<!--        <menuitem action="action_cheque_pay_voucher" -->
+<!--            id="menu_action_cheque_pay_voucher" -->
+<!--            parent="account.menu_finance_bank_and_cash"/>-->
        
        <record model="ir.ui.view" id="view_account_journal_form_inherit">
            <field name="name">account.journal.form.inherit</field>
--- a/addons/account_voucher/wizard/account_voucher_open.py
+++ b/addons/account_voucher/wizard/account_voucher_open.py
@ -18,69 +18,130 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from osv import osv, fields
+
+from osv import fields, osv
 from tools.translate import _
+import tools

-_types = {
-        'pay_voucher':'Cash Payment Voucher',
-        'bank_pay_voucher':'Bank Payment Voucher',
-        'rec_voucher':'Cash Receipt Voucher',
-        'bank_rec_voucher':'Bank Receipt Voucher',
-        'cont_voucher':'Contra Voucher',
-        'journal_sale_vou':'Journal Sale Voucher',
-        'journal_pur_voucher':'Journal Purchase Voucher'
-        }
-_states = {
-    'draft':'Draft',
-    'proforma':'Pro-forma',
-    'posted':'Posted',
-    'cancel':'Cancel'
-}
+class account_voucher_open(osv.osv_memory):
+    _name = "account.voucher.open"
+    _description = "Account Voucher"
+    
+    def _get_period(self, cr, uid, context={}):
+        """
+        Return  default account period value
+        """
+        ids = self.pool.get('account.period').find(cr, uid, context=context)
+        period_id = False
+        if len(ids):
+            period_id = ids[0]
+        return period_id

-class account_open_voucher(osv.osv_memory):
-    _name = "account.open.voucher"
-    _description = "Account Open Voucher"
+    def _get_journal(self, cr, uid, context={}):
+        """
+        Return journal based on the journal type
+        """
+        journal_id = False
+        
+        journal_pool = self.pool.get('account.journal')
+        if context.get('journal_type', False):
+            jids = journal_pool.search(cr, uid, [('type','=', context.get('journal_type'))])
+            journal_id = jids[0]
+        return journal_id
+    
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        """
+        Returns views and fields for current model where view will depend on {view_type}.
+        @param cr: A database cursor
+        @param user: ID of the user currently logged in
+        @param view_id: list of fields, which required to read signatures
+        @param view_type: defines a view type. it can be one of (form, tree, graph, calender, gantt, search, mdx)
+        @param context: context arguments, like lang, time zone
+        @param toolbar: contains a list of reports, wizards, and links related to current model
+        
+        @return: Returns a dict that contains definition for fields, views, and toolbars
+        """
+        res = super(account_voucher_open, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu)

-    _columns = {
-        'type': fields.selection([('pay_voucher','Cash Payment Voucher'),
-             ('bank_pay_voucher','Bank Payment Voucher'),
-             ('rec_voucher','Cash Receipt Voucher'),
-             ('bank_rec_voucher','Bank Receipt Voucher'),
-             ('cont_voucher','Contra Voucher'),
-             ('journal_sale_vou','Journal Sale Voucher'),
-             ('journal_pur_voucher','Journal Purchase Voucher')],'Voucher Type', required=True),
-        'state': fields.selection([('draft','Draft'),
-           ('proforma','Pro-forma'),
-           ('posted','Posted'),
-           ('cancel','Cancel')], 'State', required=True),
-        'period_ids': fields.many2many('account.period', 'voucher_period_rel', 'voucher_id', 'period_id', 'Periods'),
-    }
+        if not view_id:
+            return res

+        period_pool = self.pool.get('account.period')
+        journal_pool = self.pool.get('account.journal')
+        
+        journal_id = self._get_journal(cr, uid, context)
+        period_id = self._get_period(cr, uid, context)
+
+        journal = False
+        if journal_id:
+            journal = journal_pool.read(cr, uid, [journal_id], ['name'])[0]['name']
+        else:
+            journal = "All"
+
+        period = False
+        if period_id:
+            period = period_pool.browse(cr, uid, [period_id], ['name'])[0]['name']
+        
+        menu = self.pool.get('ir.ui.menu').browse(cr, uid, context.get('active_id'))
+        name = menu.name
+
+        view = """<?xml version="1.0" encoding="utf-8"?>
+        <form string="Standard entries">
+            <separator string="Open %s !" colspan="4"/>
+            <group colspan="4" >
+                <label width="300" string="Journal : %s"/>
+                <newline/>
+                <label width="300" string="Period :  %s"/>
+            </group>
+            <group colspan="4" col="4">
+                <label string ="" colspan="2"/>
+                <button icon="terp-gtk-go-back-rtl" string="Ok" name="action_open_window" type="object"/>
+            </group>
+        </form>""" % (str(name), str(journal), str(period))
+        
+        res.update({
+            'arch':view
+        })
+        return res
+    
    def action_open_window(self, cr, uid, ids, context=None):
-        obj_period = self.pool.get('account.period')
-        obj_fyear = self.pool.get('account.fiscalyear')
-        periods = []
+        """
+        This function Open action move line window on given period and  Journal/Payment Mode
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: account move journal’s ID or list of IDs
+        @return: dictionary of Open action move line window on given period and  Journal/Payment Mode
+        """
+        
+        period_pool = self.pool.get('account.journal.period')
+        data_pool = self.pool.get('ir.model.data')
+        journal_pool = self.pool.get('account.journal')
+        
        if context is None:
            context = {}
-
-        form = self.read(cr, uid, ids, [])[0]
-        if not form['period_ids']:
-            year = obj_fyear.find(cr, uid)
-            periods = obj_period.search(cr, uid, [('fiscalyear_id','=',year)])
-        else:
-            periods = form['period_ids']
-        return {
-            'domain': "[('type','=','%s'), ('state','=','%s'), ('period_id','in',%s)]" % (form['type'], form['state'], periods),
-            'name': "%s - %s" % (_types[form['type']], _states[form['state']]),
+        
+        journal_id = self._get_journal(cr, uid, context)
+        period_id = self._get_period(cr, uid, context)
+        
+        menu = self.pool.get('ir.ui.menu').browse(cr, uid, context.get('active_id'))
+        name = menu.name
+        
+        result = data_pool._get_id(cr, uid, 'account_voucher', 'view_voucher_filter_new')
+        res_id = data_pool.browse(cr, uid, result, context=context).res_id
+        
+        res = {
+            'domain':menu.action.domain,
+            'name': name,
            'view_type': 'form',
-            'view_mode': 'tree,form',
+            'view_mode': 'tree,graph,form',
            'res_model': 'account.voucher',
            'view_id': False,
-            'context': "{'type':'%s', 'state':'%s', 'period_id':%s}" % (form['type'], form['state'], periods),
+            'context': "{'journal_id': %d, 'search_default_journal_id':%d, 'search_default_period_id':%d}" % (journal_id, journal_id, period_id),
            'type': 'ir.actions.act_window',
-            'nodestroy': True
+            'search_view_id': res_id
        }
-
-account_open_voucher()
+        return res
+    
+account_voucher_open()

 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
--- a/addons/account_voucher/wizard/account_voucher_open_view.xml
+++ b/addons/account_voucher/wizard/account_voucher_open_view.xml
@ -4,39 +4,23 @@

        <record id="account_open_vouchers_view" model="ir.ui.view">
             <field name="name">Open Vouchers</field>
-             <field name="model">account.open.voucher</field>
+             <field name="model">account.voucher.open</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                <form string="Open Vouchers">
-                    <field name="type"/>
-                    <field name="state"/>
-                    <field name="period_ids" colspan="4"/>
-                    <group colspan="4" col="6">
-                           <separator colspan="6"/>
-                           <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                           <button name="action_open_window" string="Open Voucher Entries" type="object" icon="gtk-ok"/>
+                    <separator string="Open Vouchers !" colspan="4"/>
+                    <group colspan="4" >
+                        <label width="300" string="Journal :"/>
+                        <newline/>
+                        <label width="300" string="Period :"/>
+                    </group>
+                    <group colspan="4" col="4">
+                        <label string ="" colspan="2"/>
+                        <button icon="terp-gtk-go-back-rtl" string="Ok" name="action_open_window" type="object"/>
                    </group>
                </form>
             </field>
        </record>
-
-        <record id="action_account_open_vouchers" model="ir.actions.act_window">
-             <field name="name">Open Vouchers</field>
-             <field name="res_model">account.open.voucher</field>
-             <field name="type">ir.actions.act_window</field>
-             <field name="view_type">form</field>
-             <field name="view_mode">tree,form</field>
-             <field name="view_id" ref="account_open_vouchers_view"/>
-             <field name="context">{'record_id':active_id}</field>
-            <field name="target">new</field>
-       </record>
-
-<!--       <menuitem-->
-<!--            icon="STOCK_EXECUTE"-->
-<!--            name="Open Vouchers"-->
-<!--            action="action_account_open_vouchers"-->
-<!--            id="menu_account_voucher_open"-->
-<!--            parent="menu_action_voucher_list"/>-->
-
+        
    </data>
 </openerp>
--- a/addons/account_voucher_payment/account_voucher_payment.py
+++ b/addons/account_voucher_payment/account_voucher_payment.py
@ -22,81 +22,16 @@
 from osv import fields, osv
 from tools.translate import _

-class account_move(osv.osv):
-    _inherit = 'account.move'
-    
-    def _get_line_ids(self, cr, uid, ids, context=None):
-        result = {}
-        for line in self.pool.get('account.move.line').browse(cr, uid, ids, context=context):
-            result[line.move_id.id] = True
-        return result.keys()
-    
-    def _amount_all(self, cr, uid, ids, name, args, context=None):
-        res = {}
-        for move in self.browse(cr, uid, ids, context=context):
-            rs = {
-                'reconcile_id': False,
-            }
-            for line in move.line_id:
-                if line.reconcile_id:
-                    rs.update({
-                        'reconcile_id': line.reconcile_id.id
-                    })
-            res[move.id] = rs
-        return res
-    
-    _columns = {
-        'reconcile_id': fields.function(_amount_all, method=True, type="many2one", relation="account.move.line", string='Reconcile',
-            store={
-                'account.move.line': (_get_line_ids, [], 20),
-            },
-            multi='all'),
-    }
-    
-    def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
-        """
-        Returns a list of ids based on search domain {args}
-    
-        @param cr: A database cursor
-        @param user: ID of the user currently logged in
-        @param args: list of conditions to be applied in search opertion
-        @param offset: default from first record, you can start from nth record
-        @param limit: number of records to be obtained as a result of search opertion
-        @param order: ordering on any field(s)
-        @param context: context arguments, like lang, time zone
-        @param count: 
-        
-        @return: Returns a list of ids based on search domain
-        """
-        if not context:
-            context = {}
-        ttype = context.get('ttype', False)
-        partner = context.get('partner_id', False)
-        voucher = context.get('voucher', False)
-        if voucher and not partner:
-            raise osv.except_osv(_('Invalid Partner !'), _('Please select the partner !'))
-            
-        if ttype and ttype in ('receipt'):
-            args += [('journal_id.type','in', ['sale', 'purchase_refund'])]
-        elif ttype and ttype in ('payment'):
-            args += [('journal_id.type','in', ['purchase', 'sale_refund'])]
-        elif ttype and ttype in('sale', 'purchase'):
-            raise osv.except_osv(_('Invalid action !'), _('You can not reconcile sales, purchase, or journal voucher with invoice !'))
-            args += [('journal_id.type','=', 'do_not_allow_search')]
-        res = super(account_move, self).search(cr, user, args, offset, limit, order, context, count)
-        return res
-    
-account_move()
-
-class account_move_line(osv.osv):
-    _inherit = "account.move.line"
-    _columns = {
-        'voucher_invoice': fields.many2one('account.invoice', 'Invoice', readonly=True),
-    }
-account_move_line()
+#class account_move_line(osv.osv):
+#    _inherit = "account.move.line"
+#    _columns = {
+#        'voucher_invoice': fields.many2one('account.invoice', 'Invoice', readonly=True),
+#    }
+#account_move_line()

 class account_voucher(osv.osv):
    _inherit = 'account.voucher'
+    
    _columns = {
        'payment_ids':fields.one2many('account.voucher.line', 'voucher_id', 'Voucher Lines', readonly=True, states={'draft':[('readonly',False)]}),
    }
@ -113,7 +48,7 @@ class account_voucher(osv.osv):
        invoice_pool = self.pool.get('account.invoice')
        
        for inv in self.browse(cr, uid, ids):
-            
+        
            if inv.move_id:
                continue

@ -181,7 +116,7 @@ class account_voucher(osv.osv):
            line_ids += [move_line_pool.create(cr, uid, move_line)]
            rec_ids = []
            
-            if inv.type == 'sale' and inv.pay_now:
+            if inv.type == 'sale' and inv.pay_now == 'pay_now':
                #create the payment line manually
                move_line = {
                    'name':inv.name,
@ -198,6 +133,7 @@ class account_voucher(osv.osv):
                line_ids += [move_line_pool.create(cr, uid, move_line)]
            else:
                for line in inv.payment_ids:
+                    
                    amount=0.0

                    if inv.type in ('payment'):
@ -234,13 +170,11 @@ class account_voucher(osv.osv):
                        move_line.update({
                            'debit': line.amount or False
                        })
-                        amount = line.amount
                    
                    elif line.type == 'cr':
                        move_line.update({
                            'credit': line.amount or False
                        })
-                        amount = line.amount
                    
                    move_line_id = move_line_pool.create(cr, uid, move_line)
                    line_ids += [move_line_id]
@ -250,10 +184,10 @@ class account_voucher(osv.osv):
                        for move_line in line.move_id.line_id:
                            if line.account_id.id == move_line.account_id.id:
                                rec_ids += [move_line.id]
-
+            
            if rec_ids:
                move_line_pool.reconcile_partial(cr, uid, rec_ids)
-            
+
            rec = {
                'move_id': move_id
            }
@ -270,12 +204,12 @@ account_voucher()

 class account_voucher_line(osv.osv):
    _inherit = 'account.voucher.line'
-
+    
    def default_get(self, cr, uid, fields, context={}):
        data = super(account_voucher_line, self).default_get(cr, uid, fields, context)
        self.voucher_context = context
        return data
-
+    
    _columns = {
        'move_id' : fields.many2one('account.move','Bill / Invoice'),
    }
--- a/addons/account_voucher_payment/account_voucher_payment_view.xml
+++ b/addons/account_voucher_payment/account_voucher_payment_view.xml
@ -1,57 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
    <data>
-        <record id="view_voucher_form" model="ir.ui.view">
+        
+        <record id="view_vendor_payment_form_inherit" model="ir.ui.view">
            <field name="name">account.voucher.form.inherit</field>
            <field name="model">account.voucher</field>
            <field name="type">form</field>
-            <field name="inherit_id" ref="account_voucher.view_voucher_form"/>
+            <field name="inherit_id" ref="account_voucher.view_vendor_payment_form"/>
            <field name="arch" type="xml">
                <field name="payment_ids" position="replace">
                    <field name="payment_ids" colspan="4" nolabel="1" height="200">
-                        <tree string="Voucher Lines" editable="top">
-<!--                            <field name="name"/>-->
+                        <tree string="Payment Lines" editable="top">
                            <field name="ref" on_change="onchange_partner(parent.partner_id,type,parent.type, parent.currency_id)"/>
-                            <field name="move_id" context="{'ttype':parent.type, 'partner_id':parent.partner_id, 'voucher':True}" on_change="onchange_invoice_id(move_id, parent.currency_id)" domain="[('state','=','posted'), ('partner_id','=',parent.partner_id), ('reconcile_id','=', False)]"/>
+                            <field name="move_id" string="Vendor Bill" context="{'type':parent.type, 'partner_id':parent.partner_id, 'voucher':True}" on_change="onchange_invoice_id(move_id, parent.currency_id)" domain="[('state','=','posted'), ('partner_id','=',parent.partner_id), ('reconcile_id','=', False)]"/>
                            <field name="amount"/>
-                            <field name="type" on_change="onchange_type(parent.partner_id,type,parent.type, parent.currency_id)"/>
                            <field name="account_id"/>
-                            <field name="account_analytic_id"  groups="base.group_extended"/>
+                            <field name="type" on_change="onchange_type(parent.partner_id,type,parent.type, parent.currency_id)"/>
+                            <field name="account_analytic_id"/>
+                        </tree>
+                    </field>
+                </field>
+            </field>
+        </record>
+        
+        <record id="view_vendor_receipt_form_inherit" model="ir.ui.view">
+            <field name="name">account.voucher.form.inherit</field>
+            <field name="model">account.voucher</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account_voucher.view_vendor_receipt_form"/>
+            <field name="arch" type="xml">
+                <field name="payment_ids" position="replace">
+                    <field name="payment_ids" colspan="4" nolabel="1" height="200">
+                        <tree string="Payment Lines" editable="top">
+                            <field name="ref" on_change="onchange_partner(parent.partner_id,type,parent.type, parent.currency_id)"/>
+                            <field name="move_id" string="Sales Receipt" context="{'type':parent.type, 'partner_id':parent.partner_id, 'voucher':True}" on_change="onchange_invoice_id(move_id, parent.currency_id)" domain="[('state','=','posted'), ('partner_id','=',parent.partner_id), ('reconcile_id','=', False)]"/>
+                            <field name="amount"/>
+                            <field name="account_id"/>
+                            <field name="type" on_change="onchange_type(parent.partner_id,type,parent.type, parent.currency_id)"/>
+                            <field name="account_analytic_id"/>
                        </tree>
                    </field>
                </field>
            </field>
        </record>

-        <record id="view_move_line_form" model="ir.ui.view">
-            <field name="name">account.move.line.form.inherit</field>
-            <field name="model">account.move.line</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="account.view_move_line_form"/>
-            <field name="arch" type="xml">
-                <field name="invoice" position="replace">
-                    <field name="voucher_invoice"/>
-                </field>
-            </field>
-        </record>
-
-        <record id="view_move_line_tree" model="ir.ui.view">
-            <field name="name">account.move.line.form.inherit</field>
-            <field name="model">account.move.line</field>
-            <field name="type">tree</field>
-            <field name="inherit_id" ref="account.view_move_line_tree"/>
-            <field name="arch" type="xml">
-                <field name="invoice" position="replace">
-                    <field name="voucher_invoice"/>
-                </field>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_voucher_form_one">
-            <field name="name">account.voucher.form</field>
+        <record model="ir.ui.view" id="view_vendor_payment_form_unreconcile">
+            <field name="name">account.voucher.form.payment.unreconcile</field>
            <field name="model">account.voucher</field>
            <field name="type">form</field>
-            <field name="inherit_id" ref="view_voucher_form"/>
+            <field name="inherit_id" ref="view_vendor_payment_form_inherit"/>
+            <field name="arch" type="xml">
+                <button name="action_cancel_draft" position="before">
+                    <button name="%(action_view_account_voucher_unreconcile)d" string="Unreconcile" type="action" states="posted" icon="terp-stock_effects-object-colorize"/>
+                </button>
+            </field>
+        </record>
+        
+        <record model="ir.ui.view" id="view_vendor_receipt_form_unreconcile">
+            <field name="name">account.voucher.form.receipt.unreconcile</field>
+            <field name="model">account.voucher</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="view_vendor_receipt_form_inherit"/>
            <field name="arch" type="xml">
                <button name="action_cancel_draft" position="before">
                    <button name="%(action_view_account_voucher_unreconcile)d" string="Unreconcile" type="action" states="posted" icon="terp-stock_effects-object-colorize"/>
--- a/addons/analytic_journal_billing_rate/i18n/tr.po
+++ b/addons/analytic_journal_billing_rate/i18n/tr.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 08:54+0000\n"
+"PO-Revision-Date: 2010-08-18 13:22+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-18 10:34+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: analytic_journal_billing_rate
--- a/addons/analytic_user_function/i18n/tr.po
+++ b/addons/analytic_user_function/i18n/tr.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 09:28+0000\n"
+"PO-Revision-Date: 2010-08-18 13:13+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-18 10:34+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: analytic_user_function
--- a/addons/association/profile_association.xml
+++ b/addons/association/profile_association.xml
@ -63,7 +63,7 @@
      	</field>
 		</record>

-		<menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9" groups="base.group_system,base.group_extended"/>
+		<menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9" groups="base.group_extended"/>
 		<menuitem name="Events Organisation" id="base.menu_event_main" parent="base.menu_association" />
 		<menuitem name="Configuration" id="base.menu_event_config" parent="base.menu_association" sequence="30" groups="base.group_extended"/>
 		<menuitem name="Reporting" id="base.menu_report_association" parent="base.menu_association" sequence="20"/>
--- a/addons/auction/i18n/lt.po
+++ b/addons/auction/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 11:25+0000\n"
+"PO-Revision-Date: 2010-08-18 13:13+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-18 10:33+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: auction
--- a/addons/auction/i18n/nl.po
+++ b/addons/auction/i18n/nl.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 11:37+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:36+0000\n"
+"Last-Translator: vra (openerp) <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-08-18 10:33+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: auction
--- a/addons/auction/i18n/tr.po
+++ b/addons/auction/i18n/tr.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 11:15+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:02+0000\n"
+"Last-Translator: vra (openerp) <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-08-18 10:33+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: auction
--- a/addons/audittrail/i18n/it.po
+++ b/addons/audittrail/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 09:22+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:14+0000\n"
+"Last-Translator: vra (openerp) <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-08-18 10:34+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: audittrail
--- a/addons/audittrail/i18n/lt.po
+++ b/addons/audittrail/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 11:14+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:23+0000\n"
+"Last-Translator: vra (openerp) <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-08-18 10:34+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: audittrail
--- a/addons/audittrail/i18n/tr.po
+++ b/addons/audittrail/i18n/tr.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 08:48+0000\n"
+"PO-Revision-Date: 2010-08-18 13:06+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-18 10:34+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: audittrail
--- a/addons/audittrail/i18n/zh_CN.po
+++ b/addons/audittrail/i18n/zh_CN.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 08:31+0000\n"
+"PO-Revision-Date: 2010-08-18 13:25+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-18 10:34+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: audittrail
--- a/addons/audittrail/security/audittrail_security.xml
+++ b/addons/audittrail/security/audittrail_security.xml
@ -2,9 +2,6 @@
 <openerp>
 	<data noupdate="0">
 		<!-- Set access to menu -->
-		<record id="menu_action_audittrail" model="ir.ui.menu">
-			<field eval="[(6,0,[ref('base.group_system')])]" name="groups_id"/>
-		</record>
 	</data>
 </openerp>

--- a/addons/base_action_rule/base_action_rule_view.xml
+++ b/addons/base_action_rule/base_action_rule_view.xml
@ -2,7 +2,7 @@
 <openerp>
    <data>
        <menuitem id="base.menu_base_action_rule" name="Automated Actions"
-            groups="base.group_extended,base.group_system"
+            groups="base.group_extended"
            parent="base.menu_base_config" sequence="3" />

        <!--
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@ -1111,8 +1111,7 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
        'base_calendar_alarm_id': fields.many2one('calendar.alarm', 'Alarm'),
        'recurrent_uid': fields.integer('Recurrent ID'),
        'recurrent_id': fields.datetime('Recurrent ID date'),
-        'vtimezone': fields.related('user_id', 'context_tz', type='char', size=24, \
-                         string='Timezone', store=True),
+        'vtimezone': fields.selection(_tz_get, size=64, string='Timezone'),
        'user_id': fields.many2one('res.users', 'Responsible', states={'done': [('readonly', True)]}),
        'organizer': fields.char("Organizer", size=256, states={'done': [('readonly', True)]}), # Map with Organizer Attribure of VEvent.
        'organizer_id': fields.many2one('res.users', 'Organizer', states={'done': [('readonly', True)]}),
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@ -211,7 +211,7 @@
        <!--        Menu for Alarms-->

         <menuitem id="menu_crm_meeting_avail_alarm"
-            groups="base.group_extended,base.group_system"
+            groups="base.group_extended"
            action="base_calendar.action_res_alarm_view"
            parent="base.menu_calendar_configuration" />

--- a/addons/base_contact/i18n/lt.po
+++ b/addons/base_contact/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 11:27+0000\n"
+"PO-Revision-Date: 2010-08-18 13:14+0000\n"
 "Last-Translator: Giedrius Slavinskas <giedrius.slavinskas@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-08-18 10:32+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: lt\n"

--- a/addons/base_contact/i18n/tr.po
+++ b/addons/base_contact/i18n/tr.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 11:24+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:12+0000\n"
+"Last-Translator: vra (openerp) <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-08-18 10:32+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: base_contact
--- a/addons/base_contact/i18n/zh_CN.po
+++ b/addons/base_contact/i18n/zh_CN.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 11:31+0000\n"
+"PO-Revision-Date: 2010-08-18 13:19+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-18 10:32+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: base_contact
--- a/addons/base_iban/i18n/tr.po
+++ b/addons/base_iban/i18n/tr.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 11:30+0000\n"
+"PO-Revision-Date: 2010-08-18 13:18+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-18 10:31+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: base_iban
--- a/addons/base_module_quality/i18n/tr.po
+++ b/addons/base_module_quality/i18n/tr.po
@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 11:25+0000\n"
+"PO-Revision-Date: 2010-08-18 13:13+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-18 10:34+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: base_module_quality
--- a/addons/base_module_record/i18n/tr.po
+++ b/addons/base_module_record/i18n/tr.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 08:49+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:03+0000\n"
+"Last-Translator: vra (openerp) <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-08-18 10:32+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: base_module_record
--- a/addons/base_report_creator/i18n/it.po
+++ b/addons/base_report_creator/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 07:39+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:18+0000\n"
+"Last-Translator: vra (openerp) <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-08-18 10:34+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: base_report_creator
--- a/addons/base_report_creator/i18n/tr.po
+++ b/addons/base_report_creator/i18n/tr.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 11:25+0000\n"
+"PO-Revision-Date: 2010-08-18 13:12+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-18 10:34+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: base_report_creator
--- a/addons/base_report_designer/i18n/tr.po
+++ b/addons/base_report_designer/i18n/tr.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 09:20+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:16+0000\n"
+"Last-Translator: vra (openerp) <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-08-18 10:33+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: base_report_designer
--- a/addons/base_setup/i18n/tr.po
+++ b/addons/base_setup/i18n/tr.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 11:16+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:06+0000\n"
+"Last-Translator: vra (openerp) <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-08-18 10:32+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: base_setup
--- a/addons/base_vat/i18n/tr.po
+++ b/addons/base_vat/i18n/tr.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 11:36+0000\n"
+"PO-Revision-Date: 2010-08-18 13:33+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-18 10:32+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: base_vat
--- a/addons/board/i18n/it.po
+++ b/addons/board/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 15:48+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 11:07+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-08-18 10:34+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: board
--- a/addons/board/i18n/tr.po
+++ b/addons/board/i18n/tr.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 11:16+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:06+0000\n"
+"Last-Translator: vra (openerp) <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-08-18 10:34+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: board
--- a/addons/caldav/calendar.py
+++ b/addons/caldav/calendar.py
@ -354,6 +354,8 @@ class CalDAV(object):
                        if not model:
                            continue
                        uidval = openobjectid2uid(cr, data[map_field], model)
+                        #Computation for getting events with the same UID (RFC4791 Section4.1)
+                        #START
                        model_obj = self.pool.get(model)
                        r_ids = []
                        if model_obj._columns.get('recurrent_uid', None):
@ -361,8 +363,13 @@ class CalDAV(object):
                                           % (model_obj._table, data[map_field]))
                            r_ids = map(lambda x: x[0], cr.fetchall())
                        if r_ids:
-                            rcal = self.export_cal(cr, uid, r_ids, 'vevent', context=context)
+                            r_datas = model_obj.read(cr, uid, r_ids, context=context)
+                            rcal = CalDAV.export_cal(self, cr, uid, r_datas, 'vevent', context=context)
+                            for revents in rcal.contents.get('vevent', []):
+                                ical.contents['vevent'].append(revents)
+                        #END
                        if data.get('recurrent_uid', None):
+                            # Change the UID value in case of modified event from any recurrent event 
                            uidval = openobjectid2uid(cr, data['recurrent_uid'], model)
                        vevent.add('uid').value = uidval
                    elif field == 'attendee' and data[map_field]:
@ -385,6 +392,9 @@ class CalDAV(object):
                                         data[map_field], ical, context=context)
                            timezones.append(data[map_field])
                        if exfield:
+                            # Set exdates according to timezone value
+                            # This is the case when timezone mapping comes after the exdate mapping
+                            # and we have exdate value available 
                            exfield.params['TZID'] = [tzval.title()]
                            exdates_updated = []
                            for exdate in exdates:
@ -405,6 +415,9 @@ class CalDAV(object):
                                exfield = vevent.add(field)
                                exdates = (data[map_field]).split(',')
                                if tzval:
+                                    # Set exdates according to timezone value
+                                    # This is the case when timezone mapping comes before the exdate mapping
+                                    # and we have timezone value available 
                                    exfield.params['TZID'] = [tzval.title()]
                                    exdates_updated = []
                                    for exdate in exdates:
@ -419,6 +432,7 @@ class CalDAV(object):
                        elif map_type in ('datetime', 'date') and data[map_field]:
                            dtfield = vevent.add(field)
                            if tzval:
+                                # Export the date according to the event timezone value
                                dest_date = self.format_date_tz(data[map_field], tzval.title())
                                dtfield.params['TZID'] = [tzval.title()]
                                dtfield.value = parser.parse(dest_date)
@ -499,7 +513,6 @@ class CalDAV(object):
            @param datas: Get Data's for caldav
            @param context: A standard dictionary for contextual values
        """
-
        try:
            self.__attribute__ = get_attribute_mapping(cr, uid, self._calname, context)
            ical = vobject.iCalendar()
@ -581,9 +594,12 @@ class Calendar(CalDAV, osv.osv):
                if ctx_res_id:
                    line_domain += [('id','=',ctx_res_id)]
                mod_obj = self.pool.get(line.object_id.model)
-                data_ids = mod_obj.search(cr, uid, line_domain, context=context)
+                data_ids = mod_obj.search(cr, uid, line_domain, order="id", context=context)
                for data in mod_obj.browse(cr, uid, data_ids, context):
                    ctx = parent and parent.context or None
+                    if data.recurrent_uid:
+                        # Skip for event which is child of other event
+                        continue
                    node = res_node_calendar('%s.ics' %data.id, parent, ctx, data, line.object_id.model, data.id)
                    res.append(node)
        return res
@ -592,7 +608,6 @@ class Calendar(CalDAV, osv.osv):
        """ Export Calendar
            @param ids: List of calendar’s IDs
            @param vobj: the type of object to export
-            
            @return the ical data.
        """
        if not context:
@ -627,7 +642,6 @@ class Calendar(CalDAV, osv.osv):
            @param data_id: Get Data’s ID or False
            @param context: A standard dictionary for contextual values
        """
-
        if not context:
            context = {}
        vals = []
@ -664,6 +678,7 @@ class Calendar(CalDAV, osv.osv):
            r = self.check_import(cr, uid, vals, context=context)
            res.extend(r)
        return res
+
 Calendar()


--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@ -32,7 +32,7 @@
        parent="base.menu_base_partner" sequence="1" />

    <menuitem parent="base.menu_sales" name="Leads"
-        groups="base.group_extended,base.group_system"
+        groups="base.group_extended"
        id="menu_crm_case_categ0_act_leads"
        action="crm_case_category_act_leads_all" sequence="1" />

--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@ -14,7 +14,7 @@
    </record>

     <menuitem action="crm_lead_stage_act" id="menu_crm_lead_stage_act" name="Stages"
-        groups="base.group_extended,base.group_system" sequence="0"
+        groups="base.group_extended" sequence="0"
        parent="base.menu_crm_config_lead" />


@ -44,7 +44,7 @@

      <menuitem action="crm_lead_resource_act"
            id="menu_crm_lead_resource_act" name="Lead Sources"
-            groups="base.group_extended,base.group_system" sequence="2"
+            groups="base.group_extended" sequence="2"
            parent="base.menu_crm_config_lead" />

        <!-- CRM Lead Form View  -->
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@ -112,7 +112,7 @@
    <menuitem id="menu_attendee_invitations"
            name="Meeting Invitations" parent="crm.menu_meeting_sale"
            sequence="10" action="action_view_attendee_form"
-            groups="base.group_extended,base.group_sale_salesman,base.group_sale_manager" />
+            groups="base.group_extended" />

 </data>
 </openerp>
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@ -57,7 +57,7 @@
    </record>

    <menuitem name="Phone Calls" id="menu_crm_case_phone"
-        groups="base.group_extended,base.group_system"
+        groups="base.group_extended"
        parent="base.menu_base_partner" sequence="4" />

    <record model="ir.actions.act_window" id="crm_case_categ_phone_incoming0">
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@ -4,7 +4,7 @@

        <!--menuitem id="base.menu_crm_config_sales" name="Sales"
            parent="base.menu_base_config" sequence="1"/-->
-        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="base.group_system,base.group_extended,base.group_sale_manager,base.group_sale_salesman"/>
+        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="base.group_system,base.group_sale_manager,base.group_sale_salesman"/>

        <menuitem id="base.menu_crm_config_lead" name="Leads &amp; Opportunities"
            parent="base.menu_base_config" sequence="1" groups="base.group_extended,base.group_system"/>
@ -333,7 +333,7 @@

       <menuitem action="crm_segmentation_tree-act"
            id="menu_crm_segmentation-act"
-            groups="base.group_extended,base.group_system" sequence="2"
+            groups="base.group_extended" sequence="2"
            parent="base.menu_base_action_rule" />

        <record model="ir.ui.view" id="view_users_form_simple_modif_inherited1">
--- a/addons/crm/i18n/fi.po
+++ b/addons/crm/i18n/fi.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-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-17 09:26+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:23+0000\n"
+"Last-Translator: vra (openerp) <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-18 10:32+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: crm
--- a/addons/crm/i18n/hr.po
+++ b/addons/crm/i18n/hr.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-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-17 11:00+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:14+0000\n"
+"Last-Translator: vra (openerp) <Unknown>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-18 10:32+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"

--- a/addons/crm/i18n/it.po
+++ b/addons/crm/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-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-18 09:30+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:06+0000\n"
+"Last-Translator: vra (openerp) <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-08-18 10:32+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: crm
--- a/addons/crm/i18n/lt.po
+++ b/addons/crm/i18n/lt.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-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-17 09:12+0000\n"
+"PO-Revision-Date: 2010-08-18 13:20+0000\n"
 "Last-Translator: Giedrius Slavinskas <giedrius.slavinskas@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-08-18 10:32+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: lt\n"

--- a/addons/crm/i18n/pl.po
+++ b/addons/crm/i18n/pl.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-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-17 10:37+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:24+0000\n"
+"Last-Translator: vra (openerp) <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-08-18 10:32+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: crm
--- a/addons/crm/i18n/pt.po
+++ b/addons/crm/i18n/pt.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-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-17 09:06+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:25+0000\n"
+"Last-Translator: vra (openerp) <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-08-18 10:32+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: crm
--- a/addons/crm/i18n/sk.po
+++ b/addons/crm/i18n/sk.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-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-17 11:06+0000\n"
+"PO-Revision-Date: 2010-08-18 13:24+0000\n"
 "Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-18 10:32+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: crm
--- a/addons/crm/i18n/tr.po
+++ b/addons/crm/i18n/tr.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-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-17 09:02+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:14+0000\n"
+"Last-Translator: vra (openerp) <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-08-18 10:32+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: crm
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@ -231,11 +231,11 @@
       </record>

       <menuitem name="Leads Analysis" id="menu_report_crm_leads_tree"
-            groups="base.group_extended,base.group_sale_manager"
+            groups="base.group_extended"
           parent="base.next_id_64" action="action_report_crm_lead" sequence="3"/>

       <menuitem name="Opportunities Analysis" id="menu_report_crm_opportunities_tree"
-            groups="base.group_extended,base.group_sale_manager"
+            groups="base.group_extended"
           parent="base.next_id_64" action="action_report_crm_opportunity" sequence="4"/>

    </data>
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@ -189,7 +189,7 @@
        </record>

        <menuitem name="Phone Calls Analysis"
-            groups="base.group_extended,base.group_sale_manager"
+            groups="base.group_extended"
            action="action_report_crm_phonecall"
            id="menu_report_crm_phonecalls_tree" parent="base.next_id_64" sequence="5"/>

--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@ -42,8 +42,6 @@
 "access_crm_case_section_custom_manager","crm.case.section.custom.manager","model_crm_case_section_custom","base.group_sale_manager",1,1,1,1
 "access_crm_case_custom_user","crm.case.custom.user","model_crm_case_custom","base.group_sale_salesman",1,1,1,1
 "access_crm_case_custom_manager","crm.case.custom.manager","model_crm_case_custom","base.group_sale_manager",1,1,1,1
-"access_crm_lead_extended","crm.lead.extended","model_crm_lead","base.group_extended",1,1,1,1
-"access_crm_phonecall_extended","crm.phonecall.extended","model_crm_phonecall","base.group_extended",1,1,1,1
 "mail_gateway_mailgate_message_user","mail_gateway.mailgate.message.user","mail_gateway.model_mailgate_message","base.group_sale_salesman",1,1,1,1
 "access_base_res_bank_system","base.res.bank system","base.model_res_bank","base.group_system",1,1,1,1
 "access_crm_case_stage_system","crm.case.stage system","model_crm_case_stage","base.group_system",1,1,1,1
--- a/addons/crm_claim/crm_claim_menu.xml
+++ b/addons/crm_claim/crm_claim_menu.xml
@ -3,7 +3,7 @@
    <data>

        <menuitem id="base.menu_aftersale" name="After-Sale Services"
-            groups="base.group_extended,base.group_system"
+            groups="base.group_extended"
            parent="base.menu_base_partner" sequence="7" />

        <!-- Claims Menu -->
--- a/Show More
+++ b/Show More