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

bzr revid: ksa@tinyerp.co.in-20100911053448-4xnbt4689ezjdtch
2010-09-11 11:04:48 +05:30
parent cb68bf6a02 e22b807a70
commit be82397241
428 changed files with 15354 additions and 3409 deletions
@@ -53,11 +53,11 @@ module named account_voucher.
        'wizard/account_move_bank_reconcile_view.xml',
        'wizard/account_use_model_view.xml',
        'account_installer.xml',
+        'wizard/account_period_close_view.xml',
        'account_view.xml',
        'account_report.xml',
        'wizard/account_report_common_view.xml',
        'wizard/account_invoice_refund_view.xml',
-        'wizard/account_period_close_view.xml',
        'wizard/account_fiscalyear_close_state.xml',
        'wizard/account_chart_view.xml',
        'wizard/account_tax_chart_view.xml',
@@ -1082,7 +1082,7 @@ class account_move(osv.osv):
        'partner_id': fields.related('line_id', 'partner_id', type="many2one", relation="res.partner", string="Partner"),
        'amount': fields.function(_amount_compute, method=True, string='Amount', digits_compute=dp.get_precision('Account'), type='float', fnct_search=_search_amount),
        'date': fields.date('Date', required=True, states={'posted':[('readonly',True)]}),
-        'narration':fields.text('Narration', select=True),
+        'narration':fields.text('Narration'),
        'company_id': fields.related('journal_id','company_id',type='many2one',relation='res.company',string='Company',store=True),
    }
    _defaults = {
@@ -1151,24 +1151,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={}):
@@ -2046,7 +2039,7 @@ class account_model_line(osv.osv):
        'currency_id': fields.many2one('res.currency', 'Currency'),

        'partner_id': fields.many2one('res.partner', 'Partner'),
-        'date_maturity': fields.selection([('today','Date of the day'), ('partner','Partner Payment Term')], 'Maturity date', help="The maturity date of the generated entries for this model. You can choose between the creation date or the creation date of the entries plus the partner payment terms."),
+        'date_maturity': fields.selection([('today','Date of the day'), ('partner','Partner Payment Term')], 'Due date', help="The due date of the generated entries for this model. You can choose between the creation date or the creation date of the entries plus the partner payment terms."),
        'date': fields.selection([('today','Date of the day'), ('partner','Partner Payment Term')], 'Current Date', required=True, help="The date of the generated entries"),
    }
    _defaults = {
@@ -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:
@@ -232,7 +232,7 @@ class account_cash_statement(osv.osv):
                'starting_details_ids':False
            })
        res_id = super(account_cash_statement, self).create(cr, uid, vals, context=context)
-        self.write(cr, uid, [res_id], {})
+        #self.write(cr, uid, [res_id], {})
        return res_id

    def write(self, cr, uid, ids, vals, context=None):
@@ -344,6 +344,7 @@ class account_cash_statement(osv.osv):
        res_users_obj = self.pool.get('res.users')
        account_move_obj = self.pool.get('account.move')
        account_move_line_obj = self.pool.get('account.move.line')
+        account_analytic_line_obj = self.pool.get('account.analytic.line')
        account_bank_statement_line_obj = self.pool.get('account.bank.statement.line')

        company_currency_id = res_users_obj.browse(cr, uid, uid, context=context).company_id.currency_id.id
@@ -372,6 +373,10 @@ class account_cash_statement(osv.osv):
            # In line we get reconcile_id on bank.ste.rec.
            # in bank stat.rec we get line_new_ids on bank.stat.rec.line
            for move in st.line_ids:
+                if move.analytic_account_id:
+                    if not st.journal_id.analytic_journal_id:
+                        raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (st.journal_id.name,))
+
                context.update({'date':move.date})
                move_id = account_move_obj.create(cr, uid, {
                    'journal_id': st.journal_id.id,
@@ -410,6 +415,7 @@ class account_cash_statement(osv.osv):
                    'journal_id': st.journal_id.id,
                    'period_id': st.period_id.id,
                    'currency_id': st.currency.id,
+                    'analytic_account_id': move.analytic_account_id and move.analytic_account_id.id or False
                }

                amount = res_currency_obj.compute(cr, uid, st.currency.id,
@@ -430,8 +436,28 @@ class account_cash_statement(osv.osv):
                                move.account_id.currency_id.id, amount, context=context,
                                account=acc_cur)
                    val['amount_currency'] = amount_cur
+                move_line_id = account_move_line_obj.create(cr, uid, val , context=context)
+                torec.append(move_line_id)

-                torec.append(account_move_line_obj.create(cr, uid, val , context=context))
+                if move.analytic_account_id:
+                    anal_val = {}
+                    amt = (val['credit'] or  0.0) - (val['debit'] or 0.0)
+                    anal_val = {
+                        'name': val['name'],
+                        'ref': val['ref'],
+                        'date': val['date'],
+                        'amount': amt,
+                        'account_id': val['analytic_account_id'],
+                        'currency_id': val['currency_id'],
+                        'general_account_id': val['account_id'],
+                        'journal_id': st.journal_id.analytic_journal_id.id,
+                        'period_id': val['period_id'],
+                        'user_id': uid,
+                        'move_id': move_line_id
+                                }
+                    if val.get('amount_currency', False):
+                        anal_val['amount_currency'] = val['amount_currency']
+                    account_analytic_line_obj.create(cr, uid, anal_val, context=context)

                if move.reconcile_id and move.reconcile_id.line_new_ids:
                    for newline in move.reconcile_id.line_new_ids:
@@ -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>
@@ -65,7 +65,7 @@
                            <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="base.group_extended"/>
                            <newline/>
                            <field name="price_subtotal"/>
-                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            <field name="company_id" groups="base.group_multi_company" readonly="1"/>
                            <field colspan="4" name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]"/>
                        </page>
                        <page string="Notes">
@@ -7,6 +7,8 @@
        <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"/>
+        <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"/>
@@ -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)
@@ -986,9 +986,10 @@ class account_move_line(osv.osv):
            if 'period_id' in vals and 'period_id' not in context:
                period_id = vals['period_id']
            elif 'journal_id' not in context and 'move_id' in vals:
-                m = self.pool.get('account.move').browse(cr, uid, vals['move_id'])
-                journal_id = m.journal_id.id
-                period_id = m.period_id.id
+                if vals['move_id']:
+                    m = self.pool.get('account.move').browse(cr, uid, vals['move_id'])
+                    journal_id = m.journal_id.id
+                    period_id = m.period_id.id
            else:
                journal_id = context.get('journal_id',False)
                period_id = context.get('period_id',False)
@@ -91,15 +91,15 @@
            <field name="type">form</field>
            <field name="arch" type="xml">
                <form string="Period">
-                    <field name="name" select="1"/>
-                    <field name="code" select="1"/>
+                    <field name="name"/>
+                    <field name="code"/>
                    <field name="date_start"/>
                    <field name="date_stop"/>
                    <field name="company_id" groups="base.group_multi_company"/>
                    <field name="fiscalyear_id"/>
                    <field name="special"/>
                    <separator colspan="4" string="States"/>
-                    <field name="state" select="1"/>
+                    <field name="state"/>
                    <button name="action_draft" states="done" string="Set to Draft" type="object" icon="gtk-convert" groups="account.group_account_manager"/>
                </form>
            </field>
@@ -110,20 +110,40 @@
            <field name="type">tree</field>
            <field name="arch" type="xml">
              <tree colors="blue:state in ('draft');gray:state in ('done') " string="Period">
-                    <field name="code"/>
                    <field name="name"/>
+                    <field name="code"/>
                    <field name="date_start"/>
                    <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"/>
                </tree>
            </field>
        </record>
+
+        <record id="view_account_period_search" model="ir.ui.view">
+            <field name="name">account.period.search</field>
+            <field name="model">account.period</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Period">
+                    <group>
+                        <filter string="Draft" name="draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
+                        <separator orientation="vertical"/>
+                        <field name="code"/>
+                        <field name="name"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
        <record id="action_account_period_form" model="ir.actions.act_window">
            <field name="name">Periods</field>
            <field name="res_model">account.period</field>
            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form,search</field>
