[MERGE] merge with same branch + small improvements on accouting

[IMP] mrp: improved the mrp.production.form view bzr revid: qdp-launchpad@tinyerp.com-20100906165421-zy7pz5sdfxgappe7
2010-09-06 18:54:21 +02:00 · 2010-09-06 18:54:21 +02:00 · 5ccf742524
parent c4c74e2122 7bddbcfbef
commit 5ccf742524
302 changed files with 7376 additions and 2414 deletions
--- a/addons/account/account.py
+++ b/addons/account/account.py
@ -143,8 +143,8 @@ class account_account_type(osv.osv):
    _columns = {
        'name': fields.char('Acc. Type Name', size=64, required=True, translate=True),
        'code': fields.char('Code', size=32, required=True),
-        'close_method': fields.selection([('none', 'None'), ('balance', 'Balance'), ('detail', 'Detail'), ('unreconciled', 'Unreconciled')], 'Deferral Method', required=True, help="""Set here the method that will be used to generate the end of year journal entries for all the accounts of this type. 
- 
+        'close_method': fields.selection([('none', 'None'), ('balance', 'Balance'), ('detail', 'Detail'), ('unreconciled', 'Unreconciled')], 'Deferral Method', required=True, help="""Set here the method that will be used to generate the end of year journal entries for all the accounts of this type.
+
 'None' means that nothing will be done.
 'Balance' will generally be used for cash accounts.
 'Detail' will copy each existing journal item of the previous year, even the reconciled ones.
@ -684,7 +684,7 @@ class account_journal(osv.osv):

    def create(self, cr, uid, vals, context={}):
        if not 'sequence_id' in vals or not vals['sequence_id']:
-            vals.update({'sequence_id' : self.create_sequence(cr, uid, vals, context)}) 
+            vals.update({'sequence_id' : self.create_sequence(cr, uid, vals, context)})
        return super(account_journal, self).create(cr, uid, vals, context)

    def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
@ -970,7 +970,7 @@ class account_fiscalyear(osv.osv):
    _columns = {
        'end_journal_period_id':fields.many2one('account.journal.period','End of Year Entries Journal', readonly=True),
    }
-    
+
    def copy(self, cr, uid, id, default={}, context=None):
        default.update({
            'period_ids': [],
@ -1152,24 +1152,17 @@ class account_move(osv.osv):
        return True

    def button_validate(self, cursor, user, ids, context=None):
-        def _get_chart_account(cursor, user, account):
-            if account.parent_id:
-                chart_account = _get_chart_account(cursor, user, account.parent_id)
-            else:
-                chart_account = account
-            return chart_account
-
        for move in self.browse(cursor, user, ids):
-            lines = move.line_id
-            if lines:
-                ref_line = lines[0]
-                ref_chart_account = _get_chart_account(cursor, user, ref_line.account_id)
-                parent_left = ref_chart_account.parent_left
-                parent_right = ref_chart_account.parent_right
-                result = True
-                for line in lines[1:]:
-                   if not (line.account_id.parent_left > parent_left and line.account_id.parent_left < parent_right):
-                         raise osv.except_osv(_('Error !'), _('You cannot validate a move unless accounts in its entry lines are in same Chart Of Accounts !'))
+            top = None
+            for line in move.line_id:
+                account = line.account_id
+                while account:
+                    account2 = account
+                    account = account.parent_id
+                if not top:
+                    top = account2.id
+                elif top<>account2.id:
+                    raise osv.except_osv(_('Error !'), _('You cannot validate a Journal Entry unless all journal items are in same chart of accounts !'))
        return self.post(cursor, user, ids, context=context)

    def button_cancel(self, cr, uid, ids, context={}):
@ -1978,7 +1971,6 @@ class account_model(osv.osv):
    _description = "Account Model"
    _columns = {
        'name': fields.char('Model Name', size=64, required=True, help="This is a model for recurring accounting entries"),
-        'ref': fields.char('Reference', size=64),
        'journal_id': fields.many2one('account.journal', 'Journal', required=True),
        'company_id': fields.many2one('res.company', 'Company', required=True),
        'lines_id': fields.one2many('account.model.line', 'model_id', 'Model Entries'),
@ -1995,15 +1987,19 @@ class account_model(osv.osv):
        move_ids = []
        account_move_obj = self.pool.get('account.move')
        account_move_line_obj = self.pool.get('account.move.line')
+        pt_obj = self.pool.get('account.payment.term')
+
+        if datas.get('date', False):
+            context.update({'date':datas['date']})
        period_id = self.pool.get('account.period').find(cr, uid, dt=context.get('date', False))
+
        if not period_id:
            raise osv.except_osv(_('No period found !'), _('Unable to find a valid period !'))
        period_id = period_id[0]
-        
+
        for model in self.browse(cr, uid, ids, context):
-            context.update({'date':datas['date']})
            move_id = account_move_obj.create(cr, uid, {
-                'ref': model.ref,
+                'ref': model.name,
                'period_id': period_id,
                'journal_id': model.journal_id.id,
                'date': context.get('date',time.strftime('%Y-%m-%d'))
@ -2021,6 +2017,20 @@ class account_model(osv.osv):
                    'period_id': period_id,
                    'analytic_account_id': analytic_account_id
                }
+
+                date_maturity = time.strftime('%Y-%m-%d')
+                if line.date_maturity == 'partner':
+                    if not line.partner_id:
+                        raise osv.except_osv(_('Error !'), _("Maturity date of entry line generated by model line '%s' of model '%s' is based on partner payment term! \
+                    \nPlease define partner on it!"%(line.name, model.name)))
+                    if line.partner_id.property_payment_term:
+                        payment_term_id = line.partner_id.property_payment_term.id
+                        pterm_list = pt_obj.compute(cr, uid, payment_term_id, value=1, date_ref=date_maturity)
+                        if pterm_list:
+                            pterm_list = [l[0] for l in pterm_list]
+                            pterm_list.sort()
+                            date_maturity = pterm_list[-1]
+
                val.update({
                    'name': line.name,
                    'quantity': line.quantity,
@ -2028,10 +2038,9 @@ class account_model(osv.osv):
                    'credit': line.credit,
                    'account_id': line.account_id.id,
                    'move_id': move_id,
-                    'ref': line.ref,
                    'partner_id': line.partner_id.id,
                    'date': context.get('date',time.strftime('%Y-%m-%d')),
-                    'date_maturity': time.strftime('%Y-%m-%d')
+                    'date_maturity': date_maturity
                })
                c = context.copy()
                c.update({'journal_id': model.journal_id.id,'period_id': period_id})
@ -2048,7 +2057,6 @@ class account_model_line(osv.osv):
        'quantity': fields.float('Quantity', digits_compute=dp.get_precision('Account'), help="The optional quantity on entries"),
        'debit': fields.float('Debit', digits_compute=dp.get_precision('Account')),
        'credit': fields.float('Credit', digits_compute=dp.get_precision('Account')),
-        'ref': fields.char('Reference', size=16),
        'account_id': fields.many2one('account.account', 'Account', required=True, ondelete="cascade"),
        'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', ondelete="cascade"),
        'model_id': fields.many2one('account.model', 'Model', required=True, ondelete="cascade", select=True),
@ -2150,16 +2158,18 @@ class account_subscription_line(osv.osv):

    def move_create(self, cr, uid, ids, context=None):
        tocheck = {}
+        all_moves = []
        for line in self.browse(cr, uid, ids, context=context):
            datas = {
                'date': line.date,
            }
-            ids = self.pool.get('account.model').generate(cr, uid, [line.subscription_id.model_id.id], datas, context)
+            move_ids = self.pool.get('account.model').generate(cr, uid, [line.subscription_id.model_id.id], datas, context)
            tocheck[line.subscription_id.id] = True
-            self.write(cr, uid, [line.id], {'move_id':ids[0]})
+            self.write(cr, uid, [line.id], {'move_id':move_ids[0]})
+            all_moves.extend(move_ids)
        if tocheck:
            self.pool.get('account.subscription').check(cr, uid, tocheck.keys(), context)
-        return ids
+        return all_moves

    _rec_name = 'date'
 account_subscription_line()
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@ -117,51 +117,6 @@ class account_analytic_line(osv.osv):

 account_analytic_line()

-
-class timesheet_invoice(osv.osv):
-    _name = "report.hr.timesheet.invoice.journal"
-    _description = "Analytic Account Costs and Revenues"
-    _auto = False
-    _columns = {
-        'name': fields.char('Year',size=64,required=False, readonly=True),
-        'account_id':fields.many2one('account.analytic.account', 'Analytic Account', readonly=True, select=True),
-        'journal_id': fields.many2one('account.analytic.journal', 'Journal', readonly=True),
-        'quantity': fields.float('Quantities', readonly=True),
-        'cost': fields.float('Credit', readonly=True),
-        'revenue': fields.float('Debit', readonly=True),
-        'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
-    }
-    _order = 'name desc, account_id'
-    def init(self, cr):
-        tools.drop_view_if_exists(cr, 'report_hr_timesheet_invoice_journal')
-        cr.execute("""
-        create or replace view report_hr_timesheet_invoice_journal as (
-            select
-                min(l.id) as id,
-                to_char(l.date, 'YYYY') as name,
-                to_char(l.date,'MM') as month,
-                sum(
-                    CASE WHEN l.amount>0 THEN 0 ELSE l.amount
-                    END
-                ) as cost,
-                sum(
-                    CASE WHEN l.amount>0 THEN l.amount ELSE 0
-                    END
-                ) as revenue,
-                sum(l.unit_amount* COALESCE(u.factor, 1)) as quantity,
-                journal_id,
-                account_id
-            from account_analytic_line l
-                LEFT OUTER join product_uom u on (u.id=l.product_uom_id)
-            group by
-                to_char(l.date, 'YYYY'),
-                to_char(l.date,'MM'),
-                journal_id,
-                account_id
-        )""")
-timesheet_invoice()
-
-
 class res_partner(osv.osv):
    """ Inherits partner and adds contract information in the partner form """
    _inherit = 'res.partner'
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@ -642,7 +642,7 @@ class account_bank_statement_line(osv.osv):
                account_id = part.property_account_receivable.id
            res['value']['account_id'] = account_id

-        if not line or (line and not line[0].amount):
+        if account_id and (not line or (line and not line[0].amount)):
            res_users_obj = self.pool.get('res.users')
            res_currency_obj = self.pool.get('res.currency')
            company_currency_id = res_users_obj.browse(cursor, user, user,
@ -720,4 +720,4 @@ class account_bank_statement_line(osv.osv):

 account_bank_statement_line()

-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@ -123,6 +123,7 @@
            <field name="action_id" ref="action_account_installer"/>
            <field name="sequence">5</field>
            <field name="restart">always</field>
+            <field eval="[(6,0,[ref('base.group_extended')])]" name="groups_id"/>
        </record>

    </data>
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@ -7,8 +7,9 @@
        <menuitem id="menu_finance_payables" name="Vendors" parent="menu_finance" sequence="2" groups="group_account_user,group_account_manager,base.group_system"/>
        <menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="3"/>
        <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="8" groups="group_account_user,group_account_manager,base.group_system,group_account_invoice"/>
+        <!-- This menu is used in account_code module -->
+        <menuitem id="menu_account_coda" name="Statements" parent="menu_finance_periodical_processing" sequence="12"/>
        <menuitem id="menu_finance_periodical_processing_bank" name="Bank Reconciliation" parent="menu_finance_periodical_processing" sequence="8" groups="group_account_user,group_account_manager,base.group_system,group_account_invoice"/>
-        
        <menuitem id="periodical_processing_journal_entries_validation" name="Draft Entries" parent="menu_finance_periodical_processing" groups="group_account_user,group_account_manager,base.group_system"/>
        <menuitem id="periodical_processing_reconciliation" name="Reconciliation" parent="menu_finance_periodical_processing"/>
        <menuitem id="periodical_processing_invoicing" name="Invoicing" parent="menu_finance_periodical_processing"/>
@ -30,7 +31,8 @@
        <menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries" parent="menu_finance_periodical_processing" sequence="15"
            groups="base.group_extended"/>

-        <menuitem id="menu_account_end_year_treatments" name="End of Period" parent="menu_finance_periodical_processing" groups="group_account_user,group_account_manager,base.group_system"/>
+        <menuitem id="menu_account_end_year_treatments" name="End of Period" parent="menu_finance_periodical_processing" groups="group_account_user,group_account_manager,base.group_system" sequence="25"/>
+        <menuitem id="menu_finance_periodical_processing_billing" name="Billing" parent="menu_finance_periodical_processing" sequence="35"/>

        <menuitem id="menu_finance_statistic_report_statement" name="Statistic Reports" parent="menu_finance_reporting" sequence="300" groups="account.group_account_manager"/>

--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@ -439,7 +439,7 @@ class account_move_line(osv.osv):
        'blocked': fields.boolean('Litigation', help="You can check this box to mark this journal item as a litigation with the associated partner"),

        'partner_id': fields.many2one('res.partner', 'Partner'),
-        'date_maturity': fields.date('Maturity date', help="This field is used for payable and receivable journal entries. You can put the limit date for the payment of this line."),
+        'date_maturity': fields.date('Due date', help="This field is used for payable and receivable journal entries. You can put the limit date for the payment of this line."),
        'date': fields.related('move_id','date', string='Effective date', type='date', required=True,
            store={
                'account.move': (_get_move_lines, ['date'], 20)
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@ -116,8 +116,8 @@
                    <field name="date_stop"/>
                    <field name="special"/>
                    <field name="state"/>
-                    <button name="action_draft" states="done" string="Set to Draft" type="object" icon="gtk-convert" groups="account.group_account_manager"/>
-                    <button name="%(action_account_period_close)d" states="draft" string="Close Period" type="action" icon="gtk-convert"/>
+                    <button name="action_draft" states="done" string="Set to Draft" type="object" icon="terp-document-new" groups="account.group_account_manager"/>
+                    <button name="%(action_account_period_close)d" states="draft" string="Close Period" type="action" icon="terp-camera_test"/>
                </tree>
            </field>
        </record>
@ -131,8 +131,8 @@
                    <group>
                        <filter string="Draft" name="draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
                        <separator orientation="vertical"/>
-                        <field name="code"/>
                        <field name="name"/>
+                        <field name="code"/>
                    </group>
                </search>
            </field>
@ -1553,7 +1553,6 @@
                <tree string="Journal Entry Model Line" editable="bottom">
                    <field name="sequence"/>
                    <field name="name"/>
-                    <field name="ref"/>
                    <field name="account_id"/>
                    <field name="analytic_account_id"/>
                    <field name="partner_id"/>
@ -1573,7 +1572,6 @@
                <form string="Journal Entry Model Line">
                    <field colspan="4" name="name" select="1"/>
                    <field name="sequence"/>
-                    <field name="ref" select="1"/>
                    <field name="account_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                    <field name="analytic_account_id"/>
                    <field name="partner_id"/>
@ -1592,7 +1590,6 @@
            <field name="arch" type="xml">
                <form string="Journal Entry Model">
                    <field name="name" select="1"/>
-                    <field name="ref"/>
                    <field name="journal_id" select="1"/>
                    <field name="company_id" select="1" widget='selection' groups="base.group_multi_company"/>
                    <field name="date" context="{'date': date}"/>
@ -1618,7 +1615,7 @@
                </tree>
            </field>
        </record>
-        
+
        <record id="view_model_search" model="ir.ui.view">
            <field name="name">account.model.search</field>
            <field name="model">account.model</field>
@ -1640,7 +1637,7 @@
                </search>
            </field>
        </record>
-        
+
        <record id="action_model_form" model="ir.actions.act_window">
            <field name="name">Recurring Models</field>
            <field name="res_model">account.model</field>
@ -1907,21 +1904,21 @@
    # Admin config
    -->

-        <act_window 
-           id="act_account_journal_2_account_bank_statement" 
-           name="Bank statements" 
+        <act_window
+           id="act_account_journal_2_account_bank_statement"
+           name="Bank statements"
           context="{'search_default_journal_id':active_id,}"
-           res_model="account.bank.statement" 
+           res_model="account.bank.statement"
           src_model="account.journal"/>

-        <act_window 
-           id="act_account_journal_2_account_move_line" 
-           name="Journal Items" 
+        <act_window
+           id="act_account_journal_2_account_move_line"
+           name="Journal Items"
           context="{'search_default_journal_id':active_id,}"
-           res_model="account.move.line" 
+           res_model="account.move.line"
           src_model="account.journal"/>

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

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

--- a/addons/account/data/account_data2.xml
+++ b/addons/account/data/account_data2.xml
@ -295,7 +295,7 @@
        </record>
        <record id="sp_journal_col7" model="account.journal.column">
            <field name="view_id" ref="account_sp_journal_view"/>
-            <field name="name">Maturity Date</field>
+            <field name="name">Due Date</field>
            <field name="field">date_maturity</field>
            <field eval="7" name="sequence"/>
        </record>
@ -393,7 +393,7 @@
        </record>
        <record id="sp_refund_journal_col7" model="account.journal.column">
            <field name="view_id" ref="account_sp_refund_journal_view"/>
-            <field name="name">Maturity Date</field>
+            <field name="name">Due Date</field>
            <field name="field">date_maturity</field>
            <field eval="7" name="sequence"/>
        </record>
--- 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-31 08:20+0000\n"
+"PO-Revision-Date: 2010-09-04 08:36+0000\n"
 "Last-Translator: OpenERP Administrators <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-09-01 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account
--- a/addons/account/i18n/fr.po
+++ b/addons/account/i18n/fr.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 19:46+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2010-09-03 08:02+0000\n"
+"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-09-04 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account
@ -1764,7 +1764,7 @@ msgstr "Coûts & Revenus"
 #. module: account
 #: constraint:account.account:0
 msgid "Error ! You can not create recursive accounts."
-msgstr "Erreur ! Vous ne pouvez pas créer d'écritures récursives."
+msgstr "Erreur ! Vous ne pouvez pas créer des compte récursifs"

 #. module: account
 #: rml:account.tax.code.entries:0
@ -3765,7 +3765,7 @@ msgstr "Avoir"
 #. module: account
 #: model:ir.actions.todo,note:account.config_fiscalyear
 msgid "Define Fiscal Years and Select Charts of Account"
-msgstr "Définir l'exercice fiscal et le plan comptable"
+msgstr "Définir l'exercice fiscal et choisir le plan comptable"

 #. module: account
 #: wizard_field:account.move.line.reconcile,addendum,period_id:0
@ -6202,7 +6202,7 @@ msgstr "Sélectionner le COmpte Référence (pour la comparaison en %)"
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_account_balance_report
 msgid "Account balance-Compare Years"
-msgstr ""
+msgstr "Balance des Comptes - Comparer les Années"

 #. module: account
 #: model:ir.module.module,description:account.module_meta_information
@ -6225,6 +6225,21 @@ msgid ""
 "    5. You have an option to print the desired report in Landscape format.\n"
 "    "
 msgstr ""
+"Le module de Balance des Comptes est une fonctionnalité additionnelle du "
+"module de Gestion Financière.\n"
+"\n"
+"    Ce module vous offre plusieurs options d'impression du bilan.\n"
+"\n"
+"    1. Comparaison des bilans de différentes années.\n"
+"\n"
+"    2. Affichage des écarts entre deux années en pourcentage ou en valeur.\n"
+"\n"
+"    3. Définition d'une valeur de référence à comparer à une seule année.\n"
+"\n"
+"    4. Affichage jusqu'à la date actuelle ou depuis la date de création.\n"
+"\n"
+"    5. Impression au format portrait ou paysage.\n"
+"    "

 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
@ -6240,7 +6255,7 @@ msgstr "Afficher le Rapport au Format Paysage"
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Total :"
-msgstr ""
+msgstr "Total :"

 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,format_perc:0
@ -6275,13 +6290,13 @@ msgstr "1. Vous avez sélectionner plus de 3 années dans tous les cas."
 #. module: account
 #: model:ir.module.module,shortdesc:account.module_meta_information
 msgid "Accounting and financial management-Compare Accounts"
-msgstr ""
+msgstr "Gestion financière et comptable - Comparez les comptes"

 #. module: account
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Year :"
-msgstr ""
+msgstr "Année :"

 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
@ -6332,6 +6347,10 @@ msgid ""
 "credit/debit columns and % option.This can lead contents to be printed out "
 "of the paper.Please try again."
 msgstr ""
+"Vous avez choisi de comparer avec l’option supérieure à 1 an sur les "
+"colonnes de crédit/ débit et des %.\r\n"
+"Cela peut conduire le contenu à être imprimé en dehors de la plage du format "
+"de papier. Veuillez essayer à nouveau."

 #. module: account
 #: wizard_view:account.balance.account.balance.report,zero_years:0
@ -6346,22 +6365,22 @@ msgstr "Personnaliser  le Rapport"
 #. module: account
 #: field:report.aged.receivable,name:0
 msgid "Month Range"
-msgstr ""
+msgstr "Plage mensuelle"

 #. module: account
 #: model:ir.actions.act_window,name:report_account.action_view_created_invoice_dashboard
 msgid "Invoices Created Within Past 15 Days"
-msgstr ""
+msgstr "Factures créées depuis 15 jours"

 #. module: account
 #: model:ir.model,name:report_account.model_report_invoice_created
 msgid "Report of Invoices Created within Last 15 days"
-msgstr ""
+msgstr "Rapport des factures créées depuis 15 jours"

 #. module: account
 #: view:report.invoice.created:0
 msgid "Total Amount"
-msgstr ""
+msgstr "Montant Total"

 #. module: account
 #: view:report.account.receivable:0
@ -6381,17 +6400,18 @@ msgstr "Comptes recevables"
 #. module: account
 #: field:temp.range,name:0
 msgid "Range"
-msgstr ""
+msgstr "Intervalle"

 #. 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 ""
+"Un module qui ajoute de nouveaux rapports basé sur le module account."

 #. module: account
 #: model:ir.module.module,shortdesc:report_account.module_meta_information
 msgid "Account Reporting - Reporting"
-msgstr ""
+msgstr "Rapports financiers et de comptabilité - Rapports"

 #. module: account
 #: model:ir.actions.act_window,name:report_account.action_account_receivable_graph
@ -6407,7 +6427,7 @@ msgstr "Semaine de l'année"
 #. module: account
 #: field:report.invoice.created,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Date de Création"

 #. module: account
 #: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph
@ -6418,7 +6438,7 @@ msgstr ""
 #. module: account
 #: view:report.invoice.created:0
 msgid "Untaxed Amount"
-msgstr ""
+msgstr "Montant HT"

 #~ msgid "account.config.wizard"
 #~ msgstr "account.config.wizard"
--- a/addons/account/i18n/hr.po
+++ b/addons/account/i18n/hr.po
--- 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-31 08:22+0000\n"
+"PO-Revision-Date: 2010-09-04 08:39+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-09-01 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:46+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-31 08:20+0000\n"
-"Last-Translator: eLBati - albatos.com <lorenzo.battistini@albatos.com>\n"
+"PO-Revision-Date: 2010-09-04 22:56+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-09-01 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account
@ -55,7 +55,7 @@ msgstr "Attività"
 #. module: account
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "Nome di modulo non valido nella definizione dell'azione."
+msgstr "Nome modello non valido nella definizione dell'azione."

 #. module: account
 #: help:account.journal,currency:0
@ -65,7 +65,7 @@ msgstr "La valuta usata per inserire rendiconto"
 #. module: account
 #: wizard_view:account_use_models,init_form:0
 msgid "Select Message"
-msgstr "Seleziona Messaggio"
+msgstr "Seleziona il Messaggio"

 #. module: account
 #: help:product.category,property_account_income_categ:0
--- 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-31 08:18+0000\n"
+"PO-Revision-Date: 2010-09-04 08:40+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-09-01 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:46+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-31 08:18+0000\n"
+"PO-Revision-Date: 2010-09-04 08:40+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-09-01 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account
--- a/addons/account/i18n/pt_BR.po
+++ b/addons/account/i18n/pt_BR.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-31 15:04+0000\n"
-"Last-Translator: Roberto Higashi <Unknown>\n"
+"PO-Revision-Date: 2010-09-01 06:55+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-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-02 03:53+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-31 08:06+0000\n"
+"PO-Revision-Date: 2010-09-04 08:42+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-09-01 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:46+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-31 08:21+0000\n"
+"PO-Revision-Date: 2010-09-04 08:38+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-09-01 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account
--- a/addons/account/i18n/ta.po
+++ b/addons/account/i18n/ta.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-31 17:35+0000\n"
+"PO-Revision-Date: 2010-09-01 06:55+0000\n"
 "Last-Translator: ஆமாச்சு <amachu@amachu.net>\n"
 "Language-Team: Tamil <ta@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-09-01 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-02 03:53+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-31 08:17+0000\n"
+"PO-Revision-Date: 2010-09-04 08:37+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-09-01 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04: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-31 08:09+0000\n"
+"PO-Revision-Date: 2010-09-04 08:41+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-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account
@ -1040,7 +1040,7 @@ msgstr "新的供应商发票"
 #. module: account
 #: wizard_field:account.invoice.pay,init,amount:0
 msgid "Amount paid"
-msgstr "已付金额"
+msgstr "支付金额"

 #. module: account
 #: selection:account.invoice,type:0
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@ -76,13 +76,13 @@
                <page string="Accounting">
                    <group col="2" colspan="2">
                        <separator string="Customer Accounting Properties" colspan="2"/>
-                        <field name="property_account_receivable" groups="account.group_account_user" />
+                        <field name="property_account_receivable" groups="base.group_extended" />
                        <field name="property_account_position" widget="selection"/>
                        <field name="property_payment_term" widget="selection"/>
                    </group>
                    <group col="2" colspan="2">
                        <separator string="Supplier Accounting Properties" colspan="2"/>
-                        <field name="property_account_payable" groups="account.group_account_user"/>
+                        <field name="property_account_payable" groups="base.group_extended"/>
                    </group>
                    <group col="2" colspan="2">
                        <separator string="Customer Credit" colspan="2"/>
@ -134,7 +134,8 @@
            context="{'search_default_partner_id':[active_id]}"
            src_model="res.partner"
            view_type="form"
-            view_mode="tree,form,graph,calendar"/>
+            view_mode="tree,form,graph,calendar"
+            groups="base.group_extended"/>

        <record id="view_res_partner_reconcile" model="ir.ui.view">
            <field name="name">res.partner.form.reconcile</field>
--- a/addons/account/product.py
+++ b/addons/account/product.py
@ -48,6 +48,7 @@ product_category()
 #----------------------------------------------------------
 # Products
 #----------------------------------------------------------
+
 class product_template(osv.osv):
    _inherit = "product.template"
    _columns = {
@ -76,5 +77,3 @@ class product_template(osv.osv):
    }
 product_template()

-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@ -428,14 +428,6 @@
            </field>
        </record>

-        <record id="report_account_analytic_journal_tree" model="ir.actions.act_window">
-            <field name="name">Account cost and revenue by journal</field>
-            <field name="res_model">report.hr.timesheet.invoice.journal</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,graph</field>
-            <field name="search_view_id" ref="report_hr_timesheet_invoice_journal_search"/>
-        </record>
-
        <act_window 
            context="{'search_default_account_id': [active_id], 'search_default_user_id': False}"
            id="act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal" 
@ -445,8 +437,6 @@
            view_mode="tree,form" 
            view_type="form"/>

-        <act_window domain="[('account_id', '=', active_id)]" id="act_acc_analytic_acc_2_report_hr_timesheet_invoice_journal" name="Costs &amp; Revenues" res_model="report.hr.timesheet.invoice.journal" src_model="account.analytic.account" view_mode="graph,tree,form" view_type="form"/>
-
        <record id="view_account_journal_1" model="ir.ui.view">
            <field name="name">account.journal.form.1</field>
            <field name="model">account.journal</field>
--- a/addons/account/report/overdue.rml
+++ b/addons/account/report/overdue.rml
@ -147,7 +147,7 @@
          <para style="terp_tblheader_Details_Centre">Ref</para>
        </td>
        <td>
-          <para style="terp_tblheader_Details_Centre">Maturity date</para>
+          <para style="terp_tblheader_Details_Centre">Due date</para>
        </td>
        <td>
          <para style="terp_tblheader_Details_Right">Due</para>
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@ -34,7 +34,6 @@
 "access_account_bank_statement_line","account.bank.statement.line","model_account_bank_statement_line","account.group_account_user",1,0,0,0
 "access_account_analytic_line","account.analytic.line","model_account_analytic_line","account.group_account_user",1,1,1,1
 "access_account_analytic_line_manager","account.analytic.line manager","model_account_analytic_line","account.group_account_manager",1,0,0,0
-"access_report_hr_timesheet_invoice_journal","report.hr.timesheet.invoice.journal","model_report_hr_timesheet_invoice_journal","account.group_account_manager",1,0,0,0
 "access_account_analytic_account","account.analytic.account","analytic.model_account_analytic_account","base.group_user",1,0,0,0
 "access_account_analytic_journal","account.analytic.journal","model_account_analytic_journal","account.group_account_user",1,0,0,0
 "access_account_invoice_uinvoice","account.invoice","model_account_invoice","account.group_account_invoice",1,1,1,1
--- a/addons/account/test/account_customer_invoice.yml
+++ b/addons/account/test/account_customer_invoice.yml
@ -54,77 +54,6 @@
  !python {model: account.invoice}: |
    acc_id=self.browse(cr, uid, ref("account_invoice_customer0"))
    assert acc_id.move_id, "Move not created for open invoice"
-
-  I create a record for partial payment of 1000 EUR.
-
-  !record {model: account.invoice.pay, id: account_invoice_pay_first0}:
-    amount: 1000.0
-    date: '2010-05-26'
-    journal_id: account.sales_journal
-    name: First payment for [PC3] Medium PC to Distrib PC
-    period_id: account.period_5
-
-  I make partial payment by clicking on Partial Payment button
-
-  !python {model: account.invoice.pay}: |
-    self.pay_and_reconcile(cr, uid, [ref("account_invoice_pay_first0")], {"lang":
-      'en_US', "active_model": "account.invoice", "tz": False, "record_id": 3, "active_ids":
-      [ref("account_invoice_customer0")], "type": "out_invoice", "active_id": ref("account_invoice_customer0"),
-      })
-
-  I check that the invoice state is still open
-
-  !assert {model: account.invoice, id: account_invoice_customer0}:
-    - state == 'open'
-
-  I make second partial payment of 6000 EUR.
-
-  !record {model: account.invoice.pay, id: account_invoice_pay_second0}:
-    amount: 6000.0
-    date: '2010-05-28'
-    journal_id: account.sales_journal
-    name: Second payment for [PC3] Medium PC to Distrib PC
-    period_id: account.period_5
-
-  I make partial payment by clicking on Partial Payment button
-
-
-  !python {model: account.invoice.pay}: |
-    self.pay_and_reconcile(cr, uid, [ref("account_invoice_pay_second0")], {"lang":
-      'en_US', "active_model": "account.invoice", "tz": False, "record_id": 3, "active_ids":
-      [ref("account_invoice_customer0")], "type": "out_invoice", "active_id": ref("account_invoice_customer0"),
-      })
-
-  I make final partial payment of 2000 EUR
-
-  !record {model: account.invoice.pay, id: account_invoice_pay_final0}:
-    amount: 2000.0
-    date: '2010-05-30'
-    journal_id: account.sales_journal
-    name: Final payment for [PC3] Medium PC to Distrib PC
-    period_id: account.period_5
-
-
-  I make partial payment by clicking on Partial Payment button
-
-
-  !python {model: account.invoice.pay}: |
-    self.pay_and_reconcile(cr, uid, [ref("account_invoice_pay_final0")], {"lang":
-      'en_US', "active_model": "account.invoice", "tz": False, "record_id": 3, "active_ids":
-      [ref("account_invoice_customer0")], "type": "out_invoice", "active_id": ref("account_invoice_customer0"),
-      })
-
-
-  I check that the invoice state is now Done
-
-  !assert {model: account.invoice, id: account_invoice_customer0}:
-    - state == 'paid'
-
-  I check that an payment entry gets created in the account.move.line
-
-  !python {model: account.invoice}: |
-    acc_id=self.browse(cr, uid, ref("account_invoice_customer0"))
-    assert(acc_id.move_id)
 -
  I refund the invoice Using Refund Button
 -
--- a/addons/account/test/account_fiscalyear_close.yml
+++ b/addons/account/test/account_fiscalyear_close.yml
@ -33,7 +33,6 @@
    journal_id: account.sales_journal
    period_id: account_period_jan11
    report_name: End of Fiscal Year Entry
-    sure: 1
 -
  I clicked on create Button

--- a/addons/account/test/account_fiscalyear_close_state.yml
+++ b/addons/account/test/account_fiscalyear_close_state.yml
@ -26,7 +26,6 @@
 -
  !record {model: account.fiscalyear.close.state, id: account_fiscalyear_close_state_0}:
    fy_id: account_fiscalyear_fiscalyear0
-    sure: 1
 -
  I clicked on Close States Button to close fiscalyear

--- a/addons/account/test/account_use_model.yml
+++ b/addons/account/test/account_use_model.yml
@ -3,15 +3,15 @@
 -
  !record {model: account.model, id: account_model_mymodelonyears0}:
    journal_id: account.expenses_journal
+    date: today
    lines_id:
      - account_id: account.a_recv
        credit: 0.0
        debit: 0.0
        name: test1
        sequence: 0.0
-        date: today
        quantity: 0.0
-    name: My Model on %(year)s
+    name: My Test Model

 -
  I create an account use model record
@ -27,18 +27,6 @@
    self.create_entries(cr, uid, [ref("account_use_model_0")], {"lang": 'en_US', "active_model":
      "account.model", "active_ids": [ref("account_model_mymodelonyears0")], "tz":
      False, "active_id": ref("account_model_mymodelonyears0"), })
-
-  I create an account use model record
-
-  !record {model: account.use.model, id: account_use_model_1}:
-    {}
-
-
-  I checked that Moves are created successfully
-
-
-  !python {model: account.use.model}: |
-    self.open_moves(cr, uid, [ref("account_use_model_1")], {"lang": 'en_US', "move_ids":
-      [], "tz": False, "active_model": "account.model", "active_ids": [ref("account_model_mymodelonyears0")],
-      "active_id": ref("account_model_mymodelonyears0"), })
-
+    move_obj = self.pool.get('account.move')
+    ids = move_obj.search(cr, uid, [('ref', '=', 'My Test Model')])
+    assert len(ids), "Error:moves not created for model 'My Test Model'"
--- a/addons/account/test/account_validate_account_move.yml
+++ b/addons/account/test/account_validate_account_move.yml
@ -37,7 +37,7 @@
 -
  I check that Initially account move state is "Draft"
 -
-  !assert {model: account.move, id: account_move_0}:
+  !assert {model: account.move, id: account_move_0, string: initialstatedraft}:
    - state == 'draft'
 -
  I validate this account move by using the 'Validate Journal Entries' wizard
@ -46,18 +46,12 @@
    journal_id: account.bank_journal
    period_id: account.period_6
 -
-  I clicked on validate Button
+  I click on validate Button
 -
  !python {model: validate.account.move}: |
-    try:
-        self.validate_move(cr, uid, [ref("validate_account_move_0")], {"lang": "en_US",
-          "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_validate_account_moves")],
-          "tz": False, "active_id": ref("account.menu_validate_account_moves"), })
-    except:
-        pass
-
+      self.validate_move(cr, uid, [ref("validate_account_move_0")], {"lang": "en_US", "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_validate_account_moves")], "tz": False, "active_id": ref("account.menu_validate_account_moves"), })
 -
  I check that the invoice state is now "Posted"
 -
-  !assert {model: account.move, id: account_move_0}:
+  !assert {model: account.move, id: account_move_0, string: moveincorrect}:
    - state == 'posted'
--- a/addons/account/wizard/account_subscription_generate.py
+++ b/addons/account/wizard/account_subscription_generate.py
@ -39,8 +39,8 @@ class account_subscription_generate(osv.osv_memory):
        moves_created=[]
        for data in  self.read(cr, uid, ids, context=context):
             cr.execute('select id from account_subscription_line where date<%s and move_id is null', (data['date'],))
-             ids = map(lambda x: x[0], cr.fetchall())
-             moves = self.pool.get('account.subscription.line').move_create(cr, uid, ids, context=context)
+             line_ids = map(lambda x: x[0], cr.fetchall())
+             moves = self.pool.get('account.subscription.line').move_create(cr, uid, line_ids, context=context)
             moves_created.extend(moves)
        result = mod_obj._get_id(cr, uid, 'account', 'action_move_line_form')
        id = mod_obj.read(cr, uid, [result], ['res_id'], context=context)[0]['res_id']
--- a/addons/account/wizard/account_use_model.py
+++ b/addons/account/wizard/account_use_model.py
@ -32,11 +32,26 @@ class account_use_model(osv.osv_memory):
        'model': fields.many2many('account.model', 'account_use_model_relation', 'account_id', 'model_id', 'Account Model'),
    }

+    def view_init(self, cr , uid , fields_list, context=None):
+        account_model_obj = self.pool.get('account.model')
+        if context is None:
+            context = {}
+        if context.get('active_ids',False):
+            data_model = account_model_obj.browse(cr, uid, context['active_ids'])
+            for model in data_model:
+                for line in model.lines_id:
+                    if line.date_maturity == 'partner':
+                        if not line.partner_id:
+                            raise osv.except_osv(_('Error !'), _("Maturity date of entry line generated by model line '%s' is based on partner payment term! \
+                                                    \nPlease define partner on it!"%(line.name)))
+        pass
+
    def create_entries(self, cr, uid, ids, context=None):
        account_model_obj = self.pool.get('account.model')
        account_period_obj = self.pool.get('account.period')
        account_move_obj = self.pool.get('account.move')
        account_move_line_obj = self.pool.get('account.move.line')
+        pt_obj = self.pool.get('account.payment.term')
        mod_obj = self.pool.get('ir.model.data')
        if context is None:
            context = {}
@ -49,43 +64,50 @@ class account_use_model(osv.osv_memory):
            data_model = account_model_obj.browse(cr, uid, context['active_ids'])
        move_ids = []
        for model in data_model:
-                period_id = account_period_obj.find(cr, uid, context=context)
-                if not period_id:
-                    raise osv.except_osv(_('No period found !'), _('Unable to find a valid period !'))
-                period_id = period_id[0]
-                move_id = account_move_obj.create(cr, uid, {
-                    'ref': model.ref,
-                    'period_id': period_id,
+            period_id = account_period_obj.find(cr, uid, context=context)
+            if not period_id:
+                raise osv.except_osv(_('No period found !'), _('Unable to find a valid period !'))
+            period_id = period_id[0]
+            move_id = account_move_obj.create(cr, uid, {
+                'ref': model.name,
+                'period_id': period_id,
+                'journal_id': model.journal_id.id,
+            })
+            move_ids.append(move_id)
+            for line in model.lines_id:
+                analytic_account_id = False
+                if line.analytic_account_id:
+                    if not model.journal_id.analytic_journal_id:
+                        raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (model.journal_id.name,))
+                    analytic_account_id = line.analytic_account_id.id
+                val = {
+                    'move_id': move_id,
                    'journal_id': model.journal_id.id,
+                    'period_id': period_id,
+                    'analytic_account_id': analytic_account_id
+                }
+                date_maturity = time.strftime('%Y-%m-%d')
+                if line.date_maturity == 'partner' and line.partner_id and line.partner_id.property_payment_term:
+                    payment_term_id = line.partner_id.property_payment_term.id
+                    pterm_list = pt_obj.compute(cr, uid, payment_term_id, value=1, date_ref=date_maturity)
+                    if pterm_list:
+                        pterm_list = [l[0] for l in pterm_list]
+                        pterm_list.sort()
+                        date_maturity = pterm_list[-1]
+                val.update({
+                    'name': line.name,
+                    'quantity': line.quantity,
+                    'debit': line.debit,
+                    'credit': line.credit,
+                    'account_id': line.account_id.id,
+                    'move_id': move_id,
+                    'partner_id': line.partner_id.id,
+                    'date': time.strftime('%Y-%m-%d'),
+                    'date_maturity': date_maturity
                })
-                move_ids.append(move_id)
-                for line in model.lines_id:
-                    analytic_account_id = False
-                    if line.analytic_account_id:
-                        if not model.journal_id.analytic_journal_id:
-                            raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (model.journal_id.name,))
-                        analytic_account_id = line.analytic_account_id.id
-                    val = {
-                        'move_id': move_id,
-                        'journal_id': model.journal_id.id,
-                        'period_id': period_id,
-                        'analytic_account_id': analytic_account_id
-                    }
-                    val.update({
-                        'name': line.name,
-                        'quantity': line.quantity,
-                        'debit': line.debit,
-                        'credit': line.credit,
-                        'account_id': line.account_id.id,
-                        'move_id': move_id,
-                        'ref': line.ref,
-                        'partner_id': line.partner_id.id,
-                        'date': time.strftime('%Y-%m-%d'),
-                        'date_maturity': time.strftime('%Y-%m-%d')
-                    })
-                    c = context.copy()
-                    c.update({'journal_id': model.journal_id.id,'period_id': period_id})
-                    id_line = account_move_line_obj.create(cr, uid, val, context=c)
+                c = context.copy()
+                c.update({'journal_id': model.journal_id.id,'period_id': period_id})
+                id_line = account_move_line_obj.create(cr, uid, val, context=c)

        context.update({'move_ids':move_ids})
        model_data_ids = mod_obj.search(cr, uid,[('model','=','ir.ui.view'),('name','=','view_move_form')], context=context)
@ -102,5 +124,4 @@ class account_use_model(osv.osv_memory):

 account_use_model()

-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
--- 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-31 08:19+0000\n"
+"PO-Revision-Date: 2010-09-04 08:44+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-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+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-31 08:22+0000\n"
+"PO-Revision-Date: 2010-09-04 08:22+0000\n"
 "Last-Translator: OpenERP Administrators <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-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_analytic_analysis
--- a/addons/account_analytic_analysis/i18n/fr.po
+++ b/addons/account_analytic_analysis/i18n/fr.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-02 20:31+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-09-02 07:26+0000\n"
+"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-03 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 ""
+"Nombre d'heures qui peuvent être facturées plus celles qui ont déjà été "
+"facturées."

 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
@ -76,7 +78,7 @@ msgstr "Revenu théorique"
 #. module: account_analytic_analysis
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "Nom du Modèle non valide dans la définition de l'action."
+msgstr "Nom du modèle invalide dans la définition de l'action."

 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
--- 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-31 08:20+0000\n"
+"PO-Revision-Date: 2010-09-04 08:35+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-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+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-31 08:19+0000\n"
+"PO-Revision-Date: 2010-09-04 08:44+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-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_analytic_analysis
--- a/addons/account_analytic_default/account_analytic_default.py
+++ b/addons/account_analytic_default/account_analytic_default.py
@ -73,8 +73,8 @@ class account_invoice_line(osv.osv):
    _inherit = 'account.invoice.line'
    _description = 'Invoice Line'

-    def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fiscal_position=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None):
-        res_prod = super(account_invoice_line,self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fiscal_position, price_unit, address_invoice_id, currency_id=currency_id, context=context)
+    def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None):
+        res_prod = super(account_invoice_line,self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id=currency_id, context=context)
        rec = self.pool.get('account.analytic.default').account_get(cr, uid, product, partner_id, uid, time.strftime('%Y-%m-%d'), context)
        if rec:
            res_prod['value'].update({'account_analytic_id':rec.analytic_id.id})
--- 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-31 08:19+0000\n"
+"PO-Revision-Date: 2010-09-04 08:44+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-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_analytic_default
--- a/addons/account_analytic_default/i18n/nl.po
+++ b/addons/account_analytic_default/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-02 20:46+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2010-09-02 07:24+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-12 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-03 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_analytic_default
@ -31,14 +31,14 @@ msgstr "Standaard kostenplaats"
 #. module: account_analytic_default
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor overzicht"
+msgstr "Ongeldige XML, kan overzicht niet weergeven!"

 #. module: account_analytic_default
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
-"De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
+"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!"

 #. module: account_analytic_default
 #: view:account.analytic.default:0
--- 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-31 08:19+0000\n"
+"PO-Revision-Date: 2010-09-04 08:45+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-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_analytic_default
--- a/addons/account_analytic_plans/i18n/fr.po
+++ b/addons/account_analytic_plans/i18n/fr.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:59+0000\n"
-"Last-Translator: TeMPO <info@tempo-consulting.fr>\n"
+"PO-Revision-Date: 2010-09-02 07:23+0000\n"
+"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-03 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_analytic_plans
@ -77,7 +77,7 @@ msgstr "Imprimer"
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "To Date"
-msgstr ""
+msgstr "Jusqu'a la date"

 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,plan_id:0
@ -117,7 +117,7 @@ msgstr "Nom du Plan"
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "Printing date"
-msgstr ""
+msgstr "Date d'impression"

 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
@ -158,7 +158,7 @@ msgstr "Réf. du Compte Analytique"
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "Analytic Account :"
-msgstr ""
+msgstr "Compte Analytique :"

 #. module: account_analytic_plans
 #: view:account.analytic.plan.line:0
@ -408,4 +408,4 @@ msgstr "à"
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "From Date"
-msgstr ""
+msgstr "Depuis la date"
--- 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-31 08:19+0000\n"
+"PO-Revision-Date: 2010-09-04 08:44+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-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_analytic_plans
--- a/addons/account_analytic_plans/i18n/pt_BR.po
+++ b/addons/account_analytic_plans/i18n/pt_BR.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-31 15:06+0000\n"
-"Last-Translator: Roberto Higashi <Unknown>\n"
+"PO-Revision-Date: 2010-09-01 06:55+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-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-02 03:54+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-31 08:18+0000\n"
+"PO-Revision-Date: 2010-09-04 08:41+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-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_analytic_plans
--- a/addons/account_anglo_saxon/i18n/fr.po
+++ b/addons/account_anglo_saxon/i18n/fr.po
@ -0,0 +1,64 @@
+# French translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-24 12:50+0000\n"
+"PO-Revision-Date: 2010-09-03 12:05+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French <fr@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-09-04 04:47+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_anglo_saxon
+#: view:product.category:0
+msgid " Accounting Property"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
+msgid ""
+"This module will support the Anglo-Saxons accounting methodology by \n"
+"    changing the accounting logic with stock transactions. The difference "
+"between the Anglo-Saxon accounting countries \n"
+"    and the Rhine or also called Continental accounting countries is the "
+"moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
+"    Anglo-Saxons accounting does take the cost when sales invoice is "
+"created, Continental accounting will take the cost at he moment the goods "
+"are shipped.\n"
+"    This module will add this functionality by using a interim account, to "
+"store the value of shipped goods and will contra book this interim account \n"
+"    when the invoice is created to transfer this amount to the debtor or "
+"creditor account."
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
+msgid "Stock Account"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: field:product.category,property_account_creditor_price_difference_categ:0
+#: field:product.template,property_account_creditor_price_difference:0
+msgid "Price Difference Account"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: help:product.category,property_account_creditor_price_difference_categ:0
+#: help:product.template,property_account_creditor_price_difference:0
+msgid ""
+"This account will be used to value price difference between purchase price "
+"and cost price."
+msgstr ""
--- a/addons/account_anglo_saxon/i18n/ta.po
+++ b/addons/account_anglo_saxon/i18n/ta.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 12:50+0000\n"
-"PO-Revision-Date: 2010-09-01 02:10+0000\n"
+"PO-Revision-Date: 2010-09-01 06:55+0000\n"
 "Last-Translator: ஆமாச்சு <amachu@amachu.net>\n"
 "Language-Team: Tamil <ta@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-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-02 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_anglo_saxon
--- a/addons/account_anglo_saxon/invoice.py
+++ b/addons/account_anglo_saxon/invoice.py
@ -127,11 +127,11 @@ class account_invoice_line(osv.osv):
                        res += diff_res
        return res   
    
-    def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, context=None):
+    def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None):
        if not product:
