From f43ab717cc8ca5a9dc50d611cd0d713a51544b4d Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Thu, 26 Aug 2010 14:23:58 +0530
Subject: [PATCH 01/28] [IMP] Account:  Bank statements will not consider
 boolean on journal entry_posted

bzr revid: mra@mra-laptop-20100826085358-d4jgljoknte4q9yd
---
 addons/account/account_bank_statement.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 270384a1d9f..6874f80bcf3 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -368,16 +368,15 @@ class account_bank_statement(osv.osv):
                     else:
                         account_move_line_obj.reconcile_partial(cr, uid, torec, 'statement', context)
 
-                if st.journal_id.entry_posted:
-                    account_move_obj.write(cr, uid, [move_id], {'state': 'posted'})
-
             self.log(cr, uid, st.id, 'Statement %s is confirmed and entries are created.' % st.name)
             done.append(st.id)
 
             next_number = obj_seq.get(cr, uid, 'account.bank.statement')
             if not st.name == '/':
                 next_number = st.name + '/' + next_number[-1:]
-                account_move_obj.write(cr, uid, [move_id], {'state': 'posted', 'name': next_number})
+                account_move_obj.write(cr, uid, [move_id], {'name': next_number})
+
+            account_move_obj.write(cr, uid, [move_id], {'state': 'posted'}) # Bank statements will not consider boolean on journal entry_posted
             self.write(cr, uid, [st.id], {'name': next_number}, context=context)
 
         self.write(cr, uid, done, {'state':'confirm'}, context=context)

From 17d6bbf3c9a2520fe058676d82f64dc13d015c58 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Thu, 26 Aug 2010 14:42:23 +0530
Subject: [PATCH 02/28] [FIX] account bank statements: onchange on journal make
 wrong amount

bzr revid: mra@mra-laptop-20100826091223-1u5aee3lkzjiix8k
---
 addons/account/account_bank_statement.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 6874f80bcf3..50d13d24a5c 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -405,8 +405,8 @@ class account_bank_statement(osv.osv):
 
         cursor.execute('SELECT balance_end_real \
                 FROM account_bank_statement \
-                WHERE journal_id = %s \
-                ORDER BY date DESC,id DESC LIMIT 1', (journal_id,))
+                WHERE journal_id = %s AND NOT state = %s \
+                ORDER BY date DESC,id DESC LIMIT 1', (journal_id, 'draft'))
         res = cursor.fetchone()
         balance_start = res and res[0] or 0.0
 

From f96ee5cded18e23b805880a89dd07a36c45e0579 Mon Sep 17 00:00:00 2001
From: vra <vra@tinyerp.com>
Date: Thu, 26 Aug 2010 15:15:13 +0530
Subject: [PATCH 03/28] [IMP][FIX] account: Added context instead of domain in
 different act windows of partner object, Fixed 'active_id' error in code.

bzr revid: vra@tinyerp.com-20100826094513-2x22qhx6727g6f5t
---
 addons/account/account_invoice_view.xml               | 2 +-
 addons/account/account_view.xml                       | 4 ++--
 addons/account/partner_view.xml                       | 4 ++--
 addons/account/report/account_invoice_report_view.xml | 3 +--
 addons/account/wizard/account_change_currency.py      | 9 +++++----
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 41d0344de92..db70d5e0e5a 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -500,7 +500,7 @@
         </record>
         <menuitem action="action_invoice_tree4" id="menu_action_invoice_tree4" parent="menu_finance_payables"/>
 