+            <field name="context">{'search_default_draft': 1}</field>
        </record>
        <menuitem action="action_account_period_form" id="menu_action_account_period_form" parent="account.next_id_23"/>

@@ -491,7 +511,7 @@
                        <field name="balance_end_real"/>
                        <field name="currency" invisible="1"/>
                        <button name="%(action_view_account_statement_from_invoice_lines)d"
-                            string="Import Invoices" type="action" icon="gtk-dnd"
+                            string="Import Invoices" type="action" icon="gtk-execute"
                            attrs="{'invisible':[('state','=','confirm')]}"/>
                    </group>
                    <notebook colspan="4">
@@ -560,6 +580,8 @@
            <field name="act_window_id" ref="action_bank_statement_tree"/>
        </record>
        <menuitem string="Bank Statements" action="action_bank_statement_tree" id="menu_bank_statement_tree" parent="menu_finance_bank_and_cash" sequence="7"/>
+        <menuitem name="Statements Reconciliation" action="action_bank_statement_tree" id="menu_menu_Bank_process" parent="menu_finance_periodical_processing_bank" sequence="7"/>
+

        <record id="action_bank_statement_draft_tree" model="ir.actions.act_window">
            <field name="name">Draft statements</field>
@@ -1098,7 +1120,7 @@
            icon="STOCK_JUSTIFY_FILL"
            id="menu_action_account_moves_all"
            parent="account.menu_finance_entries"
-            sequence="4"
+            sequence="1"
            groups="group_account_user,group_account_manager,base.group_system"
        />

@@ -1458,7 +1480,7 @@
            id="action_account_manual_reconcile" name="Journal Items"
            res_model="account.move.line"
            view_id="view_move_line_tree"/>
-            />
+

        <menuitem
                name="Manual Reconcilication" icon="STOCK_EXECUTE"
@@ -1835,7 +1857,7 @@

        <act_window domain="[('journal_id', '=', active_id)]" id="act_account_journal_2_account_move_line" name="Journal Items" 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"/>

@@ -2433,7 +2455,7 @@
                        </group>
                        <group col="2" colspan="2">
                            <separator string="Opening Balance" colspan="4"/>
-                            <field name="balance_start" readonly="1" string="Opening Balance"/>
+                            <field name="balance_start" attrs="{'readonly':[('state','in',('open','confirm'))]}" string="Opening Balance"/>
                            <field name="total_entry_encoding"/>
                        </group>
                        <group col="2" colspan="2">
@@ -177,7 +177,7 @@
 				
 			        <record id="conf_ova" model="account.account.template">
 			            <field name="code">1103</field>
-			            <field name="name">Output VAT</field>
+			            <field name="name">Tax Paid</field>
 			            <field ref="conf_cas" name="parent_id"/>
 			            <field name="type">other</field>
 			            <field name="user_type" ref="conf_account_type_asset"/>
@@ -210,7 +210,7 @@
 			
 			        <record id="conf_iva" model="account.account.template">
 			            <field name="code">1112</field>
-			            <field name="name">Input VAT</field>
+			            <field name="name">Tax Received</field>
 			            <field ref="conf_cli" name="parent_id"/>
 			            <field name="type">other</field>
 			            <field name="user_type" ref="conf_account_type_liability"/>
@@ -308,55 +308,55 @@

 			<!-- Input TAX -->
 	        <record id="tax_code_input" model="account.tax.code.template">
-	            <field name="name">Input TAX</field>
+	            <field name="name">Tax Received</field>
 	            <field name="parent_id" ref="tax_code_balance_net"/>
 	            <field eval="-1" name="sign"/>
 	        </record>

 		        <record id="tax_code_input_S" model="account.tax.code.template">
-		            <field name="name">Input TAX Rate S (15%)</field>
+		            <field name="name">Tax Received Rate S (15%)</field>
 		            <field name="parent_id" ref="tax_code_input"/>
 		        </record>
 	
 		        <record id="tax_code_input_R" model="account.tax.code.template">
-		            <field name="name">Input TAX Rate R (5%)</field>
+		            <field name="name">Tax Received Rate R (5%)</field>
 		            <field name="parent_id" ref="tax_code_input"/>
 		        </record>

 		        <record id="tax_code_input_X" model="account.tax.code.template">
-		            <field name="name">Input TAX Rate X (Exempt)</field>
+		            <field name="name">Tax Received Rate X (Exempt)</field>
 		            <field name="parent_id" ref="tax_code_input"/>
 		        </record>
 	
 		        <record id="tax_code_input_O" model="account.tax.code.template">
-		            <field name="name">Input TAX Rate O (Out of scope)</field>
+		            <field name="name">Tax Received Rate O (Out of scope)</field>
 		            <field name="parent_id" ref="tax_code_input"/>
 		        </record>

 	        <!-- Output TAX -->
 	
 	        <record id="tax_code_output" model="account.tax.code.template">
-	            <field name="name">Output TAX</field>
+	            <field name="name">Tax Paid</field>
 	            <field name="parent_id" ref="tax_code_balance_net"/>
 	        </record>

 		        <record id="tax_code_output_S" model="account.tax.code.template">
-		            <field name="name">Output TAX Rate S (15%)</field>
+		            <field name="name">Tax Paid Rate S (15%)</field>
 		            <field name="parent_id" ref="tax_code_output"/>
 		        </record>
 		
 		        <record id="tax_code_output_R" model="account.tax.code.template">
-		            <field name="name">Output TAX Rate R (5%)</field>
+		            <field name="name">Tax Paid Rate R (5%)</field>
 		            <field name="parent_id" ref="tax_code_output"/>
 		        </record>

 		        <record id="tax_code_output_X" model="account.tax.code.template">
-		            <field name="name">Output TAX Rate X (Exempt)</field>
+		            <field name="name">Tax Paid Rate X (Exempt)</field>
 		            <field name="parent_id" ref="tax_code_output"/>
 		        </record>
 		
 		        <record id="tax_code_output_O" model="account.tax.code.template">
-		            <field name="name">Output TAX Rate O (Out of scope)</field>
+		            <field name="name">Tax Paid Rate O (Out of scope)</field>
 		            <field name="parent_id" ref="tax_code_output"/>
 		        </record>

@@ -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>
@@ -355,6 +355,7 @@
            <field name="name">Sales Credit Note Journal - (test)</field>
            <field name="code">SCNJ</field>
            <field name="type">sale_refund</field>
+            <field eval="True" name="refund_journal"/>
            <field name="view_id" ref="account_sp_refund_journal_view"/>
            <field name="sequence_id" ref="sequence_sale_journal"/>
            <field name="invoice_sequence_id" ref="seq_out_refund"/>
@@ -378,6 +379,7 @@
            <field name="name">Expenses Credit Notes Journal - (test)</field>
            <field name="code">ECNJ</field>
            <field name="type">purchase_refund</field>
+            <field eval="True" name="refund_journal"/>
            <field name="view_id" ref="account_sp_refund_journal_view"/>
            <field name="sequence_id" ref="sequence_purchase_journal"/>
            <field name="invoice_sequence_id" ref="seq_in_refund"/>
@@ -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-30 08:15+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-08-31 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account
@@ -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"
@@ -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-30 08:12+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-08-31 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account
@@ -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-30 08:16+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-08-31 03:57+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
@@ -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-30 08:12+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-08-31 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account
@@ -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-30 08:12+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-08-31 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account
@@ -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:11+0000\n"
-"Last-Translator: mga (Open ERP) <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-08-12 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-09-02 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account
@@ -6073,107 +6073,107 @@ msgstr "Processar Datas de Lançamento"
 #. module: account
 #: view:board.board:0
 msgid "Analytic accounts to close"
-msgstr ""
+msgstr "Contas analíticas em aberto"

 #. module: account
 #: view:board.board:0
 msgid "Draft invoices"