-            return super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, context)
+            return super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id, context)
        else:
-            res = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, context)
+            res = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id, context)

        if type in ('in_invoice','in_refund'):
            product_obj = self.pool.get('product.product').browse(cr, uid, product, context=context)
@ -173,4 +173,4 @@ class account_invoice(osv.osv):
        return res
    
 account_invoice()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
--- 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-31 08:19+0000\n"
+"PO-Revision-Date: 2010-09-04 08:35+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-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:48+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-31 08:19+0000\n"
+"PO-Revision-Date: 2010-09-04 08:35+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-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_budget
--- a/addons/account_budget/report/crossovered_budget_report.rml
+++ b/addons/account_budget/report/crossovered_budget_report.rml
@ -163,19 +163,19 @@
        <tr>
          <td>
            <para style="P1">
-            <font>[[ a['status']==1 and (setTag('font','font',{'name':'Helvetica-bold'})) ]][[ a['name'] ]]</font></para>
+            <font>[[ (setTag('font','font',{'name':'Helvetica-bold'})) ]][[ a['name'] ]]</font></para>
          </td>
          <td>
-            <para style="terp_default_9">[[ a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ '%.2f' % a['theo'] ]]</para>
+            <para style="terp_default_9">[[ ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ '%.2f' % a['theo'] ]]</para>
          </td>
          <td>
