[FIX]: add payment wizard on the sales receipt

bzr revid: mga@tinyerp.com-20100901080653-tqtzu9lxndrsamvv

diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py
index 2302abd..780ee8c 100644 (file)
--- a/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@@ -78,7 +78,10 @@ class account_voucher(osv.osv):
         if user.company_id:
             return user.company_id.currency_id.id
         return False
-
+    
+    def _get_partner(self, cr, uid, context={}):
+        return context.get('partner_id', False)
+        
     _name = 'account.voucher'
     _description = 'Accounting Voucher'
     _order = "date desc, id desc"
@@ -133,6 +136,7 @@ class account_voucher(osv.osv):
     }
     _defaults = {
         'period_id': _get_period,
+        'partner_id': _get_partner,
         'journal_id':_get_journal,
         'currency_id': _get_currency,
         'type':_get_type,
@@ -336,7 +340,7 @@ class account_voucher(osv.osv):
                 default['value']['pre_line'] = 1
             elif ttype == 'receipt' and len(default['value']['line_dr_ids']) > 0:
                 default['value']['pre_line'] = 1                
-
+        
         return default
 
     def onchange_date(self, cr, user, ids, date, context={}):

diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 2be19f4..6b5ca6d 100644 (file)
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -1,24 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
     <data>
-        
-        <act_window
-            id="act_pay_voucher"
-            name="Sales Payment"
-            context="{'default_journal_type':'bank', 'default_type':'receipt', 'default_partner_id': partner_id}"
-            view_id="account_open_vouchers_view"
-            res_model="account.voucher"
-            src_model="account.voucher"/>
-<!--        <record id="act_pay_voucher" model="ir.actions.act_window">-->
-<!--            <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'), ('partner_id','=',partner_id)]</field>-->
-<!--            <field name="context">{'default_journal_type':'bank', 'default_type':'receipt', 'default_partner_id': partner_id}</field>-->
-<!--            <field name="view_id" ref="account_open_vouchers_view"/>-->
-<!--            <field name="target">new</field>-->
-<!--        </record>-->
-        
+<!--        <act_window-->
+<!--            id="act_pay_voucher"-->
+<!--            name="Sales Payment"-->
+<!--            context="{'default_journal_type':'bank', 'default_type':'receipt', 'default_partner_id': partner_id}"-->
+<!--            res_model="account.voucher.open"-->
+<!--            src_model="account.voucher"-->
+<!--            target="new"/>-->
+        <record id="act_pay_voucher" model="ir.actions.act_window">
+            <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'), ('partner_id','=',partner_id)]</field>
+            <field name="context">{'journal_type':'bank', 'type':'receipt', 'partner_id': partner_id}</field>
+            <field name="view_id" ref="account_open_vouchers_view"/>
+            <field name="target">new</field>
+        </record>
         <record model="ir.ui.view" id="view_sale_receipt_form">
             <field name="name">account.voucher.sale.form</field>
             <field name="model">account.voucher</field>
@@ -80,7 +78,7 @@
                         <field name="state"/>
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="proforma_voucher" string="Post" states="draft" icon="terp-camera_test"/>
-<!--                        <button name="%(act_pay_voucher)d" type="action" string="Pay"/>-->
+                        <button icon="terp-dolar_ok!" name="%(act_pay_voucher)d" context="{'title':'Sales Payment', 'journal_type':'bank', 'type':'receipt', 'partner_id': partner_id}" type="action" string="Pay" attrs="{'invisible':[('pay_now','=','pay_now')]}"/>
                         <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"/>
                     </group>

diff --git a/addons/account_voucher/wizard/account_voucher_open.py b/addons/account_voucher/wizard/account_voucher_open.py
index 3efffe0..5ba55bf 100644 (file)
--- a/addons/account_voucher/wizard/account_voucher_open.py
+++ b/addons/account_voucher/wizard/account_voucher_open.py
@@ -124,7 +124,7 @@ class account_voucher_open(osv.osv_memory):
         period_id = self._get_period(cr, uid, context)
         
         menu = self.pool.get('ir.ui.menu').browse(cr, uid, context.get('active_id'))
-        name = menu.name
+        name = context.get('title', menu.name)
         
         result = data_pool._get_id(cr, uid, 'account_voucher', 'view_voucher_filter_new')
         res_id = data_pool.browse(cr, uid, result, context=context).res_id
@@ -136,7 +136,7 @@ class account_voucher_open(osv.osv_memory):
             'view_mode': 'tree,graph,form',
             'res_model': 'account.voucher',
             'view_id': False,
-            'context': "{'journal_id': %d, 'search_default_journal_id':%d, 'search_default_period_id':%d}" % (journal_id, journal_id, period_id),
+            'context': "{'journal_id': %d, 'search_default_journal_id':%d, 'search_default_period_id':%d, 'partner_id':%s}" % (journal_id, journal_id, period_id, context.get('partner_id',False)),
             'type': 'ir.actions.act_window',
             'search_view_id': res_id
         }