-msgstr ""
+msgstr "Faturas provisórias"

 #. module: account
 #: model:ir.actions.act_window,name:account.open_board_account
 #: model:ir.ui.menu,name:account.menu_board_account
 msgid "Accounting Dashboard"
-msgstr ""
+msgstr "Painel contábil"

 #. module: account
 #: view:board.board:0
 #: model:ir.actions.act_window,name:account.act_my_account
 msgid "Accounts to invoice"
-msgstr ""
+msgstr "Contas a serem faturadas"

 #. module: account
 #: view:board.board:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
 msgid "Costs to invoice"
-msgstr ""
+msgstr "Custos a faturar"

 #. module: account
 #: view:board.board:0
 msgid "Aged receivables"
-msgstr ""
+msgstr "Recebíveis vencidos"

 #. module: account
 #: model:ir.module.module,shortdesc:account.module_meta_information
 msgid "Board for accountant"
-msgstr ""
+msgstr "Painel de Contabilização"

 #. module: account
 #: model:ir.actions.act_window,name:account.action_aged_income
 msgid "Income Accounts"
-msgstr ""
+msgstr "Contas de Receitas"

 #. module: account
 #: view:board.board:0
 msgid "My indicators"
-msgstr ""
+msgstr "Meus indicadores"

 #. module: account
 #: view:board.board:0
 msgid "Account Board"
-msgstr ""
+msgstr "Painel Contábil"

 #. module: account
 #: view:board.board:0
 msgid "Aged income"
-msgstr ""
+msgstr "Receita vencida"

 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,show_columns:0
 msgid "Show Debit/Credit Information"
-msgstr ""
+msgstr "Exibir Informações de Débito/Crédito"

 #. module: account
 #: selection:account.balance.account.balance.report,init,account_choice:0
 msgid "All accounts"
-msgstr ""
+msgstr "Todas as contas"

 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,period_manner:0
 msgid "Entries Selection Based on"
-msgstr ""
+msgstr "Lançamentos escolhidos com base em"

 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 #: wizard_view:account.balance.account.balance.report,zero_years:0
 msgid "Notification"
-msgstr ""
+msgstr "Alerta"

 #. module: account
 #: selection:account.balance.account.balance.report,init,period_manner:0
 msgid "Financial Period"
-msgstr ""
+msgstr "Período Financeiro"

 #. module: account
 #: model:ir.actions.report.xml,name:account.account_account_balance
 #: model:ir.actions.report.xml,name:account.account_account_balance_landscape
 msgid "Account balance"
-msgstr ""
+msgstr "Saldo da Conta"

 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Select Period(s)"
-msgstr ""
+msgstr "Selecione o(s) Período(s)"

 #. module: account
 #: selection:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Percentage"
-msgstr ""
+msgstr "Porcentagem"

 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Compare Selected Years In Terms Of"
-msgstr ""
+msgstr "Comparar os Anos Escolhidos em Termos de"

 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
@@ -6188,7 +6188,7 @@ msgstr "Selecione conta de referência (para comparação de %)"
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_account_balance_report
 msgid "Account balance-Compare Years"
-msgstr ""
+msgstr "Balanço de Contas - Comparação Anual"

 #. module: account
 #: model:ir.module.module,description:account.module_meta_information
@@ -6211,6 +6211,25 @@ msgid ""
 "    5. You have an option to print the desired report in Landscape format.\n"
 "    "
 msgstr ""
+"O Módulo de Saldo da Conta é uma funcionalidade adicional ao Módulo de "
+"Gestão Financeira.\n"
+"\n"
+"    Este módulo oferece diversas opções para impressão.\n"
+"\n"
+"    1. Você pode comparar o balanço de diferentes anos.\n"
+"\n"
+"    2. Você pode configurar uma comparação por dinheiro ou percentual para "
+"comparação entre dois anos.\n"
+"\n"
+"    3. Você pode configurar a conta de referência para a comparação "
+"percentual para os anos específicos.\n"
+"\n"
+"    4. Você pode selecionar períodos como data atual ou períodos por data de "
+"criação.\n"
+"\n"
+"    5. Você tem a opção de imprimir o relatório desejado em formato "
+"paisagem.\n"
+"    "

 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
@@ -6359,7 +6378,7 @@ msgstr "Contas por tipo"
 #. module: account
 #: model:ir.model,name:report_account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
-msgstr ""
+msgstr "Recebíveis Vencidos até Hoje"

 #. module: account
 #: model:ir.model,name:report_account.model_report_account_receivable
@@ -6379,7 +6398,7 @@ msgstr "Um módulo que adiciona novos relatórios com base no módulo de conta."
 #. module: account
 #: model:ir.module.module,shortdesc:report_account.module_meta_information
 msgid "Account Reporting - Reporting"
-msgstr ""
+msgstr "Relatório de Contas"

 #. module: account
 #: model:ir.actions.act_window,name:report_account.action_account_receivable_graph
@@ -6401,7 +6420,7 @@ msgstr "Criar data"
 #: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph
 #: view:report.aged.receivable:0
 msgid "Aged Receivable"
-msgstr ""
+msgstr "A Receber"

 #. module: account
 #: view:report.invoice.created:0
@@ -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-30 08:10+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-08-31 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account
@@ -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-30 08:13+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-08-31 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account
@@ -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-30 08:14+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-08-31 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account
@@ -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-30 08:12+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-08-31 03:57+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
@@ -374,6 +374,7 @@ class account_installer(osv.osv_memory):
        #Sales Refund Journal
        vals_journal['name'] = _('Sales Refund Journal')
        vals_journal['type'] = 'sale_refund'
+        vals_journal['refund_journal'] = True
        vals_journal['code'] = _('SCNJ')
        vals_journal['sequence_id'] = seq_id_sale_refund

@@ -386,6 +387,7 @@ class account_installer(osv.osv_memory):
        # Purchase Refund Journal
        vals_journal['name'] = _('Purchase Refund Journal')
        vals_journal['type'] = 'purchase_refund'
+        vals_journal['refund_journal'] = True
        vals_journal['code'] = _('ECNJ')
        vals_journal['sequence_id'] = seq_id_purchase_refund

@@ -495,6 +497,8 @@ class account_installer(osv.osv_memory):
                sal_tax_parent_id = mod_obj.read(cr, uid, [sal_tax_parent], ['res_id'])[0]['res_id']

                if s_tax*100 > 0.0:
+                    tax_account_ids = obj_acc.search(cr, uid, [('name','=','Tax Received')], context=context)
+                    sales_tax_account_id = tax_account_ids and tax_account_ids[0] or False
                    vals_tax_code = {
                        'name': 'TAX%s%%'%(s_tax*100),
                        'code': 'TAX%s%%'%(s_tax*100),
@@ -509,11 +513,18 @@ class account_installer(osv.osv_memory):
                                            'amount':s_tax,
                                            'base_code_id':new_tax_code,
                                            'tax_code_id':new_tax_code,
-                                            'type_tax_use':'sale'
+                                            'type_tax_use':'sale',
+                                            'account_collected_id':sales_tax_account_id,
+                                            'account_paid_id':sales_tax_account_id
                                            })
+                    default_account_ids = obj_acc.search(cr, uid, [('name','=','Product Sales')],context=context)
+                    if default_account_ids:
+                        obj_acc.write(cr, uid, default_account_ids, {'tax_ids':[(6,0,[sales_tax])]})
                    tax_val.update({'taxes_id':[(6,0,[sales_tax])]})
                    default_tax.append(('taxes_id',sales_tax))
                if p_tax*100 > 0.0:
+                    tax_account_ids = obj_acc.search(cr, uid, [('name','=','Tax Paid')], context=context)
+                    purchase_tax_account_id = tax_account_ids and tax_account_ids[0] or False
                    vals_tax_code = {
                        'name': 'TAX%s%%'%(p_tax*100),
                        'code': 'TAX%s%%'%(p_tax*100),
@@ -528,8 +539,13 @@ class account_installer(osv.osv_memory):
                                             'amount':p_tax,
                                             'base_code_id':new_tax_code,
                                            'tax_code_id':new_tax_code,
-                                            'type_tax_use':'purchase'
+                                            'type_tax_use':'purchase',
+                                            'account_collected_id':purchase_tax_account_id,
+                                            'account_paid_id':purchase_tax_account_id
                                             })