-        <act_window domain="[('partner_id','=',active_id)]" id="act_res_partner_2_account_invoice_opened" name="Invoices" res_model="account.invoice" src_model="res.partner"/>
+        <act_window context="{'search_default_partner_id':[active_id]}" id="act_res_partner_2_account_invoice_opened" name="Invoices" res_model="account.invoice" src_model="res.partner"/>
 
         <act_window domain="[('journal_id','=',active_id),('state','!=','draft'),('reconciled','=',False)]" id="act_account_journal_2_account_invoice_opened" name="Unpaid invoices" res_model="account.invoice" src_model="account.journal"/>
 
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index bab05321f4d..a95b96aae9b 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1818,9 +1818,9 @@
 
         <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}" domain="[('partner_id', '=', active_id),('reconcile_id','=',False),('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"/>
 
-        <act_window domain="[('partner_id', '=', active_id)]" id="act_account_partner_account_move" name="Journal Items" res_model="account.move.line" src_model="res.partner"/>
+        <act_window context="{'search_default_partner_id':[active_id]}" id="act_account_partner_account_move" name="Journal Items" res_model="account.move.line" src_model="res.partner"/>
 
         <record id="view_account_addtmpl_wizard_form" model="ir.ui.view">
             <field name="name">Create Account</field>
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index f3a8cca8ada..7f3c344ebff 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -130,8 +130,8 @@
         <act_window
             id="action_analytic_open"
             name="Analytic Accounts"
-            res_model="account.analytic.account"
-            domain="[('partner_id','=',active_id)]"
+            res_model="account.analytic.account"             
+            context="{'search_default_partner_id':[active_id]}"
             src_model="res.partner"
             view_type="form"
             view_mode="tree,form,graph,calendar"/>
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index b241b725673..d017a6cbc11 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -156,10 +156,9 @@
     <menuitem action="action_account_invoice_report_all" id="menu_action_account_invoice_report_all" parent="account.menu_finance_statistic_report_statement" sequence="0"/>
 
     <act_window
-        domain="[('partner_id', '=', active_id)]"
         id="act_account_invoice_partner_relation"
         name="Monthly Turnover"
-        context="{'search_default_month':1,'search_default_user':1,'group_by_no_leaf':1,'group_by':[]}"
+        context="{'search_default_partner_id':[active_id], 'search_default_month':1,'search_default_user':1,'group_by_no_leaf':1,'group_by':[]}"
         res_model="account.invoice.report"
         src_model="res.partner"/>
 
diff --git a/addons/account/wizard/account_change_currency.py b/addons/account/wizard/account_change_currency.py
index aa6b477d30d..9355691369e 100644
--- a/addons/account/wizard/account_change_currency.py
+++ b/addons/account/wizard/account_change_currency.py
@@ -33,10 +33,11 @@ class account_change_currency(osv.osv_memory):
         obj_inv = self.pool.get('account.invoice')
         if context is None:
             context = {}
-        state = obj_inv.browse(cr, uid, context['active_id']).state
-        if obj_inv.browse(cr, uid, context['active_id']).state != 'draft':
-            raise osv.except_osv(_('Error'), _('You can only change currency for Draft Invoice !'))
-        pass
+        if context.get('active_id',False):
+            state = obj_inv.browse(cr, uid, context['active_id']).state
+            if obj_inv.browse(cr, uid, context['active_id']).state != 'draft':
+                raise osv.except_osv(_('Error'), _('You can only change currency for Draft Invoice !'))
+            pass
 
     def change_currency(self, cr, uid, ids, context=None):
         obj_inv = self.pool.get('account.invoice')

From 8262872c719e6c342650c8069392bad7d6ffe5a3 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Thu, 26 Aug 2010 15:20:19 +0530
Subject: [PATCH 04/28] [IMP] bank statements: on change on journal = >Why it
 returns the currency it is automatically calculated with function field .. no
 need to return currency with onchange journal

bzr revid: mra@mra-laptop-20100826095019-1mohlmz154fylcnh
---
 addons/account/account_bank_statement.py | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 50d13d24a5c..c3809b44c04 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -396,28 +396,15 @@ class account_bank_statement(osv.osv):
         return True
 
     def onchange_journal_id(self, cursor, user, statement_id, journal_id, context=None):
-        if not journal_id:
-            return {'value': {'currency': False}}
-
         account_journal_obj = self.pool.get('account.journal')
         res_users_obj = self.pool.get('res.users')
-        res_currency_obj = self.pool.get('res.currency')
-
         cursor.execute('SELECT balance_end_real \
                 FROM account_bank_statement \
                 WHERE journal_id = %s AND NOT state = %s \
                 ORDER BY date DESC,id DESC LIMIT 1', (journal_id, 'draft'))
         res = cursor.fetchone()
         balance_start = res and res[0] or 0.0
-
-        currency_id = account_journal_obj.browse(cursor, user, journal_id,
-                context=context).currency.id
-        if not currency_id:
-            currency_id = res_users_obj.browse(cursor, user, user,
-                    context=context).company_id.currency_id.id
-        currency = res_currency_obj.name_get(cursor, user, [currency_id],
-                context=context)[0]
-        return {'value': {'balance_start': balance_start, 'currency': currency}}
+        return {'value': {'balance_start': balance_start}}
 
     def unlink(self, cr, uid, ids, context=None):
         stat = self.read(cr, uid, ids, ['state'])

From ad26470a0b68bb0dbfcfe06dca0d18abb8d54e0c Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Thu, 26 Aug 2010 15:32:48 +0530
Subject: [PATCH 05/28] [FIX]: change the name of menu

bzr revid: mga@tinyerp.com-20100826100248-e3dfe946epb23yry
---
 addons/account/account_menuitem.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index 3cb21315350..24f4bb795a2 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -3,8 +3,8 @@
     <data>
 
         <menuitem icon="terp-account" id="menu_finance" name="Accounting" sequence="13"/>
-        <menuitem id="menu_finance_receivables" name="Receivables" parent="menu_finance" sequence="1" groups="group_account_user,group_account_manager,base.group_system"/>
-        <menuitem id="menu_finance_payables" name="Payables" parent="menu_finance" sequence="2" groups="group_account_user,group_account_manager,base.group_system"/>
+        <menuitem id="menu_finance_receivables" name="Customers" parent="menu_finance" sequence="1" groups="group_account_user,group_account_manager,base.group_system"/>
+        <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="periodical_processing_journal_entries_validation" name="Draft Entries" parent="menu_finance_periodical_processing" groups="group_account_user,group_account_manager,base.group_system"/>

From 31960711d68702a49e2c3a511678e1e3e1e8eb00 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Thu, 26 Aug 2010 15:33:16 +0530
Subject: [PATCH 06/28] [REM]: remove unused report [FIX]: fix the type in menu
 domain

bzr revid: mga@tinyerp.com-20100826100316-ox9bbz4g3vx6bzfq
---
 .../account_voucher/voucher_payment_receipt_view.xml  |  4 ++--
 addons/account_voucher/voucher_report.xml             | 11 +----------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index f0bebc49d2c..d11fea7f2f6 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -62,7 +62,7 @@
             <field name="name">Vendor Payment</field>
             <field name="res_model">account.voucher.open</field>
             <field name="view_type">form</field>
-            <field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','payment')]</field>
+            <field name="domain">[('journal_id.type', 'in', ['bank', 'cash'])]</field>
             <field name="context">{'journal_type':'bank', 'type':'payment'}</field>
             <field name="view_id" ref="account_open_vouchers_view"/>
             <field name="target">new</field>
@@ -154,7 +154,7 @@
             <field name="name">Sales Payment</field>
             <field name="res_model">account.voucher.open</field>
             <field name="view_type">form</field>
-            <field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','receipt')]</field>
+            <field name="domain">[('journal_id.type', 'in', ['bank', 'cash'])]</field>
             <field name="context">{'journal_type':'bank', 'type':'receipt'}</field>
             <field name="view_id" ref="account_open_vouchers_view"/>
             <field name="target">new</field>
diff --git a/addons/account_voucher/voucher_report.xml b/addons/account_voucher/voucher_report.xml
index 57134d3cdec..273fc53de5f 100644
--- a/addons/account_voucher/voucher_report.xml
+++ b/addons/account_voucher/voucher_report.xml
@@ -2,21 +2,12 @@
 <openerp>
     <data>
         <report id="report_account_voucher"
-            string="Print Vouchers"
+            string="Voucher"
             model="account.voucher"
             name="voucher.cash_receipt.drcr"
             rml="account_voucher/report/report_voucher.rml"
             auto="False"
             header = "False"
             menu="True"/>
-
-<!--        <report id="report_account_voucher_amt"-->
-<!--            string="Print Receipts"-->
-<!--            model="account.voucher"-->
-<!--            name="voucher.cash_amount"-->
-<!--            rml="account_voucher/report/report_voucher_amount.rml"-->
-<!--            auto="False"-->
-<!--            header = "False"-->
-<!--            menu="True"/>-->
     </data>
 </openerp>

From c8e1404027d27b803cdc5519dabb512efd394be8 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Thu, 26 Aug 2010 18:08:25 +0530
Subject: [PATCH 07/28] [FIX] account:-manual recurring wizard corrected

bzr revid: mtr@mtr-20100826123825-j60o4pqlouwj6vr2
---
 addons/account/account_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index a95b96aae9b..cc740220524 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -668,7 +668,6 @@
                     <field name="period_id"/>
                     <field name="journal_id"/>
                     <field name="partner_id"/>
-                    <field name="reconcile_id"/>
                     <field name="amount" sum="Total Amount"/>
                     <field name="state"/>
                 </tree>

From 1e8a9a983f604076b1528dfdb484d1ba63fa25bb Mon Sep 17 00:00:00 2001
From: vra <vra@tinyerp.com>
Date: Thu, 26 Aug 2010 19:15:15 +0530
Subject: [PATCH 08/28] [IMP] account: assigned collection and paid account to
 remaining configuration charts taxes, assigned common sequence for sale and
 purchase, assigned invoice seq for minimum chart demo journals.

bzr revid: vra@tinyerp.com-20100826134515-vzqm2ergu3bzkm0v
---
 addons/account/configurable_account_chart.xml | 8 ++++++++
 addons/account/data/account_data2.xml         | 6 ++++--
 addons/account/demo/account_minimal.xml       | 6 ++++--
 addons/account/installer.py                   | 8 ++++----
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/addons/account/configurable_account_chart.xml b/addons/account/configurable_account_chart.xml
index de8c1ba0cd0..f9512cd4e83 100644
--- a/addons/account/configurable_account_chart.xml
+++ b/addons/account/configurable_account_chart.xml
@@ -470,6 +470,8 @@
             <field name="name">OTAX X</field>
             <field eval="0.0" name="amount"/>
             <field name="type">percent</field>
+            <field name="account_collected_id" ref="conf_ova"/>
+            <field name="account_paid_id" ref="conf_ova"/>
             <field name="base_code_id" ref="tax_code_purch_X"/>
             <field name="tax_code_id" ref="tax_code_output_X"/>
             <field name="ref_base_code_id" ref="tax_code_purch_X"/>
@@ -482,6 +484,8 @@
             <field name="name">OTAX O</field>
             <field eval="0.0" name="amount"/>
             <field name="type">percent</field>
+            <field name="account_collected_id" ref="conf_ova"/>
+            <field name="account_paid_id" ref="conf_ova"/>
             <field name="base_code_id" ref="tax_code_purch_O"/>
             <field name="tax_code_id" ref="tax_code_output_O"/>
             <field name="ref_base_code_id" ref="tax_code_purch_O"/>
@@ -524,6 +528,8 @@
             <field name="name">ITAX X</field>
             <field eval="0.0" name="amount"/>
             <field name="type">percent</field>
+            <field name="account_collected_id" ref="conf_iva"/>
+            <field name="account_paid_id" ref="conf_iva"/>
             <field name="base_code_id" ref="tax_code_sales_X"/>
             <field name="tax_code_id" ref="tax_code_input_X"/>
             <field name="ref_base_code_id" ref="tax_code_sales_X"/>
@@ -536,6 +542,8 @@
             <field name="name">ITAX O</field>
             <field eval="0.0" name="amount"/>
             <field name="type">percent</field>
+            <field name="account_collected_id" ref="conf_iva"/>
+            <field name="account_paid_id" ref="conf_iva"/>
             <field name="base_code_id" ref="tax_code_sales_O"/>
             <field name="tax_code_id" ref="tax_code_input_O"/>
             <field name="ref_base_code_id" ref="tax_code_sales_O"/>
diff --git a/addons/account/data/account_data2.xml b/addons/account/data/account_data2.xml
index af55e477b42..b0f5f82e156 100644
--- a/addons/account/data/account_data2.xml
+++ b/addons/account/data/account_data2.xml
@@ -461,12 +461,14 @@
         <record id="sequence_sale_journal" model="ir.sequence">
             <field name="name">Sale Journal</field>
             <field name="code">account.journal</field>
-            <field name="prefix"/>
+            <field eval="3" name="padding"/>
+            <field name="prefix">%(year)s/</field>
         </record>
         <record id="sequence_purchase_journal" model="ir.sequence">
             <field name="name">Purchase Journal</field>
             <field name="code">account.journal</field>
-            <field name="prefix"/>
+            <field eval="3" name="padding"/>
+            <field name="prefix">%(year)s/</field>
         </record>
 
         <!--
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index bedfed3bb69..fcaca5b19f0 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -346,7 +346,7 @@
             <field name="type">sale</field>
             <field name="view_id" ref="account_sp_journal_view"/>
             <field name="sequence_id" ref="sequence_sale_journal"/>
-            <field name="invoice_sequence_id" ref="seq_type_out_invoice"/>
+            <field name="invoice_sequence_id" ref="seq_out_invoice"/>
             <field model="account.account" name="default_credit_account_id" ref="a_sale"/>
             <field model="account.account" name="default_debit_account_id" ref="a_sale"/>
             <field name="user_id" ref="base.user_root"/>
@@ -357,6 +357,7 @@
             <field name="type">sale_refund</field>
             <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"/>
             <field model="account.account" name="default_credit_account_id" ref="a_sale"/>
             <field model="account.account" name="default_debit_account_id" ref="a_sale"/>
             <field name="user_id" ref="base.user_root"/>
@@ -368,7 +369,7 @@
             <field name="type">purchase</field>
             <field name="view_id" ref="account_sp_journal_view"/>
             <field name="sequence_id" ref="sequence_purchase_journal"/>
-            <field name="invoice_sequence_id" ref="seq_type_in_invoice"/>
+            <field name="invoice_sequence_id" ref="seq_in_invoice"/>
             <field model="account.account" name="default_debit_account_id" ref="a_expense"/>
             <field model="account.account" name="default_credit_account_id" ref="a_expense"/>
             <field name="user_id" ref="base.user_root"/>
@@ -379,6 +380,7 @@
             <field name="type">purchase_refund</field>
             <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"/>
             <field model="account.account" name="default_debit_account_id" ref="a_expense"/>
             <field model="account.account" name="default_credit_account_id" ref="a_expense"/>
             <field name="user_id" ref="base.user_root"/>
diff --git a/addons/account/installer.py b/addons/account/installer.py
index a9d7e12ff72..d82db6de96d 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -319,15 +319,15 @@ class account_installer(osv.osv_memory):
             seq_sale = {
                         'name': 'Sale Journal',
                         'code': 'account.journal',
-                        'prefix': 'INV/',
-                        'padding': 4
+                        'prefix': '%(year)s/',
+                        'padding': 3
                         }
             seq_id_sale = obj_sequence.create(cr, uid, seq_sale)
             seq_purchase = {
                         'name': 'Purchase Journal',
                         'code': 'account.journal',
-                        'prefix': 'VEN/',
-                        'padding': 4
+                        'prefix': '%(year)s/',
+                        'padding': 3
                         }
             seq_id_purchase = obj_sequence.create(cr, uid, seq_purchase)
         else:

From f92443f62bac5e76ffe1d8dc47b418b73d517735 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Thu, 26 Aug 2010 20:34:35 +0530
Subject: [PATCH 09/28] [FIX]: add the missign field type, it is required any
 how [IMP]: implement the purchase voucher

bzr revid: mga@tinyerp.com-20100826150435-jgt0rvigha673hrh
---
 addons/account_voucher/voucher.py             | 64 ++++++++++++++-----
 .../voucher_payment_receipt_view.xml          | 18 +++---
 .../voucher_sales_purchase_view.xml           | 53 ++++++++-------
 addons/account_voucher/voucher_view.xml       |  8 ++-
 .../wizard/account_voucher_unreconcile.py     |  8 ++-
 5 files changed, 98 insertions(+), 53 deletions(-)

diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py
index e8a02320533..8e1d3491d26 100644
--- a/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@@ -44,6 +44,9 @@ class account_move_line(osv.osv):
 account_move_line()
 
 class account_voucher(osv.osv):
+    def _get_type(self, cr, uid, ids, context={}):
+        return context.get('type')
+        
     def _get_period(self, cr, uid, context={}):
         if context.get('period_id', False):
             return context.get('period_id')
@@ -81,6 +84,12 @@ class account_voucher(osv.osv):
     _order = "date desc, id desc"
     _rec_name = 'number'
     _columns = {
+        'type':fields.selection([
+            ('sale','Sale'),
+            ('purchase','Purchase'),
+            ('payment','Payment'),
+            ('receipt','Receipt'),
+        ],'Type'),
         'name':fields.char('Memo', size=256, readonly=True, states={'draft':[('readonly',False)]}),
         'date':fields.date('Date', readonly=True, states={'draft':[('readonly',False)]}, help="Effective date for accounting entries"),
         'journal_id':fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft':[('readonly',False)]}),
@@ -110,7 +119,7 @@ class account_voucher(osv.osv):
         'reference': fields.char('Ref #', size=64, readonly=True, states={'draft':[('readonly',False)]}, help="Payment or Receipt transaction number, i.e. Bank cheque number or payorder number or Wire transfer number or Acknowledge number."),
         'number': fields.related('move_id', 'name', type="char", readonly=True, string='Number'),
         'move_id':fields.many2one('account.move', 'Account Entry'),
-        'move_ids': fields.related('move_id','line_id', type='many2many', relation='account.move.line', string='Journal Items', readonly=True, states={'draft':[('readonly',False)]}),
+        'move_ids': fields.related('move_id','line_id', type='many2many', relation='account.move.line', string='Journal Items', readonly=True),
         'partner_id':fields.many2one('res.partner', 'Partner', readonly=True, states={'draft':[('readonly',False)]}),
         'audit': fields.related('move_id','to_check', type='boolean', relation='account.move', string='Audit Complete ?'),
         'pay_now':fields.selection([
@@ -119,11 +128,14 @@ class account_voucher(osv.osv):
         ],'Payment', select=True, readonly=True, states={'draft':[('readonly',False)]}),
         'tax_id':fields.many2one('account.tax', 'Tax', readonly=True, states={'draft':[('readonly',False)]}),
         'pre_line':fields.boolean('Previous Payments ?', required=False),
+        'date_due': fields.date('Due Date'),
+        'term_id':fields.many2one('account.payment.term', 'Term', required=False),
     }
     _defaults = {
         'period_id': _get_period,
         'journal_id':_get_journal,
         'currency_id': _get_currency,
+        'type':_get_type,
         'state': lambda *a: 'draft',
         'pay_now':lambda *a: 'pay_later',
         'name': lambda *a: '',
@@ -196,9 +208,23 @@ class account_voucher(osv.osv):
         return {
             'value':res
         }
-
+    
+    def onchange_term_id(self, cr, uid, ids, term_id, amount):
+        term_pool = self.pool.get('account.payment.term')
+        terms = False
+        due_date = False
+        default = {'date_due':False}
+        if term_id and amount:
+            terms = term_pool.compute(cr, uid, term_id, amount)
+        if terms:
+            due_date = terms[-1][0]
+            default.update({
+                'date_due':due_date
+            })
+        return {'value':default}
+        
     def onchange_partner_id(self, cr, uid, ids, partner_id, journal_id=False, price=0.0, context={}):
-        """
+        """price
         Returns a dict that contains new values and context
     
         @param partner_id: latest value from user input for field partner_id
@@ -215,28 +241,35 @@ class account_voucher(osv.osv):
         partner_pool = self.pool.get('res.partner')
         journal_pool = self.pool.get('account.journal')
         default = {
-            'value':{'line_ids':[], 'line_dr_ids':[], 'line_cr_ids':[], 'pre_line': 0},
+            'value':{'line_ids':[], 'line_dr_ids':[], 'line_cr_ids':[], 'pre_line': False},
         }
 
-        # TODO: improve this if possible !
         if not partner_id:
-            if ids:
-                line_ids = line_pool.search(cr, uid, [('voucher_id','=',ids[0])])
-                if line_ids:
-                    line_pool.unlink(cr, uid, line_ids)
+            return default
+
+        if not partner_id and ids:
+            line_ids = line_pool.search(cr, uid, [('voucher_id','=',ids[0])])
+            if line_ids:
+                line_pool.unlink(cr, uid, line_ids)
             return default
 
         journal = journal_pool.browse(cr, uid, journal_id)
         partner = partner_pool.browse(cr, uid, partner_id)
         account_id = False
+        term_id = False
         if journal.type in ('sale','sale_refund'):
             account_id = partner.property_account_receivable.id
         elif journal.type in ('purchase', 'purchase_refund','expense'):
+            term_id = partner.property_payment_term.id
+            if term_id:
+                vals = self.onchange_term_id(cr, uid, ids, term_id, price)
+                default['value'].update(vals.get('value'))
             account_id = partner.property_account_payable.id
         else:
             account_id = journal.default_credit_account_id.id or journal.default_debit_account_id.id
         default['value'].update({
-            'account_id':account_id
+            'account_id':account_id,
+            'term_id':term_id
         })
         if journal.type not in ('cash', 'bank'):
             return default
@@ -296,11 +329,10 @@ class account_voucher(osv.osv):
             }
         }
 
-    # TODO
     def onchange_journal(self, cr, uid, ids, journal_id):
         return {}
 
-    def proforma_voucher(self, cr, uid, ids, context={}):
+    def proforma_voucher(self, cr, uid, ids):
         self.action_move_line_create(cr, uid, ids)
         return True
 
@@ -384,8 +416,10 @@ class account_voucher(osv.osv):
             #create the first line manually
             debit = 0.0
             credit = 0.0
-            # TODO: to improve to select debit or credit
-            if True:
+            # TODO: is there any other alternative then the voucher type ??
+            if inv.type in ('purchase', 'payment'):
+                credit = currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, inv.amount)
+            elif inv.type in ('sale', 'receipt'):
                 debit = currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, inv.amount)
             move_line = {
                 'name':inv.name or '/',
@@ -549,7 +583,7 @@ class account_voucher_line(osv.osv):
     _columns = {
         'voucher_id':fields.many2one('account.voucher', 'Voucher', required=1),
         'name':fields.char('Description', size=256),
-        'account_id':fields.many2one('account.account','Account', required=True, domain=[('type','<>','view')]),
+        'account_id':fields.many2one('account.account','Account', required=True),
         'partner_id':fields.related('voucher_id', 'partner_id', type='many2one', relation='res.partner', string='Partner'),
         'amount':fields.float('Amount'),
         'type':fields.selection([('dr','Debit'),('cr','Credit')], 'Cr/Dr'),
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index da3cbba0d00..ecca6f04cf1 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -13,15 +13,14 @@
                         <field name="journal_id" domain="[('type','in',['bank', 'cash'])]" widget="selection" select="1" on_change="onchange_journal(journal_id,type)"/>
                         <field name="account_id" domain="[('type','=','other')]" widget="selection" on_change="onchange_account(account_id)" readonly="1"/>
                         <field name="number"/>
+                        <field name="type" invisible="True"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Payment Information">
                             <field name="line_ids" on_change="onchange_price(line_ids, False, False)" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="180">
                                 <tree string="Payment Lines" editable="bottom">
-                                    <field name="ref" on_change="onchange_partner(parent.partner_id,type,parent.type, parent.currency_id)"/>
                                     <field name="amount"/>
                                     <field name="account_id"/>
-                                    <field name="type" on_change="onchange_type(parent.partner_id,type,parent.type, parent.currency_id)"/>
                                     <field name="account_analytic_id"/>
                                 </tree>
                             </field>
@@ -62,7 +61,7 @@
             <field name="name">Vendor Payment</field>
             <field name="res_model">account.voucher.open</field>
             <field name="view_type">form</field>
-            <field name="domain">[('journal_id.type', 'in', ['bank', 'cash'])]</field>
+            <field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','payment')]</field>
             <field name="context">{'journal_type':'bank', 'type':'payment'}</field>
             <field name="view_id" ref="account_open_vouchers_view"/>
             <field name="target">new</field>
@@ -77,13 +76,13 @@
             <field name="arch" type="xml">
                 <form string="Sales Payment">
                     <group col="6" colspan="4">
-                        <field name="partner_id" on_change="onchange_partner_id(partner_id, journal_id, amount)" string="Customer"/>
+                        <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount)" string="Customer"/>
                         <field name="journal_id"
                             domain="[('type','in',['bank', 'cash'])]"
                             widget="selection" select="1"
                             on_change="onchange_partner_id(partner_id, journal_id, amount)"
                             string="Payment Method"/>
-                        <field name="amount" on_change="onchange_partner_id(partner_id, journal_id, amount)"/>
+                        <field name="amount"/>
                         <field name="reference" select="1" string="Payment Ref"/>
                         <field name="name" colspan="4"/>
                         <field name="account_id"
@@ -92,11 +91,12 @@
                             on_change="onchange_account(account_id)"
                             invisible="True"/>
                         <field name="pre_line" invisible="1"/>
+                        <field name="type" invisible="True"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Payment Information">
-                            <field name="line_cr_ids" default_get="{'journal_id':journal_id, 'partner_id':partner_id}" colspan="4" nolabel="1" height="180">
-                                <tree string="Invoices and outstanding payments" editable="bottom">
+                            <field name="line_cr_ids" default_get="{'journal_id':journal_id, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140">
+                                <tree string="Invoices and outstanding transactions" editable="bottom">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
                                         on_change="onchange_move_line_id(move_line_id)"
                                         domain="[('account_id.type','in',('receivable','payable')), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
@@ -141,7 +141,7 @@
                     </notebook>
                     <group col="10" colspan="4">
                         <field name="state"/>
-                        <button name="proforma_voucher" string="Create" states="draft" icon="terp-document-new"/>
+                        <button name="proforma_voucher" string="Post" states="draft" icon="terp-document-new"/>
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
                         <button name="%(action_view_account_voucher_unreconcile)d" string="Unreconcile" type="action" states="posted" icon="terp-stock_effects-object-colorize"/>
@@ -154,7 +154,7 @@
             <field name="name">Sales Payment</field>
             <field name="res_model">account.voucher.open</field>
             <field name="view_type">form</field>
-            <field name="domain">[('journal_id.type', 'in', ['bank', 'cash'])]</field>
+            <field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','receipt')]</field>
             <field name="context">{'journal_type':'bank', 'type':'receipt'}</field>
             <field name="view_id" ref="account_open_vouchers_view"/>
             <field name="target">new</field>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 09ff786e94d..fe7f75a32c0 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -8,24 +8,25 @@
             <field name="arch" type="xml">
                 <form string="Sales Receipt">
                     <group col="6" colspan="4">
-                        <field name="partner_id" on_change="onchange_partner_id(partner_id, journal_id)" string="Customer"/>
+                        <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id)" string="Customer"/>
                         <field name="journal_id"  domain="[('type','=','sale')]" widget="selection" on_change="onchange_journal(journal_id)"/>
                         <field name="number"/>
                         <field name="name" colspan="4"/>
                         <field name="date" on_change="onchange_date(date)"/>