-            <para style="terp_default_9">[[ a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ '%.2f' % a['pln'] ]]</para>
+            <para style="terp_default_9">[[ ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ '%.2f' % a['pln'] ]]</para>
          </td>
          <td>
-            <para style="terp_default_9">[[ a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ '%.2f' % a['prac'] ]]</para>
+            <para style="terp_default_9">[[ ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ '%.2f' % a['prac'] ]]</para>
          </td>
          <td>
-            <para style="terp_default_9">[[ a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ '%.2f' % a['perc'] ]]%</para>
+            <para style="terp_default_9">[[ ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ '%.2f' % a['perc'] ]]%</para>
          </td>
        </tr>
      </blockTable>
--- a/addons/account_cancel/i18n/de.po
+++ b/addons/account_cancel/i18n/de.po
@ -0,0 +1,41 @@
+# German translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-19 12:03+0000\n"
+"PO-Revision-Date: 2010-09-04 09:03+0000\n"
+"Last-Translator: Ferdinand-chricar <Unknown>\n"
+"Language-Team: German <de@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-09-05 04:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_cancel
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Fehlerhafter XML-Code für diese Ansicht!"
+
+#. module: account_cancel
+#: model:ir.module.module,description:account_cancel.module_meta_information
+msgid ""
+"\n"
+"    Module adds 'Allow cancelling entries' field on form view of account "
+"journal. If set to true it allows user to cancel entries & invoices.\n"
+"    "
+msgstr ""
+"\n"
+"    Das Modul ermöglicht Buchungen zu stornieren. Das Kennzeichen wird je "
+"Journal gesetzt.\n"
+"    "
+
+#. module: account_cancel
+#: model:ir.module.module,shortdesc:account_cancel.module_meta_information
+msgid "Account Cancel"
+msgstr "Konto Storno"
--- a/addons/account_cancel/i18n/fr.po
+++ b/addons/account_cancel/i18n/fr.po
@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-08-19 12:03+0000\n"
-"PO-Revision-Date: 2010-08-30 12:19+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-09-02 07:14+0000\n"
+"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-31 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-03 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_cancel
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML non valide pour l'architecture de la vue"

 #. module: account_cancel
 #: model:ir.module.module,description:account_cancel.module_meta_information