+                    default_account_ids = obj_acc.search(cr, uid, [('name','=','Expenses')], context=context)
+                    if default_account_ids:
+                        obj_acc.write(cr, uid, default_account_ids, {'tax_ids':[(6,0,[purchase_tax])]})
                    tax_val.update({'supplier_taxes_id':[(6,0,[purchase_tax])]})
                    default_tax.append(('supplier_taxes_id',purchase_tax))
                if len(tax_val):
@@ -527,8 +527,12 @@ class account_invoice(osv.osv):
                        else:
                            continue
        if company_id and type:
-            if type in ('out_invoice', 'out_refund'):
+            if type in ('out_invoice'):
                journal_type = 'sale'
+            elif type in ('out_refund'):  
+                journal_type = 'sale_refund'
+            elif type in ('in_refund'):
+                journal_type = 'purchase_refund'
            else:
                journal_type = 'purchase'
            journal_ids = obj_journal.search(cr, uid, [('company_id','=',company_id), ('type', '=', journal_type)])
@@ -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>
@@ -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:
-
@@ -51,16 +51,15 @@
            <field name="type">tree</field>
            <field name="field_parent">child_ids</field>
            <field name="arch" type="xml">
-                <tree toolbar="True" colors="red:(date&lt;current_date);black:(date&gt;=current_date);black:(date==False)" string="Analytic account">
+                <tree toolbar="True" string="Analytic Account">
                    <field name="name"/>
                    <field name="code"/>
+                    <field name="partner_id"/>
                    <field name="quantity"/>
-                    <field name="quantity_max"/>
                    <field name="debit"/>
                    <field name="credit"/>
                    <field name="balance"/>
                    <field name="company_currency_id"/>
-                    <field name="date" invisible="1"/>
                </tree>
            </field>
        </record>
@@ -188,22 +187,29 @@
            <field name="arch" type="xml">
                <search string="Search Analytic Lines">
                    <group col='6' colspan='4'>
+                    	<filter string="Sale" domain="[('journal_id.type','=','sale')]" icon="terp-sale"/>
+						<filter string="Purchase" domain="[('journal_id.type','=','purchase')]" icon="terp-purchase"/>
+						<separator orientation="vertical"/>
+                        <separator orientation="vertical"/>
                        <field name="name" select="1"/>
-                        <field name="account_id" select="1" groups="base.group_extended"/>
-                        <field name="amount" select="1"/>
                        <field name="date" select="1"/>
+                        <field name="account_id" select="1" groups="base.group_extended"/>
                        <field name="user_id" widget="selection"/>
                    </group>
                    <newline/>
-                    <group col='6' colspan='4'>
-                        <field name="journal_id" select="1" widget="selection"/>
+                    <group string="Group By..." expand="0">
+                        <filter string="Analytic Account" context="{'group_by':'account_id'}" groups="base.group_extended" icon="terp-folder-blue"/>
+                        <filter string="Analytic Journal" context="{'group_by':'journal_id'}" icon="terp-folder-orange"/>
+                        <separator orientation="vertical"/>
+                        <filter string="General Account" context="{'group_by':'general_account_id'}" icon="terp-folder-green"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Product" context="{'group_by':'product_id'}" icon="terp-accessories-archiver"/>
                    </group>
                    <newline/>
-                    <group string="Group By..." expand="0">
-                        <filter string="General Account" context="{'group_by':'general_account_id'}"/>
-                        <filter string="Analytic Account" context="{'group_by':'account_id'}" groups="base.group_extended"/>
-                        <filter string="Analytic Journal" context="{'group_by':'journal_id'}"/>
-                        <filter string="Product" context="{'group_by':'product_id'}"/>
+                    <group expand="0" string="Extended options...">
+                    	<field name="journal_id" widget="selection"/>
+                    	<field name="product_id" widget="selection"/>
+                    	<field name="amount" select="1"/>
                    </group>
                </search>
            </field>
@@ -48,7 +48,7 @@ class account_invoice_report(osv.osv):
        'user_id': fields.many2one('res.users', 'Salesman', readonly=True),
        'price_total': fields.float('Total Without Tax', readonly=True),
        'price_total_tax': fields.float('Total With Tax', readonly=True),