+                        <field name="type" invisible="True"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Sales Information">
                             <field name="line_ids" on_change="onchange_price(line_ids, tax_id, parent.partner_id)" default_get="{'journal_id':journal_id, 'partner_id':partner_id}" colspan="4" nolabel="1" height="180">
                                 <tree string="Sales Lines" editable="bottom">
-                                    <field name="account_id" domain="[('user_type.report_type','=','income')]" widget="selection"/>
+                                    <field name="account_id" domain="[('user_type.report_type','=','income'),('type','!=','view')]" widget="selection"/>
                                     <field name="name"/>
                                     <field name="amount" sum="Total"/>
                                     <field name="account_analytic_id" groups="base.group_extended"/>
                                 </tree>
                             </field>
                             <group col="2" colspan="3">
-                                <separator string="Narration" colspan="2"/>
+                                <separator string="Internal Notes" colspan="2"/>
                                 <field name="narration" colspan="2" nolabel="1"/>
                             </group>
                             <group col="2" colspan="1">
@@ -73,7 +74,7 @@
             <field name="name">Sales Receipt</field>
             <field name="res_model">account.voucher.open</field>
             <field name="view_type">form</field>
-            <field name="domain">[('journal_id.type','=','sale')]</field>
+            <field name="domain">[('journal_id.type','=','sale'), ('type','=','sale')]</field>
             <field name="context">{'journal_type':'sale', 'type':'sale'}</field>
             <field name="view_id" ref="account_open_vouchers_view"/>
             <field name="target">new</field>
@@ -89,33 +90,39 @@
             <field name="arch" type="xml">
                 <form string="Vendor Bills">
                     <group col="6" colspan="4">
-                        <field name="partner_id" on_change="onchange_partner_id(partner_id, type, journal_id)"/>
-                        <field name="name" colspan="4"/>
-                        <field name="journal_id"  domain="[('type','=','purchase')]" widget="selection" select="1" on_change="onchange_journal(journal_id,type)"/>
-                        <field name="account_id" domain="[('type','=','other')]" widget="selection" on_change="onchange_account(account_id)"/>
+                        <field name="partner_id" string="Vendor" on_change="onchange_partner_id(partner_id, journal_id, amount)"/>
+                        <field name="journal_id" domain="[('type','=','purchase')]" widget="selection" select="1" on_change="onchange_journal(journal_id)"/>
                         <field name="number"/>
