From b1991d21d501face1db8383c99ecd9b9ead145e3 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Thu, 24 Jun 2010 01:14:06 +0530
Subject: [PATCH] [IMP]: accounting improvements * account.move *
 account.move.line * account.invoice * account.voucher * bank statement

bzr revid: mga@tinyerp.com-20100623194406-3go72eb7hseiylhb
---
 addons/account/account_bank_statement.py      |  10 +-
 addons/account/account_invoice_view.xml       |   8 +-
 addons/account/account_report.xml             |   2 +-
 addons/account/account_view.xml               | 105 +++++++++++++-----
 .../process/customer_invoice_process.xml      |   8 +-
 .../process/supplier_invoice_process.xml      |   6 +-
 addons/account_voucher/voucher_report.xml     |   4 +-
 addons/account_voucher/voucher_view.xml       |  17 ++-
 8 files changed, 112 insertions(+), 48 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 6de3dabaa28..0e46944a436 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -45,7 +45,7 @@ class account_bank_statement(osv.osv):
             'type': 'ir.actions.act_window',
             'target': 'new',
             'nodestroy': True
-                }
+        }
 
     def _default_journal_id(self, cr, uid, context={}):
         if context.get('journal_id', False):
@@ -556,9 +556,9 @@ account_bank_statement_reconcile_line()
 
 class account_bank_statement_line(osv.osv):
 
-    def onchange_partner_id(self, cursor, user, line_id, partner_id, type, currency_id,
-            context={}):
+    def onchange_partner_id(self, cursor, user, line_id, partner_id, type, currency_id, context={}):
         res = {'value': {}}
+        
         if not partner_id:
             return res
         line = self.browse(cursor, user, line_id)
@@ -591,6 +591,10 @@ class account_bank_statement_line(osv.osv):
             balance = res_currency_obj.compute(cursor, user, company_currency_id,
                 currency_id, balance, context=context)
             res['value']['amount'] = balance
+        
+        if context.get('amount', 0) > 0:
+            res['value']['amount'] = context.get('amount')
+            
         return res
 
     def _reconcile_amount(self, cursor, user, ids, name, args, context=None):
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index bceb1b3c857..fc10c58cc8f 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -349,11 +349,15 @@
                    <group col="10" colspan="4">
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
                         <filter icon="terp-check" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices"/>
+                        <filter icon="terp-check" string="Invoices" domain="[('state','not in',['draft','cancel','cancel'])]" help="Invoices"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-dolar_ok!" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
                         <separator orientation="vertical"/>
                         <field name="number"/>
                         <field name="partner_id"/>
-                        <field name="user_id" default="uid"/>
+                        <field name="user_id" select="1" default="uid" widget="selection" string="Responsible">
+                            <filter domain="[('user_id','=',uid)]" help="Responsible" icon="terp-partner" separator="1"/>
+                        </field>
                         <field name="origin"/>
                         <field name="amount_total"/>
                     </group>
@@ -363,7 +367,7 @@
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Salesman" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
+                        <filter string="Responsible" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Invoice Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date_invoice'}"/>
diff --git a/addons/account/account_report.xml b/addons/account/account_report.xml
index 6480178d1ae..fc622d8f0c0 100644
--- a/addons/account/account_report.xml
+++ b/addons/account/account_report.xml
@@ -34,7 +34,7 @@
             string="Taxes Report"/>
 
         <report id="report_account_voucher_new"
-            string="Voucher"
+            string="Print Voucher"
             model="account.move"
             name="account.move.voucher"
             rml="account/report/voucher_print.rml"
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index b22ce445f53..50ca647d61d 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -333,7 +333,25 @@
             <field name="view_mode">tree,form</field>
         </record>
         <menuitem action="action_account_journal_form" id="menu_action_account_journal_form" parent="account_account_menu"/>
-
+        
+        <record id="view_account_bank_statement_filter" model="ir.ui.view">
+            <field name="name">account.bank.statement.select</field>
+            <field name="model">account.bank.statement</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Statement">
+                   <group col="10" colspan="4">
+                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Statement"/>
+                        <filter icon="terp-check" string="Poster" domain="[('state','=','confirm')]" help="Confirm confirm"/>
+                        <separator orientation="vertical"/>
+                        <field name="name"/>
+                        <field name="date"/>
+                        <field name="journal_id"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+        
         <record id="view_bank_statement_tree" model="ir.ui.view">
             <field name="name">account.bank.statement.tree</field>
             <field name="model">account.bank.statement</field>