@ -29,8 +29,13 @@ msgid ""
 "journal. If set to true it allows user to cancel entries & invoices.\n"
 "    "
 msgstr ""
+"\n"
+"    Le module ajoute le champ 'Permettre l'annulation des entrées' dans la "
+"vue formulaire du journal. Si il est égal à Vrai, cela permet à "
+"l'utilisateur d'annuler l'entrée et la facture.\n"
+"    "

 #. module: account_cancel
 #: model:ir.module.module,shortdesc:account_cancel.module_meta_information
 msgid "Account Cancel"
-msgstr ""
+msgstr "Annulation comptable"
--- a/addons/account_cancel/i18n/ta.po
+++ b/addons/account_cancel/i18n/ta.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-08-19 12:03+0000\n"
-"PO-Revision-Date: 2010-09-01 02:08+0000\n"
+"PO-Revision-Date: 2010-09-01 06:55+0000\n"
 "Last-Translator: ஆமாச்சு <amachu@amachu.net>\n"
 "Language-Team: Tamil <ta@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-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-02 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_cancel
--- a/addons/account_chart/i18n/ta.po
+++ b/addons/account_chart/i18n/ta.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-31 17:53+0000\n"
+"PO-Revision-Date: 2010-09-01 06:56+0000\n"
 "Last-Translator: ஆமாச்சு <amachu@amachu.net>\n"
 "Language-Team: Tamil <ta@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-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-02 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_chart