+                        <field name="name" colspan="4"/>
+                        <field name="reference" select="1"/>
+                        <field name="account_id" domain="[('type','=','other')]"  invisible="True"/>
+                        <field name="type" invisible="True"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Bill Information">
-                            <field name="line_ids" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="180">
-                                <tree string="Voucher Lines" editable="bottom">
-                                    <field name="stype" on_change="onchange_partner(parent.partner_id,type,parent.type, parent.currency_id)"/>
-                                    <field name="ref" on_change="onchange_partner(parent.partner_id,type,parent.type, parent.currency_id)"/>
+                            <field name="line_dr_ids" on_change="onchange_price(line_dr_ids, False, parent.partner_id)" default_get="{'journal_id':journal_id,'partner_id':partner_id}" colspan="4" nolabel="1" height="180">
+                                <tree string="Expense Lines" editable="bottom">
+                                    <field name="account_id" widget="selection" domain="[('user_type.report_type','=','expense'), ('type','!=','view')]"/>
+                                    <field name="name"/>
                                     <field name="amount"/>
-                                    <field name="account_id" domain="[('user_type.report_type','=','expense'), ('type','!=','view')]"/>
-                                    <field name="type" on_change="onchange_type(parent.partner_id,type,parent.type, parent.currency_id)"/>
-                                    <field name="account_analytic_id"/>
+                                    <field name="account_analytic_id" groups="base.group_extended"/>
                                 </tree>
                             </field>
                             <group col="2" colspan="3">
-                                <separator string="Narration" colspan="2"/>
+                                <separator string="Internal Notes" colspan="2"/>
                                 <field name="narration" colspan="2" nolabel="1"/>
                             </group>
-                            <group col="2" colspan="1">
-                                <separator string="Other Information" colspan="2"/>
-                                <field name="reference" select="1"/>
-                                <field name="date" select="1" on_change="onchange_date(date)"/>
-                                <field name="type" on_change="onchange_journal(journal_id,type)"/>
+                            <group col="4" colspan="1">
+                                <group col="2" colspan="1">
+                                    <separator string="Other Information" colspan="2"/>
+                                    <field name="date" string="Bill Date" select="1" on_change="onchange_date(date)"/>
+                                </group>
+                                <group col="2" colspan="1">
+                                    <separator string="Payment Terms" colspan="2"/>
+                                    <field name="term_id" widget="selection" on_change="onchange_term_id(term_id, amount)"/>
+                                    <field name="date_due"/>
+                                    <field name="amount" required="0" string="Amount Due"/>
+                                </group>
                             </group>
                         </page>
                         <page string="Journal Items">
@@ -130,7 +137,7 @@
                     </notebook>
                     <group col="10" colspan="4">
                         <field name="state"/>
-                        <button name="proforma_voucher" string="Create" states="draft" icon="terp-document-new"/>
+                        <button name="proforma_voucher" string="Post" states="draft" icon="terp-document-new"/>
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
                         <button name="%(action_view_account_voucher_unreconcile)d" string="Cancel" type="action" states="posted" icon="terp-stock_effects-object-colorize"/>
@@ -142,7 +149,7 @@
             <field name="name">Vendor Bills</field>
             <field name="res_model">account.voucher.open</field>
             <field name="view_type">form</field>
-            <field name="domain">[('journal_id.type','=','purchase')]</field>
+            <field name="domain">[('journal_id.type','=','purchase'), ('type','=','purchase')]</field>
             <field name="context">{'journal_type':'purchase', 'type':'purchase'}</field>
             <field name="view_id" ref="account_open_vouchers_view"/>
             <field name="target">new</field>
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index 4dcb371104d..b7d66e71eeb 100644
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -144,12 +144,14 @@
                         <field name="date" select='1'/>
                         <field name="number" select='1'/>
                         <field name="partner_id" select='1'/>
-                    </group>
-                    <newline/>
-                    <group col='8' colspan='4'>
                         <field name="journal_id" widget="selection" select="1"/>
                         <field name="period_id" select="1"/>
                     </group>
+<!--                    <newline/>-->
+<!--                    <group col='8' colspan='4'>-->
+<!--                        <field name="journal_id" widget="selection" select="1"/>-->
+<!--                        <field name="period_id" select="1"/>-->
+<!--                    </group>-->
                     <newline/>
                     <group expand="0" string="Group By..." colspan="12" col="10">
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
diff --git a/addons/account_voucher/wizard/account_voucher_unreconcile.py b/addons/account_voucher/wizard/account_voucher_unreconcile.py
index d12bee51894..257d6c96beb 100644
--- a/addons/account_voucher/wizard/account_voucher_unreconcile.py
+++ b/addons/account_voucher/wizard/account_voucher_unreconcile.py
@@ -47,9 +47,11 @@ class account_voucher_unreconcile(osv.osv_memory):
             for line in voucher.move_ids:
                 if line.reconcile_id:
                     recs = [line.reconcile_id.id]
-            
-            for rec in recs:
-                reconcile_pool.unlink(cr, uid, rec)
+                if line.reconcile_partial_id:
+                    recs = [line.reconcile_partial_id.id]
+                
+            #for rec in recs:
+            reconcile_pool.unlink(cr, uid, recs)
             
             if res.remove:
                 voucher_pool.cancel_voucher(cr, uid, [context.get('active_id')], context)

From ec9f8f6cd2a37911b036b00bc50131200b1a1322 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Fri, 27 Aug 2010 00:39:33 +0530
Subject: [PATCH 10/28] [FIX]: review all vouchers and fix some usablity
 problems [IMP]: make working, vendor payment and vendor bills

bzr revid: mga@tinyerp.com-20100826190933-23ibu3s07lix6tpr
---
 addons/account_voucher/voucher.py             | 84 ++++++++++++++-----
 .../voucher_payment_receipt_view.xml          | 49 ++++++++---
 .../voucher_sales_purchase_view.xml           |  2 +-
 .../wizard/account_voucher_unreconcile.py     |  4 +-
 4 files changed, 103 insertions(+), 36 deletions(-)

diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py
index 8e1d3491d26..ff8fcc664c1 100644
--- a/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@@ -222,8 +222,8 @@ class account_voucher(osv.osv):
                 'date_due':due_date
             })
         return {'value':default}