-        'price_average': fields.float('Average Price', readonly=True),
+        'price_average': fields.float('Average Price', readonly=True, group_operator="avg"),
        'nbr':fields.integer('# of Lines', readonly=True),
        'type': fields.selection([
            ('out_invoice','Customer Invoice'),
@@ -116,7 +116,15 @@ class account_invoice_report(osv.osv):
                        else
                         ai.amount_total
                         end) as price_total_tax,
-                    sum(ail.quantity*ail.price_unit)/sum(ail.quantity*u.factor)*count(ail.product_id)::decimal(16,2) as price_average,
+                    (case when ai.type in ('out_refund','in_invoice') then
+                      sum(ail.quantity*ail.price_unit*-1)
+                    else
+                      sum(ail.quantity*ail.price_unit)
+                    end)/(case when ai.type in ('out_refund','in_invoice') then
+                      sum(ail.quantity*u.factor*-1)
+                    else
+                      sum(ail.quantity*u.factor)
+                    end) as price_average,
                    sum((select extract(epoch from avg(date_trunc('day',aml.date_created)-date_trunc('day',l.create_date)))/(24*60*60)::decimal(16,2)
                        from account_move_line as aml
                        left join account_invoice as a ON (a.move_id=aml.move_id)
@@ -100,10 +100,11 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
        ## Compute Code
        #
        self.initial_balance = data['form'].get('initial_balance', True)
+        self.display_partner = data['form'].get('display_partner', 'non-zero_balance') 
        self.query = data['form'].get('query_line', '')
        self.init_query = data['form'].get('initial_bal_query', '')
        self.result_selection = data['form'].get('result_selection')
-
+        
        if (self.result_selection == 'customer' ):
            self.ACCOUNT_TYPE = ('receivable',)
        elif (self.result_selection == 'supplier'):
@@ -205,9 +206,12 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
                    res_init['enlitige'] = 0.0 # fix me
                    res_init['account_id'] = r['account_id']
                final_init[r['account_id']] = res_init
-        for r in res:
-            full_account.append(r)
-
+       
+        if self.display_partner == 'non-zero_balance':
+            full_account = [r for r in res if r['sdebit'] > 0 or r['scredit'] > 0]
+        else:
+            full_account = [r for r in res]
+        
        ## We will now compute Total
        subtotal_row = self._add_subtotal(full_account)
        if not self.initial_balance:
@@ -239,8 +239,6 @@
          <para style="terp_default_8">
            <font color="white"> </font>
          </para>
-          <para style="terp_default_8">Tel. : [[ o.address_invoice_id.phone or removeParentNode('para') ]]</para>
-          <para style="terp_default_8">Fax : [[ o.address_invoice_id.fax or removeParentNode('para') ]]</para>
          <para style="terp_default_8">VAT : [[ o.partner_id.vat or removeParentNode('para') ]]</para>
        </td>
      </tr>
@@ -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>
@@ -142,16 +142,9 @@
    <para style="P7">
      <font color="white"> </font>
    </para>
-    <para style="P21">Cash Receipt Voucher [[ (voucher.type == 'rec_voucher' or removeParentNode('para')) and '' ]]</para>
-    <para style="P2">Cash Payment Voucher [[ (voucher.type == 'pay_voucher' or removeParentNode('para')) and '' ]]</para>
-    <para style="P21">Bank Receipt Voucher [[ (voucher.type == 'bank_rec_voucher' or removeParentNode('para')) and '' ]]</para>
-    <para style="P2">Bank Payment Voucher [[ (voucher.type == 'bank_pay_voucher' or removeParentNode('para')) and '' ]]</para>
-    <para style="P2">Contra Voucher [[ (voucher.type == 'cont_voucher' or removeParentNode('para')) and '' ]]</para>
-    <para style="P2">Journal Sale Voucher [[ (voucher.type == 'journal_sale_vou' or removeParentNode('para')) and '' ]]</para>
-    <para style="P2">Journal Purchase Voucher [[ (voucher.type == 'journal_pur_voucher' or removeParentNode('para')) and '' ]]</para>
-    <para style="P2">Journal Voucher [[ (voucher.type == 'journal_voucher' or removeParentNode('para')) and '' ]]</para>
+    <para style="P21">[[ voucher.journal_id.name ]]</para>
    <para style="P20">
-      <font color="white"> </font>
+    <font color="white"> </font>
    </para>
    <blockTable colWidths="49.0,143.0,116.0,69.0,106.0" style="Table1">
      <tr>
@@ -54,3 +54,19 @@
  !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 refund the invoice Using Refund Button
+-
+  !record {model: account.invoice.refund, id: account_invoice_refund_0}:
+    description: Refund To China Export
+    period: account.period_5
+    filter_refund: refund
+-
+  I clicked on refund button
+-
+  !python {model: account.invoice.refund}: |
+    self.invoice_refund(cr, uid, [ref("account_invoice_refund_0")], {"lang": 'en_US', "tz": False, "active_model": "account.invoice", "active_ids": [ref("account.account_invoice_customer0")], "type": "out_invoice", "active_id": ref("account.account_invoice_customer0"), })
+-
+  I checked that a new entry with state "Draft" created in account move line
+
+
@@ -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'
@@ -21,7 +21,7 @@
            <field name="context">{'journal_type':'sale','view_mode':False}</field>
            <field name="target">new</field>
        </record>
-        <menuitem action="action_account_moves_sale" sequence="10" id="menu_eaction_account_moves_sale" parent="menu_finance_receivables" icon="STOCK_JUSTIFY_FILL" groups="group_account_user,group_account_manager,base.group_system"/>
+        <menuitem action="action_account_moves_sale" sequence="16" id="menu_eaction_account_moves_sale" parent="menu_finance_receivables" icon="STOCK_JUSTIFY_FILL" groups="group_account_user,group_account_manager,base.group_system"/>

 <!--        <record id="action_account_moves_purchase_refund" model="ir.actions.act_window">-->
 <!--            <field name="name">Journal Refund Items</field>-->
@@ -41,10 +41,11 @@
            <field name="context">{'journal_type':'purchase','view_mode':False}</field>
            <field name="target">new</field>
        </record>
-        <menuitem action="action_account_moves_purchase" sequence="10"
+        <menuitem action="action_account_moves_purchase"
            id="menu_eaction_account_moves_purchase"
            parent="menu_finance_payables"
            icon="STOCK_JUSTIFY_FILL"
+            sequence="16"
            groups="group_account_user,group_account_manager,base.group_system"/>

 <!--        <record id="action_account_moves_sale_refund" model="ir.actions.act_window">-->
@@ -71,7 +72,7 @@
            icon="STOCK_JUSTIFY_FILL"
            id="menu_action_account_moves_bank"
            parent="account.menu_finance_bank_and_cash"
-            sequence="4"
+            sequence="16"
            groups="group_account_user,group_account_manager,base.group_system"
        />
    </data>
@@ -31,16 +31,19 @@ class account_partner_balance(osv.osv_memory):
    _columns = {
        'initial_balance': fields.boolean('Include Initial Balances'
                                    ,help='It adds initial balance row on report which display previous sum amount of debit/credit/balance'),
+        'display_partner': fields.selection([('non-zero_balance', 'With balance is not equal to 0'), ('all', 'All Partners')]
+                                    ,'Display Partners')
                }
    _defaults = {
        'initial_balance': True,
+        'display_partner': 'non-zero_balance'
                }

    def _print_report(self, cr, uid, ids, data, query_line, context=None):
        if context is None:
            context = {}
        data = self.pre_print_report(cr, uid, ids, data, query_line, context=context)
-        data['form'].update(self.read(cr, uid, ids, ['initial_balance'])[0])
+        data['form'].update(self.read(cr, uid, ids, ['initial_balance', 'display_partner'])[0])
        return {
            'type': 'ir.actions.report.xml',
            'report_name': 'account.partner.balance',
@@ -11,6 +11,7 @@
               <field name="fiscalyear_id" position="after">
                    <field name="result_selection"/>
                    <field name="initial_balance"/>
+                    <field name="display_partner"/>
                    <newline/>
               </field>
            </field>
@@ -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-30 08:09+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-08-31 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_analytic_analysis
@@ -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-30 08:08+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-08-31 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_analytic_analysis
@@ -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
@@ -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-30 08:16+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-08-31 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_analytic_analysis
@@ -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-30 08:09+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-08-31 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_analytic_analysis
@@ -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})
@@ -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-30 08:09+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-08-31 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_analytic_default
@@ -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
@@ -7,13 +7,21 @@ 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"
+<<<<<<< TREE
 "PO-Revision-Date: 2010-08-30 08:09+0000\n"
+=======
+"PO-Revision-Date: 2010-09-04 08:45+0000\n"
+>>>>>>> MERGE-SOURCE
 "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"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2010-08-31 03:58+0000\n"
+=======
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
+>>>>>>> MERGE-SOURCE
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_analytic_default
@@ -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"
@@ -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-30 08:09+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-08-31 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_analytic_plans
@@ -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:54+0000\n"
-"Last-Translator: mga (Open ERP) <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-08-12 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-02 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_analytic_plans
@@ -301,7 +301,7 @@ msgstr "Linhas do Plano Analítico"
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "Crossovered Analytic -"
-msgstr ""
+msgstr "Cruzamento Analítico"

 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,plan_id:0
@@ -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-30 08:12+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-08-31 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_analytic_plans
@@ -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 ""
@@ -0,0 +1,64 @@
+# Tamil 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-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-02 03:55+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 "காட்சி கட்டமைப்பிற்கு ஒவ்வாத XML"
+
+#. 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 ""
@@ -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:
@@ -50,7 +50,6 @@ Three reports are available:
    'update_xml': [
        'security/ir.model.access.csv',
        'security/account_budget_security.xml',
-        'account_budget_wizard.xml',
        'wizard/account_budget_spread_view.xml',
        'crossovered_budget_view.xml',
        'crossovered_budget_report.xml',
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-	<data>
-
-	</data>
-</openerp>
@@ -18,9 +18,9 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+import datetime

 from osv import osv,fields
-import datetime
 from tools.translate import _

 def strToDate(dt):
@@ -40,13 +40,11 @@ class account_budget_post(osv.osv):
        'account_ids': fields.many2many('account.account', 'account_budget_rel', 'budget_id', 'account_id', 'Accounts'),
        'crossovered_budget_line': fields.one2many('crossovered.budget.lines', 'general_budget_id', 'Budget Lines'),
        'company_id': fields.many2one('res.company', 'Company', required=True),
-        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of budgetary position."),        
    }
    _defaults = {
-        'sequence': lambda *a: 1,   
        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.budget.post', context=c)
    }
-    _order = "sequence, name"
+    _order = "name"

    def spread(self, cr, uid, ids, fiscalyear_id=False, amount=0.0):
        dobj = self.pool.get('account.budget.post.dotation')
@@ -60,6 +58,7 @@ class account_budget_post(osv.osv):
            for p in fy.period_ids:
                dobj.create(cr, uid, {'post_id': o.id, 'period_id': p.id, 'amount': amount/num})
        return True
+
 account_budget_post()

 class account_budget_post_dotation(osv.osv):
@@ -107,8 +106,8 @@ class crossovered_budget(osv.osv):
    _description = "Budget"

    _columns = {
-        'name': fields.char('Name', size=50, required=True,states={'done':[('readonly',True)]}),
-        'code': fields.char('Code', size=20, required=True,states={'done':[('readonly',True)]}),
+        'name': fields.char('Name', size=64, required=True, states={'done':[('readonly',True)]}),
+        'code': fields.char('Code', size=16, required=True, states={'done':[('readonly',True)]}),
        'creating_user_id': fields.many2one('res.users', 'Responsible User'),
        'validating_user_id': fields.many2one('res.users', 'Validate User', readonly=True),
        'date_from': fields.date('Start Date', required=True, states={'done':[('readonly',True)]}),
@@ -118,7 +117,7 @@ class crossovered_budget(osv.osv):
    }

    _defaults = {
-        'state': lambda *a: 'draft',
+        'state': 'draft',
        'creating_user_id': lambda self,cr,uid,context: uid,
    }

@@ -128,6 +127,12 @@ class crossovered_budget(osv.osv):
        })
        return True