--- a/addons/account_coda/openerp.py
+++ b/addons/account_coda/openerp.py
@ -32,6 +32,7 @@
    "demo_xml"  : [],
    "init_xml"  : [],
    "update_xml": ["security/ir.model.access.csv",
+                    "security/account_security.xml",
                    "wizard/account_coda_import.xml",
                    "account_coda_view.xml"],
    "active"    : False,
--- a/addons/account_coda/account_coda.py
+++ b/addons/account_coda/account_coda.py
@ -33,10 +33,12 @@ class account_coda(osv.osv):
        'journal_id': fields.many2one('account.journal', 'Journal', readonly=True, select=True, help="Bank Journal"),
        'date': fields.date('Date', readonly=True, select=True, help="Import Date"),
        'user_id': fields.many2one('res.users', 'User', readonly=True, select=True),
+        'company_id': fields.many2one('res.company', 'Company', readonly=True)
    }
    _defaults = {
        'date': time.strftime('%Y-%m-%d'),
        'user_id': lambda self,cr,uid,context: uid,
+        'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'account.coda', context=c),
    }

 account_coda()
--- a/addons/account_coda/account_coda_view.xml
+++ b/addons/account_coda/account_coda_view.xml
@ -12,6 +12,7 @@
 				<field name="journal_id" />
 				<field name="date" />
 				<field name="user_id" />
+				<field name="company_id" widget="selection" groups="base.group_multi_company"/>
 				<notebook colspan="4">
 					<page string="Log">
 					   <field name="note" colspan="4" nolabel="1"/>