@@ -358,19 +376,20 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Statement">
-                    <field name="name" select="1"/>
-                    <field name="date" select="1"/>
-                    <field name="journal_id" on_change="onchange_journal_id(journal_id)" select="1"/>
-                    <field name="currency"/>
-                    <field name="period_id"/>
-                    <group colspan="2" col="3">
-<!--                        <button name="%(action_view_account_statement_from_invoice)d"-->
-<!--                            string="Import Invoice" type="action" attrs="{'invisible':[('state','=','confirm')]}" icon="gtk-open"/>-->
-                        <button name="button_import_invoice" string="Import Invoice" attrs="{'invisible':[('state','=','confirm')]}" type="object" icon="gtk-apply"/>
-                    </group>
-                    <newline/>
-                    <field name="balance_start"/>
+                    <group col="6" colspan="4">
+                        <field name="name" select="1"/>
+                        <field name="date" select="1"/>
+                        <field name="journal_id" on_change="onchange_journal_id(journal_id)" select="1"/>
+<!--                        <field name="currency"/>-->
+                        <field name="period_id"/>
+<!--                        <group colspan="2" col="3">-->
+    <!--                        <button name="%(action_view_account_statement_from_invoice)d"-->
+    <!--                            string="Import Invoice" type="action" attrs="{'invisible':[('state','=','confirm')]}" icon="gtk-open"/>-->
+<!--                            <button name="button_import_invoice" string="Import Invoice" attrs="{'invisible':[('state','=','confirm')]}" type="object" icon="gtk-apply"/>-->
+<!--                        </group>-->
+                        <field name="balance_start"/>
                     <field name="balance_end_real"/>
+                    </group>                    
                     <notebook colspan="4">
                         <page string="Entry encoding">
                             <field colspan="4" name="line_ids" nolabel="1">
@@ -380,7 +399,7 @@
                                     <field name="ref"/>
                                     <field name="name"/>
                                     <field name="type"/>
-                                    <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency)"/>
+                                    <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency, {'amount': amount})"/>
                                     <field domain="[('journal_id','=',parent.journal_id)]" name="account_id"/>
                                     <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"/>
@@ -896,6 +915,7 @@
                     <field name="to_check" groups="base.group_extended"/>
                     <field name="amount"/>
                     <field name="state"/>
+                    <button name="button_validate" states="draft" string="Validate" type="object" icon="terp-camera_test"/>
                 </tree>
             </field>
         </record>
@@ -906,11 +926,12 @@
             <field name="arch" type="xml">
                 <form string="Journal Entries">
                     <group colspan="4" col="6">
-                        <field name="name" select="1" colspan="4" readonly="True"/>
+                        <field name="name" select="1" readonly="True"/>
                         <field name="journal_id" select="1"/>
                         <field name="period_id"/>
                         <field name="type"/>
                         <field name="ref" select="1"/>
+                        <field name="date" select="1"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Journal Entries Lines">
@@ -985,15 +1006,20 @@
             <field name="arch" type="xml">
                 <search string="Search Move">
                     <group col='8' colspan='4'>
-                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Move Lines"/>
-                        <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Move Lines"/>
+                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Entries"/>
+                        <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Entries"/>
                         <separator orientation="vertical"/>
+                        <filter icon="terp-camera_test" string="To Review" domain="[('to_check','=',True)]" groups="base.group_extended" help="To Review"/>
                         <field name="date" select='1'/>
                         <field name="name" select='1'/>
                         <field name="journal_id" select='1'/>
                         <field name="partner_id" select='1'/>
                     </group>
                     <newline/>
+                    <group col="10" colspan="4">
+                        <field name="journal_id" widget="selection" context="{'journal_id':self, 'visible_id':self or 0, 'normal_view':False}"/>
+                        <field name="period_id" widget="selection" context="{'period_id':self}"/>
+                    </group>
                     <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="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
@@ -1023,8 +1049,8 @@
             <field name="domain">[('to_check','=',True)]</field>
         </record>
         <menuitem action="action_move_to_review" id="menu_action_move_to_review" parent="periodical_processing_journal_entries_validation"/>
-        <menuitem id="next_id_29" name="Search Entries" parent="account.menu_finance_entries" sequence="40"/>
-        <menuitem action="action_move_line_form" id="menu_action_move_line_form" parent="next_id_29"/>
+<!--        <menuitem id="next_id_29" name="Search Entries" parent="account.menu_finance_entries" sequence="40"/>-->
+<!--        <menuitem action="action_move_line_form" id="menu_action_move_line_form" parent="next_id_29"/>-->
 
         <record id="action_move_line_form_encode_by_move" model="ir.actions.act_window">
             <field name="name">Journal Vouchers</field>
@@ -1035,7 +1061,7 @@
             <field name="search_view_id" ref="view_account_move_filter"/>
         </record>
 
-        <menuitem action="action_move_line_form_encode_by_move" id="menu_encode_entries_by_move" parent="menu_finance_entries"/>
+<!--        <menuitem action="action_move_line_form_encode_by_move" id="menu_encode_entries_by_move" parent="menu_finance_entries"/>-->
         
         <record id="action_account_moves_sale" model="ir.actions.act_window">
             <field name="name">Journal Items</field>