-        
-    def onchange_partner_id(self, cr, uid, ids, partner_id, journal_id=False, price=0.0, context={}):
+    
+    def onchange_partner_id(self, cr, uid, ids, partner_id, journal_id=False, price=0.0, ttype=False, context={}):
         """price
         Returns a dict that contains new values and context
     
@@ -273,8 +273,14 @@ class account_voucher(osv.osv):
         })
         if journal.type not in ('cash', 'bank'):
             return default
-
-        ids = move_line_pool.search(cr, uid, [('account_id.type','in', ('receivable','payable')), ('reconcile_id','=', False), ('partner_id','=',partner_id)], context=context)
+        
+        account_type = 'receivable'
+        if ttype == 'payment':
+            account_type = 'payable'
+        else:
+            account_type = 'receivable'
+            
+        ids = move_line_pool.search(cr, uid, [('account_id.type','=', account_type), ('reconcile_id','=', False), ('partner_id','=',partner_id)], context=context)
         moves = move_line_pool.browse(cr, uid, ids)
         total_credit = price or 0.0
         total_debit = 0.0
@@ -308,7 +314,11 @@ class account_voucher(osv.osv):
                 default['value']['line_cr_ids'].append(rs)
             else:
                 default['value']['line_dr_ids'].append(rs)
+            
+            if ttype == 'payment' and len(default['value']['line_cr_ids']) > 0:
                 default['value']['pre_line'] = 1
+            elif ttype == 'receipt' and len(default['value']['line_dr_ids']) > 0:
+                default['value']['pre_line'] = 1                
 
         return default
 
@@ -384,6 +394,14 @@ class account_voucher(osv.osv):
         }
 
     def action_move_line_create(self, cr, uid, ids, *args):
+    
+        def _get_payment_term_lines(term_id, amount):
+            term_pool = self.pool.get('account.payment.term')
+            if term_id and amount:
+                terms = term_pool.compute(cr, uid, term_id, amount)
+                return terms
+            return False
+    
         move_pool = self.pool.get('account.move')
         move_line_pool = self.pool.get('account.move.line')
         analytic_pool = self.pool.get('account.analytic.line')
@@ -412,7 +430,7 @@ class account_voucher(osv.osv):
             }
             move_id = move_pool.create(cr, uid, move)
             company_currency = inv.account_id.company_id.currency_id.id
-
+            
             #create the first line manually
             debit = 0.0
             credit = 0.0
@@ -421,20 +439,40 @@ class account_voucher(osv.osv):
                 credit = currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, inv.amount)
             elif inv.type in ('sale', 'receipt'):
                 debit = currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, inv.amount)
-            move_line = {
-                'name':inv.name or '/',
-                'debit':debit,
-                'credit':credit,
-                'account_id':inv.account_id.id,
-                'move_id':move_id ,
-                'journal_id':inv.journal_id.id,
-                'period_id':inv.period_id.id,
-                'partner_id':inv.partner_id.id,
-                'currency_id':inv.currency_id.id,
-                'date':inv.date
-            }
-
-            master_line = move_line_pool.create(cr, uid, move_line)
+            
+            if inv.type == 'purchase' and inv.term_id and _get_payment_term_lines(inv.term_id.id, credit or debit):
+                terms = _get_payment_term_lines(inv.term_id.id, credit or debit)
+                for term in terms:
+                    due_date = term[0]
+                    amount = term[1]
+                    move_line = {
+                        'name':inv.name or '/',
+                        'debit':0.0,
+                        'credit':amount,
+                        'date_maturity':due_date,
+                        'account_id':inv.account_id.id,
+                        'move_id':move_id ,
+                        'journal_id':inv.journal_id.id,
+                        'period_id':inv.period_id.id,
+                        'partner_id':inv.partner_id.id,
+                        'currency_id':inv.currency_id.id,
+                        'date':inv.date
+                    }
+                    master_line = move_line_pool.create(cr, uid, move_line)
+            else:
+                move_line = {
+                    'name':inv.name or '/',
+                    'debit':debit,
+                    'credit':credit,
+                    'account_id':inv.account_id.id,
+                    'move_id':move_id ,
+                    'journal_id':inv.journal_id.id,
+                    'period_id':inv.period_id.id,
+                    'partner_id':inv.partner_id.id,
+                    'currency_id':inv.currency_id.id,
+                    'date':inv.date
+                }
+                master_line = move_line_pool.create(cr, uid, move_line)
 
             rec_list_ids = []
             line_total = debit - credit
@@ -581,7 +619,7 @@ class account_voucher_line(osv.osv):
         return res
 
     _columns = {
-        'voucher_id':fields.many2one('account.voucher', 'Voucher', required=1),
+        'voucher_id':fields.many2one('account.voucher', 'Voucher', required=1, ondelete='cascade'),
         'name':fields.char('Description', size=256),
         'account_id':fields.many2one('account.account','Account', required=True),
         'partner_id':fields.related('voucher_id', 'partner_id', type='many2one', relation='res.partner', string='Partner'),
@@ -650,7 +688,11 @@ class account_voucher_line(osv.osv):
         elif journal.type in ('purchase', 'expense', 'sale_refund'):
             account_id = journal.default_debit_account_id and journal.default_debit_account_id.id or False
         elif partner_id:
-            account_id = partner_pool.browse(cr, user, partner_id, context=context).property_account_receivable.id
+            partner = partner_pool.browse(cr, user, partner_id, context=context)
+            if context.get('type') == 'payment':
+                account_id = partner.property_account_payable.id
+            elif context.get('type') == 'receipt':
+                account_id = partner.property_account_receivable.id
 
         if (not account_id) and 'account_id' in fields_list:
             raise osv.except_osv(_('Invalid Error !'), _('Please change partner and try again !'))
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index ecca6f04cf1..ce7f352d251 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -8,24 +8,50 @@
             <field name="arch" type="xml">
                 <form string="Bill Payment">
                     <group col="6" colspan="4">
-                        <field name="partner_id" on_change="onchange_partner_id(partner_id, type, journal_id)"/>
+                        <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, type)" string="Customer"/>
+                        <field name="journal_id"
+                            domain="[('type','in',['bank', 'cash'])]"
+                            widget="selection" select="1"
+                            on_change="onchange_partner_id(partner_id, journal_id, amount)"
+                            string="Payment Method"/>
+                        <field name="amount"/>
+                        <field name="reference" select="1" string="Payment Ref"/>
                         <field name="name" colspan="4"/>
-                        <field name="journal_id" domain="[('type','in',['bank', 'cash'])]" widget="selection" select="1" on_change="onchange_journal(journal_id,type)"/>
-                        <field name="account_id" domain="[('type','=','other')]" widget="selection" on_change="onchange_account(account_id)" readonly="1"/>
-                        <field name="number"/>
+                        <field name="account_id"
+                            domain="[('type','=','other')]"
+                            widget="selection"
+                            on_change="onchange_account(account_id)"
+                            invisible="True"/>
+                        <field name="pre_line" invisible="1"/>
                         <field name="type" invisible="True"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Payment Information">
-                            <field name="line_ids" on_change="onchange_price(line_ids, False, False)" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="180">
+                            <field name="line_dr_ids" on_change="onchange_price(line_dr_ids, False, False)" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140">
                                 <tree string="Payment Lines" editable="bottom">
-                                    <field name="amount"/>
-                                    <field name="account_id"/>
-                                    <field name="account_analytic_id"/>
+                                    <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
+                                        on_change="onchange_move_line_id(move_line_id)"
+                                        domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
+                                        />
+                                    <field name="account_id"  domain="[('type','=','payable')]"/>
+                                    <field name="date_original" readonly="1"/>
+                                    <field name="date_due" readonly="1"/>
+                                    <field name="amount_original" readonly="1"/>
+                                    <field name="amount_unreconciled" sum="Open Balance" readonly="1"/>
+                                    <field name="amount" sum="Payment"/>
+                                </tree>
+                            </field>
+                            <field name="line_cr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('pre_line','=',False)]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}">
+                                <tree string="Credits" editable="bottom">
+                                    <field name="move_line_id"/>
+                                    <field name="account_id"  domain="[('type','=','receivable')]"/>
+                                    <field name="date_original"/>
+                                    <field name="amount_original"/>
+                                    <field name="amount" sum="Payment"/>
                                 </tree>
                             </field>
                             <group col="2" colspan="3">
-                                <separator string="Narration" colspan="2"/>
+                                <separator string="Internal Notes" colspan="2"/>
                                 <field name="narration" colspan="2" nolabel="1"/>
                             </group>
                             <group col="2" colspan="1">
@@ -33,7 +59,6 @@
                                 <field name="reference" select="1"/>
                                 <field name="date" select="1" on_change="onchange_date(date)"/>
                                 <field name="currency_id" select="1" attrs="{'readonly':[('type','in',['sale', 'purchase'])]}"/>
-                                <field name="type" on_change="onchange_journal(journal_id,type)"/>
                             </group>
                         </page>
                         <page string="Journal Items">
@@ -76,7 +101,7 @@
             <field name="arch" type="xml">
                 <form string="Sales Payment">
                     <group col="6" colspan="4">
-                        <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount)" string="Customer"/>
+                        <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, type)" string="Customer"/>
                         <field name="journal_id"
                             domain="[('type','in',['bank', 'cash'])]"
                             widget="selection" select="1"
@@ -95,7 +120,7 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Payment Information">
-                            <field name="line_cr_ids" default_get="{'journal_id':journal_id, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140">
+                            <field name="line_cr_ids" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140">
                                 <tree string="Invoices and outstanding transactions" editable="bottom">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
                                         on_change="onchange_move_line_id(move_line_id)"
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index fe7f75a32c0..387dd28f77a 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -90,7 +90,7 @@
             <field name="arch" type="xml">
                 <form string="Vendor Bills">
                     <group col="6" colspan="4">
-                        <field name="partner_id" string="Vendor" on_change="onchange_partner_id(partner_id, journal_id, amount)"/>
+                        <field name="partner_id" required="1" string="Vendor" on_change="onchange_partner_id(partner_id, journal_id, amount)"/>
                         <field name="journal_id" domain="[('type','=','purchase')]" widget="selection" select="1" on_change="onchange_journal(journal_id)"/>
                         <field name="number"/>
                         <field name="name" colspan="4"/>
diff --git a/addons/account_voucher/wizard/account_voucher_unreconcile.py b/addons/account_voucher/wizard/account_voucher_unreconcile.py
index 257d6c96beb..fdb51bb6b91 100644
--- a/addons/account_voucher/wizard/account_voucher_unreconcile.py
+++ b/addons/account_voucher/wizard/account_voucher_unreconcile.py
@@ -46,9 +46,9 @@ class account_voucher_unreconcile(osv.osv_memory):
             recs = []
             for line in voucher.move_ids:
                 if line.reconcile_id:
-                    recs = [line.reconcile_id.id]
+                    recs += [line.reconcile_id.id]
                 if line.reconcile_partial_id:
-                    recs = [line.reconcile_partial_id.id]
+                    recs += [line.reconcile_partial_id.id]
                 
             #for rec in recs:
             reconcile_pool.unlink(cr, uid, recs)

From 1cc6fe6a4678d4c0f229d4bc0579c6459e78d275 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Fri, 27 Aug 2010 09:08:41 +0530
Subject: [PATCH 11/28] [IMP] Account: if statement.name =='/': the first
 statement created is St. 08/25/ instead of St. 08/25/1? check the sequence if
 statement name !='/': do not append a sequence (if user typed 'QDP1', do not
 replace it by 'QDP1/x' where x is a sequence number autoincremented)

bzr revid: mra@mra-laptop-20100827033841-owws11we2s62e17m
---
 addons/account/account_bank_statement.py |  6 +++---
 addons/account/data/account_data2.xml    | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index c3809b44c04..4d5a322a5e2 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -371,11 +371,11 @@ class account_bank_statement(osv.osv):
             self.log(cr, uid, st.id, 'Statement %s is confirmed and entries are created.' % st.name)
             done.append(st.id)
 
-            next_number = obj_seq.get(cr, uid, 'account.bank.statement')
             if not st.name == '/':
-                next_number = st.name + '/' + next_number[-1:]
+                next_number = st.name
                 account_move_obj.write(cr, uid, [move_id], {'name': next_number})
-
+            else:
+                next_number = obj_seq.get(cr, uid, 'account.bank.statement')
             account_move_obj.write(cr, uid, [move_id], {'state': 'posted'}) # Bank statements will not consider boolean on journal entry_posted
             self.write(cr, uid, [st.id], {'name': next_number}, context=context)
 
diff --git a/addons/account/data/account_data2.xml b/addons/account/data/account_data2.xml
index b0f5f82e156..980834c0dee 100644
--- a/addons/account/data/account_data2.xml
+++ b/addons/account/data/account_data2.xml
@@ -247,8 +247,8 @@
             <field name="field">state</field>
             <field eval="14" name="sequence"/>
         </record>
-        
-        
+
+
         <record id="account_sp_journal_view" model="account.journal.view">
             <field name="name">Sale/Purchase Journal View</field>
         </record>
@@ -346,7 +346,7 @@
             <field name="field">reconcile_id</field>
             <field eval="20" name="sequence"/>
         </record>
-        
+
         <record id="account_sp_refund_journal_view" model="account.journal.view">
             <field name="name">Sale/Purchase Refund Journal View</field>
         </record>
@@ -444,7 +444,7 @@
             <field name="field">reconcile_id</field>
             <field eval="20" name="sequence"/>
         </record>
-        
+
         <!--
         Account Journal Sequences
         -->
@@ -495,10 +495,10 @@
             <field name="name">Account Bank Statement</field>
             <field name="code">account.bank.statement</field>
             <field name="prefix">St. %(month)s/%(day)s/</field>
-            <field eval="0" name="number_next"/>
+            <field eval="1" name="number_next"/>
             <field eval="1" name="number_increment"/>
         </record>
-        
+
         <record id="cash_sequence_statement_type" model="ir.sequence.type">
             <field name="name">Cash Statement</field>
             <field name="code">account.cash.statement</field>

From 29c473188b87dcbd0dfac3d9061950ba1407776a Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Fri, 27 Aug 2010 10:20:49 +0530
Subject: [PATCH 12/28] [IMP] Account: bank statement name and numbering=> in
 all cases, the account move objects created (reminder: there is one account
 move by statement line) must have a name wich is the same as the
 bank_statement name + ' / ' + the sequence of the statement line

bzr revid: mra@mra-laptop-20100827045049-zuge81k8z8awrg0i
---
 addons/account/account_bank_statement.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 4d5a322a5e2..fb58d382649 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -222,6 +222,11 @@ class account_bank_statement(osv.osv):
                 raise osv.except_osv(_('Configuration Error !'),
                         _('Please verify that an account is defined in the journal.'))
 
+            if not st.name == '/':
+                next_number = st.name
+            else:
+                next_number = obj_seq.get(cr, uid, 'account.bank.statement')
+
             for line in st.move_line_ids:
                 if line.state <> 'valid':
                     raise osv.except_osv(_('Error !'),
@@ -230,14 +235,14 @@ class account_bank_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:
-                context.update({'date':move.date})
+                context.update({'date': move.date})
                 move_id = account_move_obj.create(cr, uid, {
                     'journal_id': st.journal_id.id,
                     'period_id': st.period_id.id,
                     'date': move.date,
                 }, context=context)
                 account_bank_statement_line_obj.write(cr, uid, [move.id], {
-                    'move_ids': [(4,move_id, False)]
+                    'move_ids': [(4, move_id, False)]
                 })
                 if not move.amount:
                     continue
@@ -367,16 +372,11 @@ class account_bank_statement(osv.osv):
                             account_move_line_obj.reconcile(cr, uid, torec, 'statement', writeoff_acc_id=writeoff_acc_id, writeoff_period_id=st.period_id.id, writeoff_journal_id=st.journal_id.id, context=context)
                     else:
                         account_move_line_obj.reconcile_partial(cr, uid, torec, 'statement', context)
+                move_name = next_number + '/' + str(move.sequence)
+                account_move_obj.write(cr, uid, [move_id], {'name': move_name, 'state': 'posted'}) # Bank statements will not consider boolean on journal entry_posted
 
             self.log(cr, uid, st.id, 'Statement %s is confirmed and entries are created.' % st.name)
             done.append(st.id)
-
-            if not st.name == '/':
-                next_number = st.name
-                account_move_obj.write(cr, uid, [move_id], {'name': next_number})
-            else:
-                next_number = obj_seq.get(cr, uid, 'account.bank.statement')
-            account_move_obj.write(cr, uid, [move_id], {'state': 'posted'}) # Bank statements will not consider boolean on journal entry_posted
             self.write(cr, uid, [st.id], {'name': next_number}, context=context)
 
         self.write(cr, uid, done, {'state':'confirm'}, context=context)

From 3690da3b9b69145b1f1d4e3fa5506027675c14ee Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Fri, 27 Aug 2010 11:08:46 +0530
Subject: [PATCH 13/28] [FIX] hr_holidays: Fix the problem related to report
 Leaves by Department

bzr revid: psi@tinyerp.co.in-20100827053846-tlffr7s2zrze5rbq
---
 .../report/holidays_summary_report.py         | 28 ++++++++-----------
 .../wizard/hr_holidays_summary_department.py  |  2 +-
 .../wizard/hr_holidays_summary_employees.py   |  2 +-
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/addons/hr_holidays/report/holidays_summary_report.py b/addons/hr_holidays/report/holidays_summary_report.py
index f3a17be3015..851defe7e73 100644
--- a/addons/hr_holidays/report/holidays_summary_report.py
+++ b/addons/hr_holidays/report/holidays_summary_report.py
@@ -94,13 +94,13 @@ class report_custom(report_rml):
         emp_id={}
 #        done={}
 
-        cr.execute("select name from res_company")
+        cr.execute("SELECT name FROM res_company")
         res=cr.fetchone()[0]
         date_xml=[]
         date_today=time.strftime('%Y-%m-%d %H:%M:%S')
         date_xml +=['<res name="%s" today="%s" />' % (res,date_today)]
 
-        cr.execute("select id,name,color_name from hr_holidays_status order by id")
+        cr.execute("SELECT id, name, color_name FROM hr_holidays_status ORDER BY id")
         legend=cr.fetchall()
         today=datetime.datetime.today()
 
@@ -221,23 +221,19 @@ class report_custom(report_rml):
         elif data['model']=='ir.ui.menu':
             for id in data['form']['depts']:
                 dept = obj_dept.browse(cr, uid, id, context=context)
-
-                cr.execute("""select dept.manager_id from hr_department dept\
-                where dept.id = %s""", (id,))
-                result=cr.fetchall()
-                if result==[]:
+                cr.execute("""SELECT id FROM hr_employee \
+                WHERE department_id = %s""", (id,))
+                emp_ids = [x[0] for x in cr.fetchall()]
+                if emp_ids==[]:
                     continue
                 dept_done=0
-                for d in range(0,len(result)):
-                    emp_id[d] = obj_emp.search(cr, uid, [('user_id', '=', result[d][0])])
-                    items = obj_emp.read(cr, uid, emp_id[d], ['id', 'name'])
-                    for item in items:
-                        if dept_done==0:
-                            emp_xml += emp_create_xml(self, cr, uid, 1, holiday_type, row_id, dept.id, dept.name, som, eom)
-                            row_id = row_id +1
-                        dept_done=1
-                        emp_xml += emp_create_xml(self, cr, uid, 0, holiday_type, row_id, item['id'], item['name'], som, eom)
+                for item in obj_emp.read(cr, uid, emp_ids, ['id', 'name']):
+                    if dept_done==0:
+                        emp_xml += emp_create_xml(self, cr, uid, 1, holiday_type, row_id, dept.id, dept.name, som, eom)
                         row_id = row_id +1
+                    dept_done=1
+                    emp_xml += emp_create_xml(self, cr, uid, 0, holiday_type, row_id, item['id'], item['name'], som, eom)
+                    row_id = row_id +1
         # Computing the xml
         xml='''<?xml version="1.0" encoding="UTF-8" ?>
         <report>
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department.py b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
index 06651e11d33..9a99d9eff63 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department.py
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
@@ -34,7 +34,7 @@ class hr_holidays_summary_dept(osv.osv_memory):
     }
 
     _defaults = {
-         'date_from': time.strftime('%Y-%m-%d'),
+         'date_from': time.strftime('%Y-%m-01'),
          'holiday_type': 'Validated'
     }
 
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_employees.py b/addons/hr_holidays/wizard/hr_holidays_summary_employees.py
index 379ff7d76c7..0fa58b01581 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_employees.py
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_employees.py
@@ -33,7 +33,7 @@ class hr_holidays_summary_employee(osv.osv_memory):
     }
 
     _defaults = {
-         'date_from': time.strftime('%Y-%m-%d'),
+         'date_from': time.strftime('%Y-%m-01'),
          'holiday_type': 'Validated',
     }
 

From 0975cb41eceeb13983a032044ea6eb9562e79544 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Fri, 27 Aug 2010 11:47:56 +0530
Subject: [PATCH 14/28] [IMP] Account invoice: the order of invoices (all) is
 not correct: it should display them by number desc (not asc as currently)

bzr revid: mra@mra-laptop-20100827061756-s1ujub9a3ye5nfjc
---
 addons/account/invoice.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index e7b95cea8dc..4e1a5a052ec 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -219,7 +219,7 @@ class account_invoice(osv.osv):
 
     _name = "account.invoice"
     _description = 'Invoice'
-    _order = "id"
+    _order = "id desc"
 
     _columns = {
         'name': fields.char('Description', size=64, select=True, readonly=True, states={'draft':[('readonly',False)]}),

From 018a7b1c802d1308c556704312a3e9ddef7b4d65 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Fri, 27 Aug 2010 12:06:46 +0530
Subject: [PATCH 15/28] [IMP] account:-In chart of accounts,moved the
 company_id field after the company currency field

bzr revid: mtr@mtr-20100827063646-6le7xhr65l4zmwsd
---
 addons/account/account_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index cc740220524..32989538ebe 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -242,8 +242,8 @@
                     <field name="debit"/>
                     <field name="credit"/>
                     <field name="balance"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
                     <field name="company_currency_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <field name="type"/>
                 </tree>
             </field>

From 073831ec2abd8329790b3e31044b0faf8832b26e Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Fri, 27 Aug 2010 12:19:02 +0530
Subject: [PATCH 16/28] [REF] Account

bzr revid: mra@mra-laptop-20100827064902-3rh7c96hdz3x9231
---
 addons/account/wizard/account_chart.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/addons/account/wizard/account_chart.py b/addons/account/wizard/account_chart.py
index bace3d0ca29..f7de4b593f3 100644
--- a/addons/account/wizard/account_chart.py
+++ b/addons/account/wizard/account_chart.py
@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 from osv import fields, osv
 from tools.translate import _
 
@@ -26,7 +27,7 @@ class account_chart(osv.osv_memory):
     For Chart of Accounrs
     """
     _name = "account.chart"
