From d6ae30d2ff5b5823d9f4e563059913cc8e4b0ac0 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Wed, 1 Sep 2010 12:48:02 +0530
Subject: [PATCH] [FIX]: change the order of the menus [FIX]: fix the amount
 allocation for the sales payment, still need to fix the bug in the gtk

bzr revid: mga@tinyerp.com-20100901071802-793pwtmsal093zyy
---
 addons/account/account_view.xml                         | 4 ++--
 addons/account/wizard/account_move_journal_view.xml     | 7 ++++---
 addons/account_voucher/voucher.py                       | 3 ++-
 addons/account_voucher/voucher_payment_receipt_view.xml | 4 ++--
 addons/account_voucher/voucher_sales_purchase_view.xml  | 4 ++--
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index e35b9498b3f..fcda375091f 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1098,7 +1098,7 @@
             icon="STOCK_JUSTIFY_FILL"
             id="menu_action_account_moves_all"
             parent="account.menu_finance_entries"
-            sequence="4"
+            sequence="16"
             groups="group_account_user,group_account_manager,base.group_system"
         />
 
@@ -1458,7 +1458,7 @@
             id="action_account_manual_reconcile" name="Journal Items"
             res_model="account.move.line"
             view_id="view_move_line_tree"/>
-            />
+        
 
         <menuitem
                 name="Manual Reconcilication" icon="STOCK_EXECUTE"
diff --git a/addons/account/wizard/account_move_journal_view.xml b/addons/account/wizard/account_move_journal_view.xml
index b43ad18df6e..e2541d6d73d 100644
--- a/addons/account/wizard/account_move_journal_view.xml
+++ b/addons/account/wizard/account_move_journal_view.xml
@@ -21,7 +21,7 @@
             <field name="context">{'journal_type':'sale','view_mode':False}</field>
             <field name="target">new</field>
         </record>
-        <menuitem action="action_account_moves_sale" sequence="10" id="menu_eaction_account_moves_sale" parent="menu_finance_receivables" icon="STOCK_JUSTIFY_FILL" groups="group_account_user,group_account_manager,base.group_system"/>
+        <menuitem action="action_account_moves_sale" sequence="16" id="menu_eaction_account_moves_sale" parent="menu_finance_receivables" icon="STOCK_JUSTIFY_FILL" groups="group_account_user,group_account_manager,base.group_system"/>
 
 <!--        <record id="action_account_moves_purchase_refund" model="ir.actions.act_window">-->
 <!--            <field name="name">Journal Refund Items</field>-->
@@ -41,10 +41,11 @@
             <field name="context">{'journal_type':'purchase','view_mode':False}</field>
             <field name="target">new</field>
         </record>
-        <menuitem action="action_account_moves_purchase" sequence="10"
+        <menuitem action="action_account_moves_purchase"
             id="menu_eaction_account_moves_purchase"
             parent="menu_finance_payables"
             icon="STOCK_JUSTIFY_FILL"
+            sequence="16"
             groups="group_account_user,group_account_manager,base.group_system"/>
 
 <!--        <record id="action_account_moves_sale_refund" model="ir.actions.act_window">-->
@@ -71,7 +72,7 @@
             icon="STOCK_JUSTIFY_FILL"
             id="menu_action_account_moves_bank"
             parent="account.menu_finance_bank_and_cash"
-            sequence="4"
+            sequence="16"
             groups="group_account_user,group_account_manager,base.group_system"
         />
     </data>
diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py
index 4b1e48d15eb..2302abd89a0 100644
--- a/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@@ -188,7 +188,7 @@ class account_voucher(osv.osv):
             
             self.write(cr, uid, [voucher.id], {'amount':total, 'tax_amount':total_tax})
         return True
-            
+    
     # TODO: review this code.
     def onchange_price(self, cr, uid, ids, line_ids, tax_id, partner_id=False, context={}):
         tax_pool = self.pool.get('account.tax')
@@ -297,6 +297,7 @@ class account_voucher(osv.osv):
             account_type = 'receivable'
             
         ids = move_line_pool.search(cr, uid, [('account_id.type','=', account_type), ('reconcile_id','=', False), ('partner_id','=',partner_id)], context=context)
+        ids.reverse()
         moves = move_line_pool.browse(cr, uid, ids)
         total_credit = price or 0.0
         total_debit = 0.0
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index dfeeb78ec17..6f207f2b649 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -94,7 +94,7 @@
             <field name="view_id" ref="account_open_vouchers_view"/>
             <field name="target">new</field>
         </record>
-        <menuitem action="action_vendor_payment" icon="STOCK_JUSTIFY_FILL" sequence="16"
+        <menuitem action="action_vendor_payment" icon="STOCK_JUSTIFY_FILL" sequence="12"
             id="menu_action_vendor_payment"  parent="account.menu_finance_payables"/>
 
         <record model="ir.ui.view" id="view_vendor_receipt_form">
@@ -188,7 +188,7 @@
             <field name="view_id" ref="account_open_vouchers_view"/>
             <field name="target">new</field>
         </record>
-        <menuitem action="action_vendor_receipt" icon="STOCK_JUSTIFY_FILL" sequence="16"
+        <menuitem action="action_vendor_receipt" icon="STOCK_JUSTIFY_FILL" sequence="12"
             id="menu_action_vendor_receipt"  parent="account.menu_finance_receivables"/>
     </data>
 </openerp>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index e109865be72..2be19f47f11 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -99,7 +99,7 @@
             <field name="target">new</field>
         </record>
         <menuitem id="menu_action_sale_receipt" icon="STOCK_JUSTIFY_FILL"
-        action="action_sale_receipt" parent="account.menu_finance_receivables" sequence="14"/>
+        action="action_sale_receipt" parent="account.menu_finance_receivables" sequence="10"/>
         
         <!--  Purchase Vouchers -->
         <record model="ir.ui.view" id="view_purchase_receipt_form">
@@ -176,7 +176,7 @@
             <field name="target">new</field>
         </record>
         <menuitem id="menu_action_purchase_receipt" icon="STOCK_JUSTIFY_FILL" 
-        action="action_purchase_receipt" parent="account.menu_finance_payables" sequence="14"/>        
+        action="action_purchase_receipt" parent="account.menu_finance_payables" sequence="10"/>        
         
     </data>
 </openerp>