@@ -1050,13 +1076,14 @@
         <menuitem action="action_account_moves_sale" id="menu_eaction_account_moves_sale" parent="menu_finance_receivables"/>
 
         <record id="action_account_moves_purchase" model="ir.actions.act_window">
-            <field name="name">Transaction Journal</field>
+            <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="view_id" ref="view_move_line_tree"/>
             <field name="search_view_id" ref="view_account_move_line_filter"/>
             <field name="domain">[('journal_id.type', 'in', ['purchase', 'purchase_refund'])]</field>
+            <field name="context">{'journal_id':1}</field>
         </record>
 
         <menuitem action="action_account_moves_purchase" id="menu_eaction_account_moves_purchase" parent="menu_finance_payables"/>
@@ -1104,14 +1131,14 @@
         <menuitem action="action_move_line_search_view3" id="journal_cash_move_lines" parent="menu_finance_bank_and_cash"/>
         <menuitem action="action_move_line_search_view4" id="journal_bank_move_lines" parent="menu_finance_bank_and_cash"/>
 
-        <menuitem action="action_move_line_search" id="menu_action_move_line_search" parent="account.next_id_29"/>
+<!--        <menuitem action="action_move_line_search" id="menu_action_move_line_search" parent="account.next_id_29"/>-->
 
         <menuitem id="menu_finance_charts" name="Charts" parent="account.menu_finance" sequence="4"/>
     <!--    <wizard id="wizard_account_chart" menu="False" model="account.account" name="account.chart" string="Chart of Accounts"/>
         <menuitem icon="STOCK_INDENT" action="wizard_account_chart" id="menu_action_account_tree2" parent="account.menu_finance_charts" type="wizard"/>
  -->
 
-
+        
         <record id="view_bank_statement_reconcile_form" model="ir.ui.view">
             <field name="name">account.bank.statement.reconcile.form</field>
             <field name="model">account.bank.statement</field>
@@ -1119,13 +1146,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Statement">
-                    <field name="name" select="1"/>
-                    <field name="date" select="1"/>
-                    <field name="journal_id" on_change="onchange_journal_id(journal_id)" select="1"/>
-                    <field name="currency"/>
-                    <newline/>
-                    <field name="balance_start"/>
-                    <field name="balance_end_real"/>
+                    <group col="6" colspan="4">
+                        <field name="name" select="1"/>
+                        <field name="date" select="1"/>
+                        <field name="journal_id" on_change="onchange_journal_id(journal_id)" select="1"/>
+                        <field name="currency"/>
+                        <field name="balance_start"/>
+                        <field name="balance_end_real"/>
+                    </group>
                     <notebook colspan="4">
                         <page string="Select entries">
                             <field colspan="4" domain="[('statement_id', '=', False), ('journal_id', '=', journal_id)]" name="move_line_ids" nolabel="1" widget="many2many"/>
@@ -1969,6 +1997,23 @@
             id="menu_action_move_journal_line_form" 
             parent="account.menu_finance_entries" 
             sequence="5"/>
+        
+        <record id="action_account_moves_all" 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="view_id" ref="view_move_line_tree"/>
+            <field name="search_view_id" ref="view_account_move_line_filter"/>
+        </record>
+
+        <menuitem 
+            action="action_account_moves_all" 
+            icon="STOCK_JUSTIFY_FILL" 
+            id="menu_eaction_account_moves_all" 
+            parent="account.menu_finance_entries"
+            sequence="4"
+        />
 
 
     </data>
diff --git a/addons/account/process/customer_invoice_process.xml b/addons/account/process/customer_invoice_process.xml
index fd1b65708b2..c69b8008961 100644
--- a/addons/account/process/customer_invoice_process.xml
+++ b/addons/account/process/customer_invoice_process.xml
@@ -50,7 +50,7 @@
         </record>
     
         <record id="process_node_accountingentries0" model="process.node">
-            <field name="menu_id" ref="account.menu_action_move_line_form"/>
+            <field name="menu_id" ref="account.menu_action_move_journal_line_form"/>
             <field name="model_id" ref="account.model_account_move"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Accounting&quot;&quot;&quot;" name="name"/>
@@ -72,7 +72,7 @@
   		</record>
     
         <record id="process_node_paymententries0" model="process.node">
-            <field name="menu_id" ref="account.menu_action_move_line_form"/>
+            <field name="menu_id" ref="account.menu_action_move_journal_line_form"/>
             <field name="model_id" ref="account.model_account_move_line"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Payment&quot;&quot;&quot;" name="name"/>
@@ -83,7 +83,7 @@
         </record>
     
         <record id="process_node_reconciliation0" model="process.node">