-    _description = "chart"
+    _description = "Account chart"
     _columns = {
        'fiscalyear': fields.many2one('account.fiscalyear', \
                                     'Fiscal year',  \
@@ -37,11 +38,9 @@ class account_chart(osv.osv_memory):
 
     def _get_fiscalyear(self, cr, uid, context=None):
         """Return default Fiscalyear value"""
-        fiscalyear_obj = self.pool.get('account.fiscalyear')
-        fiscalyear = fiscalyear_obj.find(cr, uid)
-        return fiscalyear
+        return self.pool.get('account.fiscalyear').find(cr, uid)
 
-    def account_chart_open_window(self, cr, uid, ids, context={}):
+    def account_chart_open_window(self, cr, uid, ids, context=None):
         """
         Opens chart of Accounts
         @param cr: the current row, from the database cursor,
@@ -51,6 +50,8 @@ class account_chart(osv.osv_memory):
         """
         mod_obj = self.pool.get('ir.model.data')
         act_obj = self.pool.get('ir.actions.act_window')
+        if context is None:
+            context = {}
         data = self.read(cr, uid, ids, [], context=context)[0]
         result = mod_obj._get_id(cr, uid, 'account', 'action_account_tree')
         id = mod_obj.read(cr, uid, [result], ['res_id'], context=context)[0]['res_id']
@@ -65,6 +66,7 @@ class account_chart(osv.osv_memory):
         'fiscalyear': _get_fiscalyear,
         'target_move': 'all'
     }
+
 account_chart()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

From 2831ed76a4c20fc77b57f16b7149aeb585aa6bec Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Fri, 27 Aug 2010 12:54:46 +0530
Subject: [PATCH 17/28] [IMP] account: Add tooltip for currency_id and change
 the label of account_type on account.bank.accounts.wizard object

bzr revid: psi@tinyerp.co.in-20100827072446-k2g61css8civ82ad
---
 addons/account/installer.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/installer.py b/addons/account/installer.py
index d82db6de96d..a9872925321 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -583,8 +583,8 @@ class account_bank_accounts_wizard(osv.osv_memory):
     _columns = {
         'acc_name': fields.char('Account Name.', size=64, required=True),
         'bank_account_id': fields.many2one('wizard.multi.charts.accounts', 'Bank Account', required=True),
-        'currency_id': fields.many2one('res.currency', 'Currency'),
-        'account_type': fields.selection([('cash','Cash'),('check','Check'),('bank','Bank')], 'Type', size=32),
+        'currency_id': fields.many2one('res.currency', 'Secondary Currency', help="Forces all moves for this account to have this secondary currency."),
+        'account_type': fields.selection([('cash','Cash'),('check','Check'),('bank','Bank')], 'Account Type', size=32),
     }
     _defaults = {
         'currency_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.currency_id.id,

From 19380a87a08ba829708b150845e8db947ca61347 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Fri, 27 Aug 2010 16:00:13 +0530
Subject: [PATCH 18/28] [IMP] Tax chart by wizard:     * the menuitem
 Accounting \ Chart \ Chart of taxes, have to ask for a period, by default
 filled with the current period. Then opening the chart of tax using that
 period in context to have the sum period and sum years completed. It should
 also ask if we want to include the draft account moves or not

    * the company_id field should be hidden in that chart, if the user doesn't have the useabilty / multi company group

    * the chart should display the period sum before the year sum

bzr revid: mra@mra-laptop-20100827103013-ppj8y6loadpw8oz4
---
 addons/account/__openerp__.py                 |  1 +
 addons/account/account.py                     |  2 +-
 addons/account/account_view.xml               |  8 +-
 addons/account/wizard/__init__.py             |  1 +
 addons/account/wizard/account_tax_chart.py    | 78 +++++++++++++++++++
 .../account/wizard/account_tax_chart_view.xml | 45 +++++++++++
 6 files changed, 131 insertions(+), 4 deletions(-)
 create mode 100644 addons/account/wizard/account_tax_chart.py
 create mode 100644 addons/account/wizard/account_tax_chart_view.xml

diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 96412077840..6f3675392e0 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -60,6 +60,7 @@ module named account_voucher.
         'wizard/account_period_close_view.xml',
         'wizard/account_fiscalyear_close_state.xml',
         'wizard/account_chart_view.xml',
+        'wizard/account_tax_chart_view.xml',
         'wizard/account_move_journal_view.xml',
         'wizard/account_move_line_reconcile_select_view.xml',
         'wizard/account_open_closed_fiscalyear_view.xml',
diff --git a/addons/account/account.py b/addons/account/account.py
index f0884044fcf..682e9583e33 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -835,7 +835,7 @@ class account_period(osv.osv):
         'company_id': fields.related('fiscalyear_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True)
     }
     _defaults = {
-        'state': lambda *a: 'draft',
+        'state': 'draft',
     }
     _order = "date_start"
 
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 32989538ebe..49a251175cd 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -710,9 +710,9 @@
                 <tree string="Account Tax Code" toolbar="1">
                     <field name="name"/>
                     <field name="code"/>
-                    <field name="sum"/>
                     <field name="sum_period"/>
-                    <field name="company_id"/>
+                    <field name="sum"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>
@@ -857,11 +857,13 @@
             <field name="view_id" ref="view_tax_code_tree"/>
             <field name="help">Chart of Taxes is a tree view reflecting the structure of the Tax Cases (or tax codes) and shows the current tax situation. The tax chart represents the amount of each area of the tax declaration for your country. It’s presented in a hierarchical structure, which can be modified to fit your needs.</field>
         </record>
+
+        <!--
         <menuitem
             action="action_tax_code_tree"
             id="menu_action_tax_code_tree"
             parent="menu_finance_charts"
-            sequence="12"/>
+            sequence="12"/> --> <!-- move to wizard -->
 
         <!--
     Entries lines
diff --git a/addons/account/wizard/__init__.py b/addons/account/wizard/__init__.py
index dea907acf2d..6846e3b771f 100644
--- a/addons/account/wizard/__init__.py
+++ b/addons/account/wizard/__init__.py
@@ -48,6 +48,7 @@ import account_open_closed_fiscalyear
 import account_compare_account_balance_report
 import account_invoice_state
 import account_chart
+import account_tax_chart
 #TODO: remove this file no moe used
 # also remove related view fiel
 
diff --git a/addons/account/wizard/account_tax_chart.py b/addons/account/wizard/account_tax_chart.py
new file mode 100644
index 00000000000..5b5feaf480c
--- /dev/null
+++ b/addons/account/wizard/account_tax_chart.py
@@ -0,0 +1,78 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+
+class account_tax_chart(osv.osv_memory):
+    """
+    For Chart of taxes
+    """
+    _name = "account.tax.chart"
+    _description = "Account tax chart"
+    _columns = {
+       'period_id': fields.many2one('account.period', \
+                                    'Period',  \
+                                    ),
+       'target_move': fields.selection([('all', 'All Entries'),
+                                        ('posted', 'All Posted Entries')], 'Target Moves', required=True),
+    }
+
+    def _get_period(self, cr, uid, context=None):
+        """Return default period value"""
+        return self.pool.get('account.period').find(cr, uid)
+
+    def account_tax_chart_open_window(self, cr, uid, ids, context=None):
+        """
+        Opens chart of Accounts
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of account chart’s IDs
+        @return: dictionary of Open account chart window on given fiscalyear and all Entries or posted entries
+        """
+        mod_obj = self.pool.get('ir.model.data')
+        act_obj = self.pool.get('ir.actions.act_window')
+        period_obj = self.pool.get('account.period')
+        if context is None:
+            context = {}
+        data = self.read(cr, uid, ids, [], context=context)[0]
+        result = mod_obj._get_id(cr, uid, 'account', 'action_tax_code_tree')
+        id = mod_obj.read(cr, uid, [result], ['res_id'], context=context)[0]['res_id']
+        result = act_obj.read(cr, uid, [id], context=context)[0]
+        if data['period_id']:
+            fiscalyear_id = period_obj.read(cr, uid, [data['period_id']], context=context)[0]['fiscalyear_id'][0]
+            result['context'] = str({'period_id': data['period_id'], \
+                                     'fiscalyear_id': fiscalyear_id, \
+                                        'state': data['target_move']})
+        else:
+            result['context'] = str({'state': data['target_move']})
+
+        if data['period_id']:
+            result['name'] += ':' + self.pool.get('account.period').read(cr, uid, [data['period_id']], context=context)[0]['code']
+        return result
+
+    _defaults = {
+        'period_id': _get_period,
+        'target_move': 'all'
+    }
+
+account_tax_chart()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account/wizard/account_tax_chart_view.xml b/addons/account/wizard/account_tax_chart_view.xml
new file mode 100644
index 00000000000..f60ad394857
--- /dev/null
+++ b/addons/account/wizard/account_tax_chart_view.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_account_tax_chart" model="ir.ui.view">
+            <field name="name">account.tax.chart.form</field>
+            <field name="model">account.tax.chart</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Account tax charts">
+                    <group colspan="4" >
+                        <field name="period_id"/>
+                        <label align="0.7" colspan="6" string="(If you do not select period it will take all open periods)"/>
+                        <field name="target_move"/>
+                    </group>
+                    <separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                        <label string ="" colspan="2"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
+                        <button icon="terp-gtk-go-back-rtl" string="Open Charts" name="account_tax_chart_open_window" type="object" />
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_account_tax_chart" model="ir.actions.act_window">
+            <field name="name">Chart of Taxes</field>
+            <field name="res_model">account.tax.chart</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('parent_id','=',False)]</field>
+            <field name="view_id" ref="view_account_tax_chart"/>
+            <field name="help">Chart of Taxes is a tree view reflecting the structure of the Tax Cases (or tax codes) and shows the current tax situation. The tax chart represents the amount of each area of the tax declaration for your country. It’s presented in a hierarchical structure, which can be modified to fit your needs.</field>
+            <field name="target">new</field>
+        </record>
+
+		<menuitem
+			icon="STOCK_INDENT"
+            action="action_account_tax_chart"
+            id="menu_action_tax_code_tree"
+            parent="menu_finance_charts"
+            sequence="12"/>
+
+	</data>
+</openerp>

From 8026bd9279e160ae2eafed16ab88da082d4b0a0c Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Fri, 27 Aug 2010 16:31:33 +0530
Subject: [PATCH 19/28] [IMP] account_period:-remove the role and added the
 group 'account/manager' on 'Set to Draft button

bzr revid: mtr@mtr-20100827110133-bh05m92ll0q0733j
---
 addons/account/account.py       | 11 ++++-------
 addons/account/account_view.xml |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 682e9583e33..8448bc35cd8 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -883,13 +883,10 @@ class account_period(osv.osv):
         return ids
 
     def action_draft(self, cr, uid, ids, *args):
-        users_roles = self.pool.get('res.users').browse(cr, uid, uid).roles_id
-        for role in users_roles:
-            if role.name=='Period':
-                mode = 'draft'
-                for id in ids:
-                    cr.execute('update account_journal_period set state=%s where period_id=%s', (mode, id))
-                    cr.execute('update account_period set state=%s where id=%s', (mode, id))
+        mode = 'draft'
+        for id in ids:
+            cr.execute('update account_journal_period set state=%s where period_id=%s', (mode, id))
+            cr.execute('update account_period set state=%s where id=%s', (mode, id))
         return True
 
     def name_search(self, cr, user, name, args=None, operator='ilike', context={}, limit=80):
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 49a251175cd..c183a158ab8 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -104,7 +104,7 @@
                     <field name="special"/>
                     <separator colspan="4" string="States"/>
                     <field name="state" select="1"/>
-                    <button name="action_draft" states="done" string="Set to Draft" type="object" icon="gtk-convert"/>
+                    <button name="action_draft" states="done" string="Set to Draft" type="object" icon="gtk-convert" groups="account.group_account_manager"/>
                 </form>
             </field>
         </record>

From aa4e160f84f9341d647e4ca257ec51c4d18b3e03 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Fri, 27 Aug 2010 16:43:30 +0530
Subject: [PATCH 20/28] [FIX] account bank statment lines: onchange partner
 fill amount if its empty

bzr revid: mra@mra-laptop-20100827111330-42jf1103qge7zc3k
---
 addons/account/account_bank_statement.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index fb58d382649..40193750393 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -615,6 +615,26 @@ class account_bank_statement_line(osv.osv):
             else:
                 account_id = part.property_account_receivable.id
             res['value']['account_id'] = account_id
+
+        if not line or (line and not line[0].amount):
+            res_users_obj = self.pool.get('res.users')
+            res_currency_obj = self.pool.get('res.currency')
+            company_currency_id = res_users_obj.browse(cursor, user, user,
+                    context=context).company_id.currency_id.id
+            if not currency_id:
+                currency_id = company_currency_id
+
+            cursor.execute('SELECT sum(debit-credit) \
+                FROM account_move_line \
+                WHERE (reconcile_id is null) \
+                    AND partner_id = %s \
+                    AND account_id=%s', (partner_id, account_id))
+            pgres = cursor.fetchone()
+            balance = pgres and pgres[0] or 0.0
+
+            balance = res_currency_obj.compute(cursor, user, company_currency_id,
+                currency_id, balance, context=context)
+            res['value']['amount'] = balance
         return res
 
     def _reconcile_amount(self, cursor, user, ids, name, args, context=None):

From 6a0dbce3b43ed86a7d7e17d8b16ce10436bb10c1 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Fri, 27 Aug 2010 17:22:46 +0530
Subject: [PATCH 21/28] [IMP] account: Improve the search view of
 account.move.line added group by account and partner

bzr revid: psi@tinyerp.co.in-20100827115246-dhypnzu3c1zuakci
---
 addons/account/account_view.xml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index c183a158ab8..4e737a35544 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1071,8 +1071,11 @@
                     <newline/>
                     <group expand="0" string="Group By..." colspan="12" col="10">
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
+                        <filter string="Account"  icon="terp-folder-orange" context="{'group_by':'account_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <separator orientation="vertical"/>
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
-                        <filter string="States" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Extended options...">
@@ -1348,9 +1351,9 @@
             res_model="account.move.line"
             src_model="account.move"/>
 
-	    <record id="account.act_account_move_to_account_move_line_open" model="ir.actions.act_window">
-	        <field eval="[(6,0,[ref('account.group_accounting_accountant')])]" name="groups_id"/>
-	    </record>
+      <record id="account.act_account_move_to_account_move_line_open" model="ir.actions.act_window">
+          <field eval="[(6,0,[ref('account.group_accounting_accountant')])]" name="groups_id"/>
+      </record>
 
         <record id="action_move_line_search" model="ir.actions.act_window">
             <field name="name">Entry Lines</field>

From 632d28830396e311bc8d22d06772bc8aa98dbc2b Mon Sep 17 00:00:00 2001
From: "pap (openerp)" <pap@tinyerp.co.in>
Date: Fri, 27 Aug 2010 17:41:49 +0530
Subject: [PATCH 22/28] [IMP]:added analytic account on bank statement line and
 created analytic lines on confirming bank statement

bzr revid: pap@tinyerp.co.in-20100827121149-kd8o6dypbhc7kimo
---
 addons/account/account_bank_statement.py | 30 +++++++++++++++++++++++-
 addons/account/account_view.xml          |  3 +++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 40193750393..b1c84f0b065 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -201,6 +201,7 @@ class account_bank_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')
         obj_seq = self.pool.get('ir.sequence')
 
@@ -235,6 +236,10 @@ class account_bank_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,
@@ -273,6 +278,7 @@ class account_bank_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,
@@ -294,7 +300,28 @@ class account_bank_statement(osv.osv):
                                 account=acc_cur)
                     val['amount_currency'] = amount_cur
 