@ -33,7 +34,7 @@
 				<field name="journal_id" />
 				<field name="date" />
 				<field name="user_id" />
-				<field name="statement_ids"/>
+				<field name="company_id" widget="selection" groups="base.group_multi_company"/>
 			</tree>
 		</field>
 	</record>
@ -46,8 +47,9 @@
                <search string="Search Coda">
                   <group col="10" colspan="4">
                        <field name="journal_id"/>
-                        <field name="user_id" default="uid"/>
                        <field name="date"/>
+                        <field name="user_id" default="uid"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
                    <newline/>
                    <group expand="0" string="Group By...">
@ -55,13 +57,14 @@
                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
                        <separator orientation="vertical"/>
                        <filter string="User" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
+                        <filter string="Company" icon="terp-personal" domain="[]"  context="{'group_by':'company_id'}"/>
                    </group>
               </search>
            </field>
        </record>

 	<record model="ir.actions.act_window" id="action_account_coda">
-		<field name="name">Coda Statements</field>
+		<field name="name">Statements</field>
 		<field name="type">ir.actions.act_window</field>
 		<field name="res_model">account.coda</field>
 		<field name="view_type">form</field>
@ -70,12 +73,10 @@
 		<field name="search_view_id" ref="view_aaccount_coda_filter"/>
 	</record>

-	<menuitem name="Coda Statements" parent="account.menu_finance_periodical_processing" id="menu_account_coda"  sequence="12"/>
+	<menuitem name="Coda Import Logs" parent="account.menu_finance_bank_and_cash" id="menu_account_coda_statement" action="action_account_coda" groups="base.group_extended" sequence="32"/>

-	<menuitem name="Coda Statements" parent="menu_account_coda" id="menu_account_coda_statement" action="action_account_coda" sequence="15"/>
-
-	<menuitem name="Import Coda Statements" action="action_account_coda_import" parent="menu_account_coda"
-	 id="menu_account_coda_import" sequence="13"/>
+	<menuitem name="Import Coda Statements" action="action_account_coda_import" parent="account.menu_account_coda"
+	 id="menu_account_coda_import" sequence="20"/>

 	<act_window name="Coda File"
 		domain="[('statement_ids', 'in', [active_id])]"
--- 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-31 08:09+0000\n"
+"PO-Revision-Date: 2010-09-04 09:01+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-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_coda
--- a/addons/account_coda/i18n/fr.po
+++ b/addons/account_coda/i18n/fr.po
@ -0,0 +1,166 @@
+# French translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-24 13:11+0000\n"
+"PO-Revision-Date: 2010-09-03 12:11+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French <fr@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-09-04 04:47+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_coda
+#: field:account.coda,journal_id:0
+#: wizard_field:account.coda_import,init,journal_id:0
+msgid "Bank Journal"
+msgstr ""
+
+#. module: account_coda
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: account_coda
+#: wizard_field:account.coda_import,extraction,note:0
+msgid "Log"
+msgstr ""
+
+#. module: account_coda
+#: wizard_button:account.coda_import,extraction,open:0
+msgid "_Open Statement"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.module.module,shortdesc:account_coda.module_meta_information
+msgid "Account CODA"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,name:0
+msgid "Coda file"
+msgstr ""
+
+#. module: account_coda
+#: wizard_view:account.coda_import,init:0
+msgid "Clic on 'New' to select your file :"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.actions.wizard,name:account_coda.wizard_account_coda_import
+msgid "Import Coda File"
+msgstr ""
+
+#. module: account_coda
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,note:0
+msgid "Import log"
+msgstr ""
+
+#. module: account_coda
+#: wizard_field:account.coda_import,init,def_receivable:0
+msgid "Default receivable Account"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.module.module,description:account_coda.module_meta_information
+msgid ""
+"Module provides functionality to import\n"
+"    bank statements from .csv file.\n"
+"    Import coda file wizard is used to import bank statements."
+msgstr ""
+
+#. module: account_coda
+#: wizard_button:account.coda_import,extraction,end:0
+msgid "_Close"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,statement_id:0
+msgid "Generated Bank Statement"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: model:ir.actions.act_window,name:account_coda.act_account_payment_account_bank_statement
+#: model:ir.actions.act_window,name:account_coda.action_account_coda
+msgid "Coda import"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: account_coda
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda
+msgid "coda for an Account"
+msgstr ""
+
+#. module: account_coda
+#: wizard_field:account.coda_import,init,def_payable:0
+msgid "Default Payable Account"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda
+msgid "Coda Statements"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda_wizard
+msgid "Import Coda Statements"
+msgstr ""
+
+#. module: account_coda
+#: wizard_button:account.coda_import,init,extraction:0
+msgid "_Ok"
+msgstr ""
+
+#. module: account_coda
+#: wizard_view:account.coda_import,extraction:0
+#: wizard_view:account.coda_import,init:0
+msgid "Import Coda Statement"
+msgstr ""
+
+#. module: account_coda
+#: field:account.bank.statement,coda_id:0
+msgid "Coda"
+msgstr ""
+
+#. module: account_coda
+#: wizard_view:account.coda_import,extraction:0
+msgid "Results :"
+msgstr ""
+
+#. module: account_coda
+#: wizard_field:account.coda_import,init,coda:0
+msgid "Coda File"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,date:0
+msgid "Import Date"
+msgstr ""
+
+#. module: account_coda
+#: wizard_view:account.coda_import,init:0
+msgid "Select your bank journal :"
+msgstr ""
--- a/addons/account_coda/security/account_security.xml
+++ b/addons/account_coda/security/account_security.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp><data>
+
+    <record id="account_coda_comp_rule" model="ir.rule">
+        <field name="name">Account Coda model company rule</field>
+        <field model="ir.model" name="model_id" ref="model_account_coda"/>
+        <field eval="True" name="global"/>
+        <field name="domain_force">[('company_id','=',user.company_id.id)]</field>
+    </record>
+
+</data></openerp>
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@ -85,7 +85,7 @@
            <field name="search_view_id" ref="view_account_followup_filter"/>
            <field name="view_type">form</field>
        </record>
-        <menuitem action="action_account_followup_definition_form" id="account_followup_menu" parent="account.menu_finance_configuration" groups="base.group_system"/>
+        <menuitem action="action_account_followup_definition_form" id="account_followup_menu" parent="account.menu_configuration_misc" groups="base.group_system"/>

        <report auto="False" id="account_followup_followup_report" menu="False" model="account_followup.followup" name="account_followup.followup.print" rml="account_followup/report/report_followp_print.rml" string="Followup Report"/>

--- a/addons/account_followup/i18n/hr.po
+++ b/addons/account_followup/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 21:33+0000\n"
-"Last-Translator: nafterburner <nafterburner@gmail.com>\n"
+"PO-Revision-Date: 2010-09-04 09:03+0000\n"
+"Last-Translator: Goran Kliska <gkliska@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-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_followup
@ -29,7 +29,7 @@ msgstr "Partneri"
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Customer Ref :"
-msgstr ""
+msgstr "Poziv na broj"

 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
@ -50,12 +50,12 @@ msgstr "Ispisana Poruka"
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Amount In Currency"
-msgstr ""
+msgstr "Iznos u valuti"

 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Due"
-msgstr ""
+msgstr "Dospijeće"

 #. module: account_followup
 #: view:account.move.line:0
@ -136,7 +136,7 @@ msgstr "Opis"
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Balance:"
-msgstr ""
+msgstr "Saldo:"

 #. module: account_followup
 #: rml:account_followup.followup.print:0
--- 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-31 08:18+0000\n"
+"PO-Revision-Date: 2010-09-04 08:41+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-09-01 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:46+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-31 08:19+0000\n"
+"PO-Revision-Date: 2010-09-04 08:45+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-09-01 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_followup
--- a/addons/account_followup/report/report_followp_print.rml
+++ b/addons/account_followup/report/report_followp_print.rml
@ -136,7 +136,7 @@
          <para style="terp_tblheader_Details_Centre">Ref</para>
        </td>
        <td>
-          <para style="terp_tblheader_Details_Centre">Maturity Date</para>
+          <para style="terp_tblheader_Details_Centre">Due Date</para>
        </td>
        <td>
          <para style="terp_tblheader_Details_Right">Amount In Currency</para>
@ -169,7 +169,7 @@
            <para style="terp_default_Centre_9">[[ line['ref'] ]]</para>
          </td>
          <td>
-            <para style="terp_default_Centre_9">[[ line['date_maturity'] ]]</para>
+            <para style="terp_default_Centre_9">[[ line['date_maturity'] and formatLang(line['date_maturity'], date=True) ]]</para>
          </td>
          <td>
            <para style="terp_default_Right_9">[[ formatLang(line['amount_currency'] )]] [[ line['currency_id'] and line['currency_id'][1] or '' ]] </para>
--- a/addons/account_followup/wizard/account_followup_print.py
+++ b/addons/account_followup/wizard/account_followup_print.py
@ -209,7 +209,7 @@ class account_followup_print_all(osv.osv_memory):
                subtotal_maturity = 0.0
                balance = 0.0
                l = '--------------------------------------------------------------------------------------------------------------------------'
-                head = l+ '\n' + 'Date'.rjust(10) + '\t' + 'Description'.rjust(10) + '\t' + 'Ref'.rjust(10) + '\t' + 'Maturity date'.rjust(10) + '\t' + 'Due'.rjust(10) + '\t' + 'Paid'.rjust(10) + '\t' + 'Maturity'.rjust(10) + '\t' + 'Litigation'.rjust(10) + '\n' + l
+                head = l+ '\n' + 'Date'.rjust(10) + '\t' + 'Description'.rjust(10) + '\t' + 'Ref'.rjust(10) + '\t' + 'Due date'.rjust(10) + '\t' + 'Due'.rjust(10) + '\t' + 'Paid'.rjust(10) + '\t' + 'Maturity'.rjust(10) + '\t' + 'Litigation'.rjust(10) + '\n' + l
                for i in data_lines:
                    maturity = 0.00
                    if i.date_maturity < time.strftime('%Y-%m-%d') and (i.debit - i.credit):
--- a/addons/account_followup/wizard/account_followup_print_view.xml
+++ b/addons/account_followup/wizard/account_followup_print_view.xml
@ -31,20 +31,10 @@
            <field name="target">new</field>
        </record>

-        <record model="ir.values" id="account_followup_print_values">
-            <field name="model_id" ref="model_account_followup_followup" />
-            <field name="object" eval="1" />
-            <field name="name">Send followups</field>
-            <field name="key2">client_action_multi</field>
-            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_followup_print'))" />
-            <field name="key">action</field>
-            <field name="model">account_followup.followup</field>
-        </record>
-
        <menuitem action="action_account_followup_print"
                  id="account_followup_print_menu"
-                  parent="account.menu_finance_periodical_processing"
-                  />
+                  parent="account.menu_finance_periodical_processing_billing"
+                  sequence="10"/>


       <!-- Screen2 -->