-            <field name="menu_id" ref="account.menu_action_move_line_search"/>
+            <field name="menu_id" ref="account.menu_eaction_account_moves_all"/>
             <field name="model_id" ref="account.model_account_move_reconcile"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Reconciliation&quot;&quot;&quot;" name="name"/>
@@ -105,7 +105,7 @@
         </record>
         
         <record id="process_node_accountingstatemententries0" model="process.node">
-            <field name="menu_id" ref="account.menu_action_move_line_search"/>
+            <field name="menu_id" ref="account.menu_eaction_account_moves_all"/>
             <field name="model_id" ref="account.model_account_move_line"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Bank Statement&quot;&quot;&quot;" name="name"/>
diff --git a/addons/account/process/supplier_invoice_process.xml b/addons/account/process/supplier_invoice_process.xml
index 080cc5cb984..b3ec1676691 100644
--- a/addons/account/process/supplier_invoice_process.xml
+++ b/addons/account/process/supplier_invoice_process.xml
@@ -62,7 +62,7 @@
         </record>
         
         <record id="process_node_supplieraccountingentries0" model="process.node">
-            <field name="menu_id" ref="account.menu_action_move_line_form"/>
+            <field name="menu_id" ref="account.menu_action_move_journal_line_form"/>
             <field name="model_id" ref="account.model_account_move"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Accounting&quot;&quot;&quot;" name="name"/>
@@ -72,7 +72,7 @@
         </record>
         
         <record id="process_node_supplierpaymentorder0" model="process.node">
-            <field name="menu_id" ref="account.menu_action_move_line_search"/>
+            <field name="menu_id" ref="account.menu_eaction_account_moves_all"/>
             <field name="model_id" ref="account.model_account_move_line"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Payment Order&quot;&quot;&quot;" name="name"/>
@@ -83,7 +83,7 @@
         </record>
         
         <record id="process_node_supplierreconciliation0" model="process.node">
-            <field name="menu_id" ref="account.menu_action_move_line_search"/>
+            <field name="menu_id" ref="account.menu_eaction_account_moves_all"/>
             <field name="model_id" ref="account.model_account_move_reconcile"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Reconciliation&quot;&quot;&quot;" name="name"/>
diff --git a/addons/account_voucher/voucher_report.xml b/addons/account_voucher/voucher_report.xml
index c0dfed1c683..f6f721b93ef 100644
--- a/addons/account_voucher/voucher_report.xml
+++ b/addons/account_voucher/voucher_report.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
         <report id="report_account_voucher"
-            string="Vouchers"
+            string="Print Vouchers"
             model="account.voucher"
             name="voucher.cash_receipt.drcr"
             rml="account_voucher/report/report_voucher.rml"
@@ -11,7 +11,7 @@
             menu="True"/>
 
         <report id="report_account_voucher_amt"
-            string="Receipts"
+            string="Print Receipts"
             model="account.voucher"
             name="voucher.cash_amount"
             rml="account_voucher/report/report_voucher_amount.rml"
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index 71d0ca27979..3f4ebd1b160 100644
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -87,9 +87,7 @@
                         <field name="date" select='1'/>
                         <field name="name" select='1'/>
                         <field name="number" select='1'/>
-                        <field name="journal_id" select='1'/>
                         <field name="partner_id" select='1'/>
-                        <field name="period_id" select='1'/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="12" col="10">
@@ -116,6 +114,7 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" eval="view_voucher_tree"/>
             <field name="domain">[('journal_id.type','=','sale')]</field>
+            <field name="search_view_id" ref="view_account_move_filter"/>
         </record>
         <menuitem id="menu_action_receipt_vou_voucher_list"
         action="action_receipt_vou_voucher_list" parent="account.menu_finance_receivables" sequence="12"/>
@@ -128,10 +127,22 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" eval="view_voucher_tree"/>
             <field name="domain">[('journal_id.type','=','purchase')]</field>
+            <field name="search_view_id" ref="view_account_move_filter"/>
         </record>
         <menuitem id="menu_action_pay_vou_voucher_list"
         action="action_pay_vou_voucher_list" parent="account.menu_finance_payables" sequence="12"/>
-
+        
+        <!-- Journal Vouchers -->
+        <record model="ir.actions.act_window" id="action_voucher_list">
+            <field name="name">Journal Vouchers</field>
+            <field name="res_model">account.voucher</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" eval="view_voucher_tree"/>
+            <field name="search_view_id" ref="view_account_move_filter"/>
+        </record>
+        <menuitem action="action_voucher_list" id="menu_encode_entries_by_voucher" parent="account.menu_finance_entries" sequence="6"/>
+        
 <!--        <record model="ir.actions.act_window" id="action_receipt_cashreceipt_voucher_list">-->
 <!--            <field name="name">Cash Receipt</field>-->
 <!--            <field name="res_model">account.voucher</field>-->