-                torec.append(account_move_line_obj.create(cr, uid, val , context=context))
+                move_line_id = account_move_line_obj.create(cr, uid, val , context=context)
+                torec.append(move_line_id)
+
+                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:
@@ -675,6 +702,7 @@ class account_bank_statement_line(osv.osv):
             select=True, required=True, ondelete='cascade'),
         'reconcile_id': fields.many2one('account.bank.statement.reconcile',
             'Reconcile'),
+        'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account'),
         'move_ids': fields.many2many('account.move',
             'account_bank_statement_line_move_rel', 'move_id','statement_id',
             'Moves'),
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 4e737a35544..994b2abb94d 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -520,6 +520,7 @@
                                     <field name="type"/>
                                     <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency)"/>
                                     <field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id"/>
+                                    <field name="analytic_account_id" groups="base.group_extended" />
                                     <field name="amount"/>
                                     <field context="{'partner_id':partner_id,'amount':amount,'account_id':account_id,'currency_id': parent.currency,'journal_id':parent.journal_id, 'date':date}" name="reconcile_id"/>
                                     <field name="ref"/>
@@ -1416,6 +1417,7 @@
                                     <field name="type"/>
                                     <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency)"/>
                                     <field domain="[('journal_id', '=', parent.journal_id)]" name="account_id"/>