--- 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-31 07:59+0000\n"
+"PO-Revision-Date: 2010-09-04 08:41+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-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+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-31 08:19+0000\n"
+"PO-Revision-Date: 2010-09-04 08: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-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_invoice_layout
--- a/addons/account_payment/account_payment.py
+++ b/addons/account_payment/account_payment.py
@ -23,20 +23,6 @@ import time
 from osv import osv, fields
 import netsvc

-class payment_type(osv.osv):
-    _name= 'payment.type'
-    _description= 'Payment Type'
-    _columns= {
-        'name': fields.char('Name', size=64, required=True, help='Payment Type'),
-        'code': fields.char('Code', size=64, required=True, help='Specifies the Code for Payment Type'),
-        'suitable_bank_types': fields.many2many('res.partner.bank.type',
-            'bank_type_payment_type_rel',
-            'pay_type_id', 'bank_type_id',
-            'Suitable bank types')
-            }
-
-payment_type()
-
 class payment_mode(osv.osv):
    _name= 'payment.mode'
    _description= 'Payment Mode'
@ -47,21 +33,19 @@ class payment_mode(osv.osv):
        'journal': fields.many2one('account.journal', 'Journal', required=True,
            domain=[('type', '=', 'cash')], help='Cash Journal for the Payment Mode'),
        'company_id': fields.many2one('res.company', 'Company', required=True),
-        'type': fields.many2one('payment.type', 'Payment type', required=True, help='Select the Payment Type for the Payment Mode.'),
    }
    _defaults = {
        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id
    }
+
    def suitable_bank_types(self, cr, uid, payment_code=None, context={}):
        """Return the codes of the bank type that are suitable
        for the given payment type code"""
        if not payment_code:
            return []
-        cr.execute(""" select t.code
-            from res_partner_bank_type t
-            join bank_type_payment_type_rel r on (r.bank_type_id = t.id)
-            join payment_type pt on (r.pay_type_id = pt.id)
-            join payment_mode pm on (pm.type = pt.id)
+        cr.execute(""" select pb.state
+            from res_partner_bank pb
+            join payment_mode pm on (pm.bank_id = pb.id)
            where pm.id = %s """, [payment_code])
        return [x[0] for x in cr.fetchall()]

@ -319,7 +303,7 @@ class payment_line(osv.osv):
            help='Payment amount in the company currency'),
        'ml_date_created': fields.function(_get_ml_created_date, string="Effective Date",
            method=True, type='date', help="Invoice Effective Date"),
-        'ml_maturity_date': fields.function(_get_ml_maturity_date, method=True, type='date', string='Maturity Date'),
+        'ml_maturity_date': fields.function(_get_ml_maturity_date, method=True, type='date', string='Due Date'),
        'ml_inv_ref': fields.function(_get_ml_inv_ref, method=True, type='many2one', relation='account.invoice', string='Invoice Ref.'),
        'info_owner': fields.function(info_owner, string="Owner Account", method=True, type="text", help='Address of the Main Partner'),
        'info_partner': fields.function(info_partner, string="Destination Account", method=True, type="text", help='Address of the Ordering Customer.'),
@ -419,7 +403,6 @@ class payment_line(osv.osv):
                    if bank.state in bank_type:
                        data['bank_id'] = bank.id
                        break
-
        return {'value': data}

    def fields_get(self, cr, uid, fields=None, context=None):
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@ -40,27 +40,6 @@

        <menuitem id="menu_main" name="Payment" parent="account.menu_finance" sequence="6"/>

-        <record id="view_payment_type_form" model="ir.ui.view">
-            <field name="name">payment.type.form</field>
-            <field name="model">payment.type</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-				<form string="Payment Type">
-                    <field name="name"/>
-                    <field name="code"/>
-                    <separator string="Suitable Bank Types" colspan="4"/>
-                    <field name="suitable_bank_types" nolabel="1"  colspan="4"/>
-                </form>
-            </field>
-        </record>
-
-        <record id="action_payment_type_tree" model="ir.actions.act_window">
-            <field name="name">Payment Type</field>
-            <field name="res_model">payment.type</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-
        <record id="view_payment_mode_tree" model="ir.ui.view">
            <field name="name">payment.mode.tree</field>
            <field name="model">payment.mode</field>
@ -69,7 +48,7 @@
                <tree string="Payment Mode">
                    <field name="name"/>
                    <field name="journal"/>
-                    <field name="company_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                </tree>
            </field>
        </record>
@ -80,10 +59,9 @@
            <field name="arch" type="xml">
                <form string="Payment Mode">
                    <field name="name" select="1"/>
-                    <field name="type"/>
-                    <field name="journal"/>
+                    <field name="journal" select="1"/>
                    <field name="bank_id"/>
-                    <field name="company_id" select="1" widget='selection'/>
+                    <field name="company_id" select="1" widget='selection' groups="base.group_multi_company"/>
                </form>
            </field>
        </record>
@ -94,11 +72,7 @@
            <field name="view_mode">tree,form</field>
        </record>

-        <menuitem id="next_id_44" name="Payment" parent="account.menu_finance_configuration" groups="base.group_system"/>
-
-        <menuitem action="action_payment_mode_form" id="menu_action_payment_mode_form" parent="next_id_44"/>
-
-        <menuitem action="action_payment_type_tree" id="menu_action_paymen_type" parent="next_id_44"/>
+        <menuitem action="action_payment_mode_form" id="menu_action_payment_mode_form" parent="account.menu_configuration_misc"/>

        <record id="view_payment_order_form" model="ir.ui.view">
            <field name="name">payment.order.form</field>
@ -106,12 +80,14 @@
            <field name="type">form</field>
            <field name="arch" type="xml">
                <form string="Payment order">
-                    <field name="reference"/>
-                    <field name="mode"/>
-                    <field name="date_prefered"/>
-                    <field name="date_scheduled" select="1" attrs="{'readonly':[('date_prefered','!=','fixed')]}" />
-                    <field name="user_id"/>
-                    <button colspan="2" name="%(action_create_payment_order)d" string="Select Invoices to Pay" type="action" attrs="{'invisible':[('state','=','done')]}" icon="gtk-find"/>
+                    <group col="6" colspan="4">
+                      <field name="reference"/>
+                      <field name="mode" widget='selection'/>
+                      <field name="user_id"/>
+                      <field name="date_prefered"/>
+                      <field name="date_scheduled" select="1" attrs="{'readonly':[('date_prefered','!=','fixed')]}" />
+                      <button colspan="2" name="%(action_create_payment_order)d" string="Select Invoices to Pay" type="action" attrs="{'invisible':[('state','=','done')]}" icon="gtk-find"/>
+                    </group>
                    <field name="line_ids" colspan="4" widget="one2many_list" nolabel="1">
                        <form string="Payment Line">
                            <notebook>
@ -203,7 +179,7 @@
                    <group col="8" colspan="4">
                        <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
                        <filter string="Confirmed" domain="[('state','=','open')]" icon="terp-camera_test"/>
-                        <filter string="Done" domain="[('state','=','done')]" icon="terp-dolar_ok!"/>
+                        <filter string="Done" domain="[('state','=','done')]" icon="terp-dialog-close"/>
                        <separator orientation="vertical"/>
                        <field name="reference"/>
                        <field name="mode" widget='selection'/>
@ -212,7 +188,7 @@
                    </group>
                    <newline/>
                    <group expand="0" string="Group By...">
-                        <filter string="Payment Mode" context="{'group_by': 'mode'}" icon="terp-dolar_ok!"/>
+                        <filter string="Payment Mode" context="{'group_by': 'mode'}" icon="terp-dolar"/>
                        <filter string="State" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
                    </group>
                </search>
--- 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-31 08:22+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-09-04 08: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-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_payment
--- a/addons/account_payment/i18n/nl.po
+++ b/addons/account_payment/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-02 22:07+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2010-09-02 07:25+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-12 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-03 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_payment
@ -252,7 +252,7 @@ msgstr "Rekeningnummer bestemming"
 #. module: account_payment
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor overzicht"
+msgstr "Ongeldige XML, kan overzicht niet weergeven!"

 #. module: account_payment
 #: wizard_button:populate_payment,init,end:0
@ -468,7 +468,7 @@ msgstr "Informatie"
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
-"De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
+"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!"

 #. module: account_payment
 #: model:ir.actions.wizard,name:account_payment.wizard_pay_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-31 08:23+0000\n"
+"PO-Revision-Date: 2010-09-04 08:10+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-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_payment
--- a/addons/account_payment/security/ir.model.access.csv
+++ b/addons/account_payment/security/ir.model.access.csv
@ -1,5 +1,4 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_payment_type","payment.type","model_payment_type","group_account_payment",1,1,1,1
 "access_payment_mode","payment.mode","model_payment_mode","group_account_payment",1,1,1,1
 "access_payment_order","payment.order","model_payment_order","group_account_payment",1,1,1,1
 "access_payment_line","payment.line","model_payment_line","group_account_payment",1,1,1,1
@ -10,6 +9,5 @@
 "access_payment_order_manager","payment.order manager","model_payment_order","account.group_account_manager",1,0,0,0
 "access_payment_order_system","payment.order system","model_payment_order","base.group_system",1,0,0,0
 "access_payment_mode_system","payment.mode system","model_payment_mode","base.group_system",1,1,1,1
-"access_payment_type_system","payment.type system","model_payment_type","base.group_system",1,1,1,1
 "access_payment_order_invoice","payment.order invoice","model_payment_order","account.group_account_invoice",1,1,1,1
 "access_payment_line_invoice","payment.line invoice","model_payment_line","account.group_account_invoice",1,1,1,1
--- a/addons/account_payment/test/account_payment.yml
+++ b/addons/account_payment/test/account_payment.yml
@ -1,12 +1,5 @@
 -
-  In order to test account_payment in OpenERP I create a new record Type.
-
-  !record {model: payment.type, id: payment_type_t0}:
-    code: T0
-    name: TestType
-
-
-  I created a new Bank Record
+  In order to test account_payment in OpenERP I created a new Bank Record
 -
  Creating a res.partner.bank record
 -
@ -26,7 +19,6 @@
    bank_id: res_partner_bank_0
    journal: account.bank_journal
    name: TestMode
-    type: payment_type_t0

 -
  I created a Supplier Invoice
--- a/addons/account_payment/wizard/account_payment_pay.py
+++ b/addons/account_payment/wizard/account_payment_pay.py
@ -30,23 +30,24 @@ class account_payment_make_payment(osv.osv_memory):
        If type is manual. just confirm the order.
        """
        obj_payment_order = self.pool.get('payment.order')
-        obj_model = self.pool.get('ir.model.data')
-        obj_act = self.pool.get('ir.actions.act_window')
-        order= obj_payment_order.browse(cr, uid, context['active_id'], context)
-        t = order.mode and order.mode.type.code or 'manual'
-        if t == 'manual' :
-            obj_payment_order.set_done(cr,uid,context['active_id'],context)
-            return {}
-
-        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 = 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]
+#        obj_model = self.pool.get('ir.model.data')
+#        obj_act = self.pool.get('ir.actions.act_window')
+#        order = obj_payment_order.browse(cr, uid, context['active_id'], context)
+        return obj_payment_order.set_done(cr, uid, context['active_id'], context)
+#        t = order.mode and order.mode.type.code or 'manual'
+#        if t == 'manual' :
+#            obj_payment_order.set_done(cr,uid,context['active_id'],context)
+#            return {}
+#
+#        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 = 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]

 account_payment_make_payment()