+    def budget_draft(self, cr, uid, ids, *args):
+        self.write(cr, uid, ids, {
+            'state':'draft'
+        })
+        return True
+
    def budget_validate(self, cr, uid, ids, *args):
        self.write(cr, uid, ids, {
            'state':'validate',
@@ -21,4 +21,4 @@
 			string="Budget"/>

 	</data>
-</openerp>
+</openerp>
@@ -19,7 +19,6 @@
            <field name="type">tree</field>
            <field name="arch" type="xml">
                <tree string="Budgetary Position">
-                    <field name="sequence"/>
                    <field name="code"/>
                    <field name="name"/>
                    <field name="company_id" groups="base.group_multi_company"/>
@@ -58,7 +57,8 @@
            <field name="view_id" ref="view_budget_post_tree"/>
        </record>
        <menuitem id="next_id_31" name="Budgets" parent="account.menu_finance" sequence="5"/>
-        <menuitem action="open_budget_post_form" id="menu_budget_post_form" parent="next_id_31" sequence="2"/>
+        <menuitem id="next_id_pos" name="Budgets" parent="account.menu_finance_configuration" sequence="20"/>
+        <menuitem action="open_budget_post_form" id="menu_budget_post_form" parent="next_id_pos" sequence="20"/>


        <record model="ir.ui.view" id="view_budget_post_form">
@@ -70,7 +70,6 @@
                    <field name="name" select="1"/>
                    <field name="code" select="1"/>
                    <field name="company_id"  groups="base.group_multi_company"/>
-                    <field name="sequence"/>
                    <notebook colspan="4">
                        <page string="Accounts">
                            <field name="account_ids" colspan="4" nolabel="1"/>
@@ -88,9 +87,9 @@
                                    <field name="date_from"/>
                                    <field name="date_to"/>
                                    <field name="paid_date"/>
-                                    <field name="planned_amount"/>
-                                    <field name="practical_amount" select="1"/>
-                                    <field name="theoritical_amount"/>
+                                    <field name="planned_amount" sum="Planned Amount"/>
+                                    <field name="practical_amount" select="1" sum="Practical Amount" />
+                                    <field name="theoritical_amount" sum="Theoritical Amount"/>
                                    <field name="percentage"/>
                                </tree>
                                <form string="Budget Lines">
@@ -117,22 +116,22 @@
            <field name="type">form</field>
            <field name="arch" type="xml">
                <form string="Budget">
-                            <field name="name" colspan="1" select="1"/>
-                            <field name="code" colspan="1" select="1" />
-                            <field name="creating_user_id" />
-                            <field name="validating_user_id" readonly="True"/>
-                            <field name="date_from"/>
-                            <field name="date_to"/>
-                            <field name="crossovered_budget_line" colspan="4" nolabel="1">
+                            <field name="name" colspan="1" select="1" attrs="{'readonly':[('state','!=','draft')]}"/>
+                            <field name="code" colspan="1" select="1" attrs="{'readonly':[('state','!=','draft')]}"/>
+                            <field name="creating_user_id" attrs="{'readonly':[('state','!=','draft')]}"/>
+                            <field name="validating_user_id" readonly="True" attrs="{'readonly':[('state','!=','draft')]}"/>
+                            <field name="date_from" attrs="{'readonly':[('state','!=','draft')]}"/>
+                            <field name="date_to" attrs="{'readonly':[('state','!=','draft')]}"/>
+                            <field name="crossovered_budget_line" colspan="4" nolabel="1" attrs="{'readonly':[('state','!=','draft')]}">
                                <tree string="Budget Lines">
                                    <field name="analytic_account_id" groups="base.group_extended"/>
                                    <field name="general_budget_id"/>
                                    <field name="date_from"/>
                                    <field name="date_to"/>
                                    <field name="paid_date"/>
-                                    <field name="planned_amount"/>
-                                    <field name="practical_amount"/>
-                                    <field name="theoritical_amount"/>
+                                    <field name="planned_amount" sum="Planned Amount"/>
+                                    <field name="practical_amount" sum="Practical Amount"/>
+                                    <field name="theoritical_amount" sum="Theoritical Amount"/>
                                    <field name="percentage"/>
                                </tree>
                                <form string="Budget Lines">
@@ -150,6 +149,7 @@
                                <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-ok"/>
                                <button string="Done" name="done" states="validate" type="workflow"   icon="gtk-jump-to" />
                                <button string="Cancel" name="cancel" states="confirm,validate" type="workflow" icon="gtk-cancel"/>
+                                <button name="draft" states="cancel" string="Reset to Draft" type="workflow" icon="terp-stock_effects-object-colorize"/>
                            </group>

                </form>
@@ -162,11 +162,12 @@
            <field name="type">tree</field>
            <field name="arch" type="xml">
               <tree colors="blue:state in ('draft');gray:state in ('done','cancel');black:state in ('confirm','validate')" string="Budget">
-                    <field name="name" colspan="1" select="1"/>
-                    <field name="code" colspan="1" select="1" />
-                    <field name="state"/>
+                    <field name="name" colspan="1"/>
+                    <field name="code" colspan="1"/>
                    <field name="date_from"/>
                    <field name="date_to"/>
+                    <field name="creating_user_id"/>
+                    <field name="state"/>
                </tree>
            </field>
        </record>
@@ -179,7 +180,7 @@
               <search string="Budget">
                   <group col="20" colspan="4">
                       <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Draft Budgets"  default="1"/>
-                       <filter string="To Approve" icon="terp-gtk-go-back-rtl" domain="[('state','=','validate')]" help="To Approve Budgets" />
+                       <filter string="To Approve" icon="terp-gtk-media-pause" domain="[('state','=','confirm')]" help="To Approve Budgets" />
                       <separator orientation="vertical"/>
                       <field name="name" select="1"/>
                       <field name="code" select="1" />
@@ -4,6 +4,7 @@

 	<record model="res.roles" id="crossovered_budget_role">
 			<field name="name">Crossovered Budget Validation</field>
+			<field name="description">Assign this role to the persons that should have the rights to Approve a confirm Budgets.</field>
 	</record>

 	<!-- Workflow definition -->
@@ -18,7 +19,8 @@
 		<field name="wkf_id" ref="wkf_crossovered_budget" />
 		<field name="flow_start">True</field>
 		<field name="name">draft</field>
-
+		<field name="action">write({'state':'draft'})</field>
+        <field name="kind">function</field>
 	</record>

 	<record model="workflow.activity" id="act_confirm">
@@ -41,8 +43,8 @@
 		<field name="name">cancel</field>
 		<field name="kind">function</field>
 		<field name="action">budget_cancel()</field>
-
 	</record>
+
 	<record model="workflow.activity" id="act_done">
 		<field name="wkf_id" ref="wkf_crossovered_budget" />
 		<field name="name">done</field>
@@ -87,5 +89,11 @@
 		<field name="role_id" ref="crossovered_budget_role"/>
 	</record>

+	<record model="workflow.transition" id="t6">
+		<field name="act_from" ref="act_cancel" />
+		<field name="act_to" ref="act_draft" />
+		<field name="signal">draft</field>
+	</record>
+
 </data>
 </openerp>
@@ -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-30 08:16+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-08-31 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_budget
@@ -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-30 08:16+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-08-31 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_budget
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################

@@ -64,7 +64,7 @@ class budget_report(report_sxw.rml_parse):
            achievements = float(self.cr.fetchone()[0])
            res.append({'name': a.name, 'code': a.code, 'achievements': achievements})
        return res
-report_sxw.report_sxw('report.account.budget', 'account.budget.post', 'addons/account_budget/report/budget_report.rml',parser=budget_report,header=False)
+report_sxw.report_sxw('report.account.budget', 'account.budget.post', 'addons/account_budget/report/budget_report.rml',parser=budget_report, header="internal")


 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
@@ -205,6 +205,6 @@ class budget_report(report_sxw.rml_parse):

        return result

-report_sxw.report_sxw('report.crossovered.budget.report', 'crossovered.budget', 'addons/account_budget/report/crossovered_budget_report.rml',parser=budget_report,header=False)
+report_sxw.report_sxw('report.crossovered.budget.report', 'crossovered.budget', 'addons/account_budget/report/crossovered_budget_report.rml',parser=budget_report, header="internal")
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

@@ -162,7 +162,8 @@
      <blockTable colWidths="191.0,82.0,80.0,84.0,61.0" style="Table4">
        <tr>
          <td>
-            <para style="P1"><font>[['.....' *(a['status']-1) ]] [[ setTag('font','font',{'color':'white'}) ]]</font><font>[[ a['status']==1 and (setTag('font','font',{'name':'Helvetica-bold'})) ]][[ a['name'] ]]</font></para>
+            <para style="P1">
+            <font>[[ a['status']==1 and (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>
@@ -23,7 +23,7 @@
 		</record>

 		<record id="action_account_budget_crossvered_summary_report" model="ir.actions.act_window">
-			<field name="name">Print Summary of Budgets</field>
+			<field name="name">Print Summary</field>
 			<field name="type">ir.actions.act_window</field>
 			<field name="res_model">account.budget.crossvered.summary.report</field>
 			<field name="view_type">form</field>
@@ -31,10 +31,11 @@
 			<field name="view_id" ref="account_budget_crossvered_summary_report_view"/>
 			<field name="target">new</field>
 		</record>
+
 		<record model="ir.values" id="account_budget_crossvered_summary_report_values">
 			<field name="model_id" ref="account_budget.model_crossovered_budget" />
 			<field name="object" eval="1" />
-			<field name="name">Print Summary of Budgets</field>
+			<field name="name">Print Summary</field>
 			<field name="key2">client_print_multi</field>
 			<field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_budget_crossvered_summary_report'))" />
 			<field name="key">action</field>
@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import time

 from osv import fields, osv
@@ -50,13 +51,12 @@ class account_budget_report(osv.osv_memory):
        data_model = self.pool.get(datas['model']).browse(cr, uid, context['active_id'])
        if not data_model.dotation_ids:
            raise osv.except_osv(_('Insufficient Data!'),_('No Depreciation or Master Budget Expenses Found on Budget %s!') % data_model.name)
-
        return {
            'type': 'ir.actions.report.xml',
            'report_name': 'account.budget',
            'datas': datas,
            }
+
 account_budget_report()

-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
@@ -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"
@@ -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"
@@ -0,0 +1,42 @@
+# Tamil 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-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-02 03:55+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_cancel
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "காட்சி கட்டமைப்பிற்கு ஒவ்வாத XML"
+
+#. 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"
+"    கணக்கு ஜோர்னலின் படிவத் தோற்றத்தில் 'Allow Cancelling entries' என்ற "
+"களத்தை சேர்க்கும். true என்றிருந்தால் பயனரால் பதிவுகளையும் "
+"விலைப்பட்டியல்களையும் இரத்து செய்ய முடியும்.\n"
+"    "
+
+#. module: account_cancel
+#: model:ir.module.module,shortdesc:account_cancel.module_meta_information
+msgid "Account Cancel"
+msgstr "கணக்கை இரத்து செய்க"
@@ -0,0 +1,23 @@
+# Tamil 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-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-02 03:55+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_chart
+#: model:ir.module.module,description:account_chart.module_meta_information
+msgid "Remove minimal account chart"
+msgstr "குறைந்தபட்ச கணக்கு அட்டவணையை அகற்றுக"
@@ -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-30 08:17+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-08-31 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_coda
@@ -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 ""
@@ -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
@@ -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-30 08:12+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-08-31 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_followup
@@ -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-30 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-08-31 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_followup
@@ -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>
@@ -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):
@@ -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-30 08:12+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-08-31 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_invoice_layout
@@ -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-30 08:17+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-08-31 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_invoice_layout
@@ -90,7 +90,7 @@ class payment_order(osv.osv):
        return res

    _columns = {
-        'date_planned': fields.date('Scheduled date if fixed', states={'done':[('readonly',True)]}, help='Select a date if you have chosen Preferred Date to be fixed.'),
+        'date_scheduled': fields.date('Scheduled date if fixed', states={'done':[('readonly',True)]}, help='Select a date if you have chosen Preferred Date to be fixed.'),
        'reference': fields.char('Reference', size=128, required=1, states={'done':[('readonly',True)]}),
        'mode': fields.many2one('payment.mode','Payment mode', select=True, required=1, states={'done':[('readonly',True)]}, help='Select the Payment Mode to be applied.'),
        'state': fields.selection([
@@ -107,7 +107,7 @@ class payment_order(osv.osv):
            ('now', 'Directly'),
            ('due', 'Due date'),
            ('fixed', 'Fixed date')
-            ], "Preferred date", change_default=True, required=True, states={'done':[('readonly',True)]}, help="Choose an option for the Payment Order:'Fixed' stands for a date specified by you.'Directly' stands for the direct execution.'Due date' stands for the scheduled date of execution."),
+            ], "Preferred date", change_default=True, required=True, states={'done':[('readonly', True)]}, help="Choose an option for the Payment Order:'Fixed' stands for a date specified by you.'Directly' stands for the direct execution.'Due date' stands for the scheduled date of execution."),
        'date_created': fields.date('Creation date', readonly=True),
        'date_done': fields.date('Execution date', readonly=True),
    }
@@ -141,6 +141,14 @@ class payment_order(osv.osv):
        wf_service.trg_validate(uid, 'payment.order', id, 'done', cr)
        return True

+    def copy(self, cr, uid, id, default={}, context=None):
+        default.update({
+            'state':'draft',
+            'line_ids': [],
+            'reference': self.pool.get('ir.sequence').get(cr, uid, 'payment.order')
+        })
+        return super(payment_order, self).copy(cr, uid, id, default, context=context)
+
 payment_order()

 class payment_line(osv.osv):
@@ -252,7 +260,7 @@ class payment_line(osv.osv):
        res = {}
        for line in self.browse(cursor, user, ids, context=context):
            if line.order_id.date_prefered == 'fixed':
-                res[line.id] = line.order_id.date_planned
+                res[line.id] = line.order_id.date_scheduled
            elif line.order_id.date_prefered == 'due':
                res[line.id] = line.due_date or time.strftime('%Y-%m-%d')
            else:
@@ -311,13 +319,14 @@ 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.'),
        'date': fields.date('Payment Date', help="If no payment date is specified, the bank will treat this payment line directly"),
        'create_date': fields.datetime('Created' , readonly=True),
-        'state': fields.selection([('normal','Free'), ('structured','Structured')], 'Communication Type', required=True)
+        'state': fields.selection([('normal','Free'), ('structured','Structured')], 'Communication Type', required=True),
+        'bank_statement_line_id': fields.many2one('account.bank.statement.line', 'Bank statement line')
    }
    _defaults = {
        'name': lambda obj, cursor, user, context: obj.pool.get('ir.sequence'
@@ -330,7 +339,7 @@ class payment_line(osv.osv):
        ('name_uniq', 'UNIQUE(name)', 'The payment line name must be unique!'),
    ]

-    def onchange_move_line(self, cr, uid, ids, move_line_id, payment_type, date_prefered, date_planned, currency=False, company_currency=False, context=None):
+    def onchange_move_line(self, cr, uid, ids, move_line_id, payment_type, date_prefered, date_scheduled, currency=False, company_currency=False, context=None):
        data={}

        data['amount_currency']=data['communication']=data['partner_id']=data['reference']=data['date_created']=data['bank_id']=data['amount']=False
@@ -365,7 +374,7 @@ class payment_line(osv.osv):
            elif date_prefered == 'due':
                data['date'] = line.date_maturity
            elif date_prefered == 'fixed':
-                data['date'] = date_planned
+                data['date'] = date_scheduled

        return {'value': data}

@@ -109,14 +109,14 @@
                    <field name="reference"/>
                    <field name="mode"/>
                    <field name="date_prefered"/>
-                    <field name="date_planned" select="1"/>
+                    <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"/>
                    <field name="line_ids" colspan="4" widget="one2many_list" nolabel="1">
                        <form string="Payment Line">
                            <notebook>
                                <page string="Payment">
-                                    <field name="move_line_id" on_change="onchange_move_line(move_line_id,parent.mode,parent.date_prefered,parent.date_planned,currency,company_currency)" select="1" domain="[('reconcile_id','=', False), ('credit', '>',0),('amount_to_pay','>',0)] "/>
+                                    <field name="move_line_id" on_change="onchange_move_line(move_line_id,parent.mode,parent.date_prefered,parent.date_scheduled,currency,company_currency)" select="1" domain="[('reconcile_id','=', False), ('credit', '>',0),('amount_to_pay','>',0)] "/>
                                    <separator colspan="4" string="Transaction Information"/>
                                    <field name="date"/>
                                    <group colspan="2">
@@ -179,43 +179,56 @@
            <field name="type">tree</field>
            <field eval="4" name="priority"/>
            <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');gray:state in ('cancel','done');black:state in ('open')" editable="bottom" string="Payment order">
+                <tree colors="blue:state in ('draft');gray:state in ('cancel','done');black:state in ('open')" string="Payment order">
                    <field name="reference"/>
                    <field name="mode"/>
-                    <field name="date_planned"/>
+                    <field name="user_id"/>
                    <field name="date_created"/>
                    <field name="date_done"/>
                    <field name="total"/>
                    <field name="state"/>
+                    <button name="cancel" states="draft,open" string="Cancel" icon="gtk-cancel"/>
+                    <button name="open" states="draft" string="Confirm Payments"  icon="gtk-apply"/>
+                    <button name="%(action_account_payment_make_payment)d" states="open" string="Make Payments" type="action" icon="gtk-execute"/>
                </tree>
            </field>
        </record>

+        <record id="view_payment_order_search" model="ir.ui.view">
+            <field name="name">payment.order.tree.search</field>
+            <field name="model">payment.order</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Payment Orders">
+                    <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!"/>
+                        <separator orientation="vertical"/>
+                        <field name="reference"/>
+                        <field name="mode" widget='selection'/>
+                        <field name="date_done"/>
+                        <field name="state"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Payment Mode" context="{'group_by': 'mode'}" icon="terp-dolar_ok!"/>
+                        <filter string="State" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
        <record id="action_payment_order_tree" model="ir.actions.act_window">
            <field name="name">Payment Orders</field>
            <field name="res_model">payment.order</field>
            <field name="view_type">form</field>
            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_payment_order_search"/>
        </record>
+
        <menuitem action="action_payment_order_tree" id="menu_action_payment_order_form" parent="account_payment.menu_main" sequence="3"/>

-        <record id="action_payment_order_draft" model="ir.actions.act_window">
-            <field name="name">Draft Payment Order</field>
-            <field name="res_model">payment.order</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','=','draft')]</field>
-            <field name="filter" eval="True"/>
-        </record>
-
-        <record id="action_payment_order_open" model="ir.actions.act_window">
-            <field name="name">Payment Orders to Approve</field>
-            <field name="res_model">payment.order</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','=','open')]</field>
-            <field name="filter" eval="True"/>
-        </record>
        <record id="action_payment_order_tree_new" model="ir.actions.act_window">
            <field name="name">New Payment Order</field>
            <field name="res_model">payment.order</field>
@@ -301,9 +314,9 @@
            <field name="type">form</field>
            <field name="inherit_id" ref="account.view_bank_statement_form"/>
            <field name="arch" type="xml">
-                <group col="7" colspan="4" position="inside">
-                    <button  colspan="2" name="%(action_account_populate_statement_confirm)d" string="Import payment lines" type="action" icon="gtk-open"/>
-                </group>
+                <field name="journal_id" position="after">
+                    <button name="%(action_account_populate_statement_confirm)d" attrs="{'invisible':[('state','=','confirm')]}" string="Import payment lines" type="action" icon="gtk-execute"/>
+                </field>
            </field>
        </record>

@@ -16,7 +16,7 @@ msgstr ""
 "Plural-Forms: \n"

 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr ""

@@ -166,7 +166,7 @@ msgid "Payment lines"
 msgstr ""

 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr ""

@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr ""

@@ -170,7 +170,7 @@ msgid "Payment lines"
 msgstr ""

 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr ""

@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr "Планирана дата ако е определена"

@@ -172,7 +172,7 @@ msgid "Payment lines"
 msgstr "Редове от плащане"

 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr "Избор на дата ако искате да има зададена предпочитана дата"

@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr "Zakazani datum ako je fiskno"

@@ -174,7 +174,7 @@ msgid "Payment lines"
 msgstr "Linije plaćanja"

 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr "Odaberite datum ako ste odabrali fiksni poželjni datum"

@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr "Data planificada si fixa"

@@ -174,7 +174,7 @@ msgid "Payment lines"
 msgstr "Línies de pagament"

 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr ""
 "Seleccioneu una data si heu seleccionat que la data preferida sigui fixa."
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr ""

@@ -170,7 +170,7 @@ msgid "Payment lines"
 msgstr ""

 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr ""

@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr "Terminierung bei Auswahl 'festes Datum'"

@@ -173,7 +173,7 @@ msgid "Payment lines"
 msgstr "Zahlungsvorschlag Positionen"

 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr "Wähle ein Datum wenn Ihre Auswahl 'festes Datum' sein soll."

@@ -18,7 +18,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr "Προγραμματισμένη ημερομηνία εάν είναι καθορισμένο"

@@ -175,7 +175,7 @@ msgid "Payment lines"
 msgstr "Γραμμές Πληρωμής"

 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr ""
 "Επιλέξτε μιά ημερομηνία εάν έχετε επιλέξει προτιμώμενη ημερομηνία ως "
@@ -18,7 +18,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr "Fecha planificada si es fija"

@@ -175,7 +175,7 @@ msgid "Payment lines"
 msgstr "Líneas de pago"

 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr ""
 "Seleccione una fecha si ha seleccionado que la fecha preferida sea fija."
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr "Fecha planificada si fija"

@@ -174,7 +174,7 @@ msgid "Payment lines"
 msgstr "Líneas de pago"

 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr "Seleccione una fecha si ha elegido que la fecha preferida sea fija."

@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr "Planeeritud kuupäev kui fikseeritud"

@@ -173,7 +173,7 @@ msgid "Payment lines"
 msgstr "Makseread"

 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr "Vali kuupäev, kui sa oled valinud 'Eelistatud kuupäev fikseerida'."

@@ -18,7 +18,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr "Suunniteltu päivämäärä jos kiinteä"

@@ -175,7 +175,7 @@ msgid "Payment lines"
 msgstr "Maksurivit"

 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr ""
 "Aseta päivämäärä jos olet valinnut suositellun maksupäivän kiinteäksi."
@@ -40,7 +40,7 @@ msgstr ""
 "spéciaux !"

 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr "Date prévue si fixe"

@@ -197,7 +197,7 @@ msgid "Payment lines"
 msgstr "Lignes de paiement"

 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr ""
 "Sélectionnez une date si vous avez choisi \"Date fixe\" comme date préférée"
@@ -18,7 +18,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr "अनुसूचित तिथि तो तय"

@@ -173,7 +173,7 @@ msgid "Payment lines"
 msgstr ""

 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr ""

@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr ""

@@ -170,7 +170,7 @@ msgid "Payment lines"
 msgstr ""

 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr ""

@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"

 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr ""

@@ -170,7 +170,7 @@ msgid "Payment lines"
 msgstr ""

 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr ""

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