+                                    <field name="analytic_account_id" groups="base.group_extended" />
                                     <field name="amount"/>
                                     <field context="{'partner_id': partner_id, 'amount': amount, 'account_id': account_id, 'date':date}" name="reconcile_id"/>
                                 </form>
@@ -2368,6 +2370,7 @@
                                     <field name="type"/>
                                     <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency)"/>
                                     <field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id"/>
+                                    <field name="analytic_account_id" groups="base.group_extended" />
                                     <field name="amount"/>
                                     <field context="{'partner_id':partner_id,'amount':amount,'account_id':account_id,'currency_id': parent.currency,'journal_id':parent.journal_id, 'date':date}" name="reconcile_id"/>
                                     <field name="ref"/>

From 98f76faecb7193c435e4ca7a2585184c34b6ab1f Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Sat, 28 Aug 2010 11:37:25 +0530
Subject: [PATCH 23/28] [IMP] Account : bank statement=> move name as per
 statement name

bzr revid: mra@mra-laptop-20100828060725-n2kqkk60w5r7qg42
---
 addons/account/account_bank_statement.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index b1c84f0b065..32403f658fc 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -399,7 +399,7 @@ class account_bank_statement(osv.osv):
                             account_move_line_obj.reconcile(cr, uid, torec, 'statement', writeoff_acc_id=writeoff_acc_id, writeoff_period_id=st.period_id.id, writeoff_journal_id=st.journal_id.id, context=context)
                     else:
                         account_move_line_obj.reconcile_partial(cr, uid, torec, 'statement', context)
-                move_name = next_number + '/' + str(move.sequence)
+                move_name = next_number + ' - ' + str(move.sequence)
                 account_move_obj.write(cr, uid, [move_id], {'name': move_name, 'state': 'posted'}) # Bank statements will not consider boolean on journal entry_posted
 
             self.log(cr, uid, st.id, 'Statement %s is confirmed and entries are created.' % st.name)

From 8a0d82b6f99041cc3926184f77da0b7e0b1be206 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Sat, 28 Aug 2010 12:10:50 +0530
Subject: [PATCH 24/28] [IMP] Account: accounting/accouning/journal items =>
 now open all move lines [ADD] Account: add a menuitem Accounting / Bank &
 Cash/ Journal Items, that will open the list view of account.move.line with
 domain = journal.type in bank

bzr revid: mra@mra-laptop-20100828064050-pjz38b3zyce51co2
---
 addons/account/account_view.xml                 | 17 +++++++++++++++++
 .../wizard/account_move_journal_view.xml        |  8 ++++----
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 994b2abb94d..c6e24e07842 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1090,6 +1090,23 @@
             </field>
         </record>
 
+        <record id="action_account_moves_all_a" model="ir.actions.act_window">
+            <field name="name">Journal Items</field>
+            <field name="res_model">account.move.line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_account_move_line_filter"/>
+        </record>
+
+        <menuitem
+            action="action_account_moves_all_a"
+            icon="STOCK_JUSTIFY_FILL"
+            id="menu_action_account_moves_all"
+            parent="account.menu_finance_entries"
+            sequence="4"
+            groups="group_account_user,group_account_manager,base.group_system"
+        />
+
         <record id="action_move_line_select" model="ir.actions.act_window">
             <field name="name">Entry Lines</field>
             <field name="res_model">account.move.line</field>
diff --git a/addons/account/wizard/account_move_journal_view.xml b/addons/account/wizard/account_move_journal_view.xml
index 2520b76a129..b43ad18df6e 100644
--- a/addons/account/wizard/account_move_journal_view.xml
+++ b/addons/account/wizard/account_move_journal_view.xml
@@ -57,7 +57,7 @@
 <!--        </record>-->
 <!--        <menuitem action="action_account_moves_sale_refund" sequence="5" id="menu_eaction_account_moves_sale_refund" parent="menu_finance_payables" icon="STOCK_JUSTIFY_FILL"/>-->
 
-        <record id="action_account_moves_all" model="ir.actions.act_window">
+        <record id="action_account_moves_bank" model="ir.actions.act_window">
             <field name="name">Journal Items</field>
             <field name="res_model">account.move.journal</field>
             <field name="view_type">form</field>
@@ -67,10 +67,10 @@
         </record>
 
         <menuitem
-            action="action_account_moves_all"
+            action="action_account_moves_bank"
             icon="STOCK_JUSTIFY_FILL"
-            id="menu_eaction_account_moves_all"
-            parent="account.menu_finance_entries"
+            id="menu_action_account_moves_bank"
+            parent="account.menu_finance_bank_and_cash"
             sequence="4"
             groups="group_account_user,group_account_manager,base.group_system"
         />

From 446655fae0c30fa4474b9cff9f0406032f623028 Mon Sep 17 00:00:00 2001
From: "MRA(OpenERP), MTR(OpenERP)" <>
Date: Sat, 28 Aug 2010 12:22:50 +0530
Subject: [PATCH 25/28] [IMP] Account: don't display the analytic account in
 red if there is no date end defined on it but in black => red should only be
 when there is a date end which is overpassed

bzr revid: mra@mra-laptop-20100828065250-00006o4cx4hceiq4
---
 addons/account/project/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index fb7e41101f7..bf0b186e1ea 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -51,7 +51,7 @@
             <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)" string="Analytic account">
+                <tree toolbar="True" colors="red:(date&lt;current_date);black:(date&gt;=current_date);black:(date==False)" string="Analytic account">
                     <field name="name"/>
                     <field name="code"/>
                     <field name="quantity"/>

From a408fd8234d1e27254be9b5bfdd2483b7ff7f77e Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Sun, 29 Aug 2010 20:31:56 +0530
Subject: [PATCH 26/28] [FIX]: fix small problem of the voucher module

bzr revid: mga@tinyerp.com-20100829150156-8lqcmx0nu5hmxyok
---
 addons/account_voucher/voucher.py                      | 4 ++--
 addons/account_voucher/voucher_sales_purchase_view.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py
index ff8fcc664c1..4cc44433ff8 100644
--- a/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@@ -97,9 +97,9 @@ class account_voucher(osv.osv):
 
         'line_ids':fields.one2many('account.voucher.line','voucher_id','Voucher Lines', readonly=True, states={'draft':[('readonly',False)]}),
         'line_cr_ids':fields.one2many('account.voucher.line','voucher_id','Credits',
-            domain=[('type','=','cr')], context={'default_type':'cr'}),
+            domain=[('type','=','cr')], context={'default_type':'cr'}, readonly=True, states={'draft':[('readonly',False)]}),
         'line_dr_ids':fields.one2many('account.voucher.line','voucher_id','Debits',
-            domain=[('type','=','dr')], context={'default_type':'dr'}),
+            domain=[('type','=','dr')], context={'default_type':'dr'}, readonly=True, states={'draft':[('readonly',False)]}),
         'period_id': fields.many2one('account.period', 'Period', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'narration':fields.text('Narration', readonly=True, states={'draft':[('readonly',False)]}),
         'currency_id': fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)]}),
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 387dd28f77a..f84566255d0 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -17,7 +17,7 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Sales Information">
-                            <field name="line_ids" on_change="onchange_price(line_ids, tax_id, parent.partner_id)" default_get="{'journal_id':journal_id, 'partner_id':partner_id}" colspan="4" nolabel="1" height="180">
+                            <field name="line_cr_ids" on_change="onchange_price(line_cr_ids, tax_id, parent.partner_id)" default_get="{'journal_id':journal_id, 'partner_id':partner_id}" colspan="4" nolabel="1" height="180">
                                 <tree string="Sales Lines" editable="bottom">
                                     <field name="account_id" domain="[('user_type.report_type','=','income'),('type','!=','view')]" widget="selection"/>
                                     <field name="name"/>

From 7bf48185c84d61d6812f68d79ec57ed3b333611f Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Sun, 29 Aug 2010 20:37:18 +0530
Subject: [PATCH 27/28] [FIX]: fix a voucher problem

bzr revid: mga@tinyerp.com-20100829150718-c25aomij4mxlxc08
---
 addons/account_voucher/voucher_sales_purchase_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index f84566255d0..523f72e9f30 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -43,7 +43,7 @@
                                 </group>
                                 <group col="3" colspan="1">
                                     <separator string="Total" colspan="3"/>
-                                    <field name="tax_id" on_change="onchange_price(line_ids, tax_id, partner_id)" widget="selection" domain="[('type_tax_use','in',('sale','all'))]"/><field name="tax_amount" on_change="onchange_price(line_ids, tax_id, partner_id)" nolabel="1"/>
+                                    <field name="tax_id" on_change="onchange_price(line_cr_ids, tax_id, partner_id)" widget="selection" domain="[('type_tax_use','in',('sale','all'))]"/><field name="tax_amount" on_change="onchange_price(line_ids, tax_id, partner_id)" nolabel="1"/>
                                     <label colspan="1" string=""/><field name="amount" string="Total"/>
                                 </group>
                             </group>

From 23ed9c4b4ee2e11a26b9476d553534f14473908b Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Sun, 29 Aug 2010 20:56:24 +0530
Subject: [PATCH 28/28] [FIX]: fix small problem during testing

bzr revid: mga@tinyerp.com-20100829152624-oh0jt2v14b2hhgfm
---
 addons/account_voucher/voucher_payment_receipt_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index ce7f352d251..85e39b4134e 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -56,9 +56,9 @@
                             </group>
                             <group col="2" colspan="1">
                                 <separator string="Other Information" colspan="2"/>
-                                <field name="reference" select="1"/>
                                 <field name="date" select="1" on_change="onchange_date(date)"/>
                                 <field name="currency_id" select="1" attrs="{'readonly':[('type','in',['sale', 'purchase'])]}"/>
+                                <field name="number"/>
                             </group>
                         </page>
                         <page string="Journal Items">