--- 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-31 08:19+0000\n"
+"PO-Revision-Date: 2010-09-04 08: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-09-01 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:45+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-31 08:21+0000\n"
+"PO-Revision-Date: 2010-09-04 08:36+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-09-01 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_report
--- 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-31 07:58+0000\n"
+"PO-Revision-Date: 2010-09-04 08: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-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+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-31 08:21+0000\n"
+"PO-Revision-Date: 2010-09-04 08: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-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_reporting
--- a/addons/account_tax_include/i18n/nb.po
+++ b/addons/account_tax_include/i18n/nb.po
@ -0,0 +1,53 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-09-04 09:03+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Norwegian Bokmal <nb@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-09-05 04:46+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Ugyldig XML for visningsarkitektur!"
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr ""
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr ""
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr ""
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr ""
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr ""
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr "Subtotal"
--- 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-31 08:19+0000\n"
+"PO-Revision-Date: 2010-09-04 08: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-09-01 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_tax_include
--- 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-31 08:19+0000\n"
+"PO-Revision-Date: 2010-09-04 08:35+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-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04: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-31 08:19+0000\n"
+"PO-Revision-Date: 2010-09-04 08: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-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_voucher
--- a/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@ -243,7 +243,7 @@ class account_voucher(osv.osv):
            })
        return {'value':default}
    
-    def onchange_partner_id(self, cr, uid, ids, partner_id, journal_id=False, price=0.0, ttype=False, context={}):
+    def onchange_partner_id(self, cr, uid, ids, partner_id, journal_id=False, price=0.0, currency_id=False, ttype=False, context={}):
        """price
        Returns a dict that contains new values and context
    
@ -255,6 +255,8 @@ class account_voucher(osv.osv):
        """
        if not journal_id:
            return {}
+        
+        currency_pool = self.pool.get('res.currency')
        move_pool = self.pool.get('account.move')
        line_pool = self.pool.get('account.voucher.line')
        move_line_pool = self.pool.get('account.move.line')
@ -304,11 +306,19 @@ class account_voucher(osv.osv):
        ids.reverse()
        moves = move_line_pool.browse(cr, uid, ids)
        
+        company_currency = self.pool.get('res.users').browse(cr, uid, uid).company_id.currency_id.id
+        if company_currency != currency_id and ttype == 'payment':
+            total_debit = currency_pool.compute(cr, uid, currency_id, company_currency, total_debit)
+        elif company_currency != currency_id and ttype == 'receipt':
+            total_credit = currency_pool.compute(cr, uid, currency_id, company_currency, total_credit)
+            
        for line in moves:
            if line.credit and line.reconcile_partial_id:
                continue
+            
            total_credit += line.credit or 0.0
            total_debit += line.debit or 0.0
+
        for line in moves:
            if line.credit and line.reconcile_partial_id:
                continue
@ -323,11 +333,13 @@ class account_voucher(osv.osv):
                'amount_unreconciled': line.amount_unreconciled
            }
            if line.credit:
-                rs['amount'] = min(line.amount_unreconciled, total_debit)
-                total_debit -= rs['amount']
+                amount = min(line.amount_unreconciled, total_debit)
+                rs['amount'] = currency_pool.compute(cr, uid, company_currency, currency_id, amount)
+                total_debit -= amount
            else:
-                rs['amount'] = min(line.amount_unreconciled, total_credit)
-                total_credit -= rs['amount']
+                amount = min(line.amount_unreconciled, total_credit)
+                rs['amount'] = currency_pool.compute(cr, uid, company_currency, currency_id, amount)
+                total_credit -= amount

            default['value']['line_ids'].append(rs)
            if rs['type'] == 'cr':
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@ -8,13 +8,13 @@
            <field name="arch" type="xml">
                <form string="Bill Payment">
                    <group col="6" colspan="4">
-                        <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, type)" string="Vendor"/>
+                        <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type)" context="{'invoice_currency':currency_id}" string="Vendor"/>
                        <field name="journal_id"
                            domain="[('type','in',['bank', 'cash'])]"
                            widget="selection" select="1"
-                            on_change="onchange_partner_id(partner_id, journal_id, amount, type)"
+                            on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type)"
                            string="Payment Method"/>
-                        <field name="amount" on_change="onchange_partner_id(partner_id, journal_id, amount, type)"/>
+                        <field name="amount" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type)"/>
                        <field name="reference" select="1" string="Payment Ref"/>
                        <field name="name" colspan="4"/>
                        <field name="account_id"
@ -104,14 +104,14 @@
            <field name="arch" type="xml">
                <form string="Sales Payment">
                    <group col="6" colspan="4">
-                        <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, type)" string="Customer"/>
+                        <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type)" string="Customer"/>
                        <field name="journal_id"
                            domain="[('type','in',['bank', 'cash'])]"
                            widget="selection" select="1"
-                            on_change="onchange_partner_id(partner_id, journal_id, amount, type)"
+                            on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type)"
                            string="Payment Method"/>
                        <field name="amount"
-                            on_change="onchange_partner_id(partner_id, journal_id, amount, type)"/>
+                            on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type)"/>
                        <field name="reference" select="1" string="Payment Ref"/>
                        <field name="name" colspan="4"/>
                        <field name="account_id"
--- 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-31 08:08+0000\n"
+"PO-Revision-Date: 2010-09-04 08:16+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-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: analytic_journal_billing_rate
--- a/addons/analytic_user_function/i18n/nl.po
+++ b/addons/analytic_user_function/i18n/nl.po
@ -7,19 +7,19 @@ 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-03 02:55+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-09-02 07:26+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-12 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-09-03 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: analytic_user_function
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor overzicht"
+msgstr "Ongeldige XML, kan overzicht niet weergeven!"

 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
@ -52,7 +52,7 @@ msgstr "Gebruiker"
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
-"De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
+"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!"

 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
--- 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-31 08:08+0000\n"
+"PO-Revision-Date: 2010-09-04 08:41+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-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: analytic_user_function
--- 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-31 07:59+0000\n"
+"PO-Revision-Date: 2010-09-04 08:41+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-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+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-31 08:19+0000\n"
+"PO-Revision-Date: 2010-09-04 08:34+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-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+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-31 08:08+0000\n"
+"PO-Revision-Date: 2010-09-04 08:45+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-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: auction
--- a/addons/auction/test/auction.yml
+++ b/addons/auction/test/auction.yml
@ -1,7 +1,5 @@
 -
-  In order to test the auction module in the Open-ERP I start the process by creating a product.
- 
-  I create a new product furniture.
+  In order to test the auction module in the OpenERP I start the process by creating a product.
 - 
  !record {model: product.product, id: product_product_furniture0}:
    categ_id: product.cat1
@ -36,8 +34,7 @@
 - 
  !record {model: account.journal, id: account.sales_journal}:
    analytic_journal_id: account.cose_journal_sale    
-        
-      
+-
  I'm creating new Seller "Mr. Pinakin" with him email "info@mycustomer.com".
 - 
  !record {model: res.partner, id: res_partner_mrpinakin0}:
@ -225,8 +222,7 @@
  !python {model: auction.lots}: |
    from tools.translate import _
    auc_id=self.browse(cr, uid, ref("auction_lots_woodenchair0"))
-    assert(auc_id.buyer_price,auc_id.seller_price), _('Buyer price and seller price are not available!')
- 
+    assert auc_id.buyer_price and auc_id.seller_price, _('Buyer price and seller price are not available!')
 -
  Now, An object has been sold,so I click on the "Sold" button.
 -
@ -271,44 +267,15 @@
    auc_id=self.browse(cr, uid, ref("auction_lots_woodenchair0"))
    assert(auc_id.ach_inv_id), _('Buyer Invoice has not been created!')     
 - 
-  Buyer Create a Invoice payment record by Click on "Pay Invoice" Button of Account invoice. 
+  Buyer pays the invoice
 - 
-  !record {model: account.invoice.pay, id: account_invoice_pay_furniture0}:
-    amount: 4120.0
-    date: '2010-08-06'
-    journal_id: account.cash_journal
-    name: Furniture
-    period_id: account.period_8
- 
-  Now Buyer want to make Full payment by click on "Full Payment" button of Account Invoice wizard.
- 
-  !python {model: account.invoice.pay}: |
-    obj_invoice = self.pool.get('account.invoice')
+  !python {model: account.invoice}: |
    obj_lots = self.pool.get('auction.lots')
    lots_id = obj_lots.browse(cr, uid, ref("auction_lots_woodenchair0"))
-    invoice_ids = obj_invoice.search(cr, uid, [('id', '=', lots_id.ach_inv_id.id)])
-    self.wo_check(cr, uid, [ref("account_invoice_pay_furniture0")], {"active_model": "account.invoice", "department_id": False,
-      "record_id": 7, "search_default_draft": "1", "active_ids": invoice_ids,
-      "active_id": invoice_ids[0]})
- 
-  After Click on Full Payment Button, Creating a account invoice pay writeoff record.
- 
-  !record {model: account.invoice.pay.writeoff, id: account_invoice_pay_writeoff_0}:
-    comment: Write-Off
-    writeoff_acc_id: auction.auction_income_costs
-    writeoff_journal_id: account.sales_journal
- 
-  And  click on "pay_and_reconcile_writeoff" button. 
- 
-  !python {model: account.invoice.pay.writeoff}: |
-    obj_invoice = self.pool.get('account.invoice')
-    obj_lots = self.pool.get('auction.lots')
-    lots_id = obj_lots.browse(cr, uid, ref("auction_lots_woodenchair0"))
-    invoice_ids = obj_invoice.search(cr, uid, [('id', '=', lots_id.ach_inv_id.id)])
-    self.pay_and_reconcile_writeoff(cr, uid, [ref("account_invoice_pay_writeoff_0")],
-      {"active_model": "account.invoice", "department_id":
-      False, "record_id": 7, "search_default_draft": "1", "active_ids": invoice_ids ,
-      "active_id": invoice_ids[0], })
+    self.pay_and_reconcile(cr, uid, [lots_id.ach_inv_id.id], 4120.0,
+        ref('account.cash'), ref('account.period_8'),
+        ref('account.cash_journal'), ref('account.cash'),
+        ref('account.period_8'), ref('account.cash_journal'), name='Furniture')
 -
  I check that "Buyer Invoice Reconciled" field is marked.
 -
--- 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-31 08:23+0000\n"
+"PO-Revision-Date: 2010-09-04 08:01+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-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04: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-31 08:09+0000\n"
+"PO-Revision-Date: 2010-09-04 08:45+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-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04: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-31 08:09+0000\n"
+"PO-Revision-Date: 2010-09-04 08:36+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-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: audittrail
--- 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-31 08:18+0000\n"
+"PO-Revision-Date: 2010-09-04 08:41+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-09-01 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: lt\n"

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