[IMP] account payment : For make payment , method directly called from the account_...

bzr revid: vth@tinyerp.com-20101011123801-x0oqn20p5azfxkxs

diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py
index e4a121f..a70e8fb 100644 (file)
--- a/addons/account_payment/account_payment.py
+++ b/addons/account_payment/account_payment.py
@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import time
 
 from osv import osv, fields
@@ -118,11 +119,10 @@ class payment_order(osv.osv):
                 self.write(cr, uid, order['id'],{'reference':reference})
         return True
 
-    def set_done(self, cr, uid, id, *args):
-        self.write(cr,uid,id,{'date_done': time.strftime('%Y-%m-%d'),
-            'state': 'done',})
+    def set_done(self, cr, uid, ids, *args):
         wf_service = netsvc.LocalService("workflow")
-        wf_service.trg_validate(uid, 'payment.order', id, 'done', cr)
+        self.write(cr, uid, ids, {'date_done': time.strftime('%Y-%m-%d')})
+        wf_service.trg_validate(uid, 'payment.order', ids[0], 'done', cr)
         return True
 
     def copy(self, cr, uid, id, default={}, context=None):
@@ -162,7 +162,6 @@ class payment_line(osv.osv):
     _name = 'payment.line'
     _description = 'Payment Line'
 
-
     def translate(self, orig):
         return {
                 "due_date": "date_maturity",
@@ -337,7 +336,7 @@ class payment_line(osv.osv):
     _defaults = {
         'name': lambda obj, cursor, user, context: obj.pool.get('ir.sequence'
             ).get(cursor, user, 'payment.line'),
-        'state': lambda *args: 'normal',
+        'state': 'normal',
         'currency': _get_currency,
         'company_currency': _get_currency,
         'date': _get_date,
@@ -438,5 +437,4 @@ class payment_line(osv.osv):
 
 payment_line()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index e9238ec..01c8965 100644 (file)
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -142,7 +142,7 @@
                     <group col="4" colspan="2">
                          <button name="cancel" states="draft,open" string="Cancel" icon="gtk-cancel"/>
                          <button name="open" states="draft" string="Confirm Payments"  icon="gtk-apply"/>
-                         <button name="%(action_account_payment_make_payment)d" states="open" string="Make Payments" type="action" icon="gtk-execute"/>
+                         <button name="set_done" states="open" string="Make Payments" type="object" icon="gtk-execute"/>
                          <button name="set_to_draft" states="cancel" string="Set to draft" type="object" icon="gtk-convert"/>
                     </group>
                 </form>
@@ -165,7 +165,7 @@
                     <field name="state"/>
                     <button name="cancel" states="draft,open" string="Cancel" icon="gtk-cancel"/>
                     <button name="open" states="draft" string="Confirm Payments"  icon="gtk-apply"/>
-                    <button name="%(action_account_payment_make_payment)d" states="open" string="Make Payments" type="action" icon="gtk-execute"/>
+                    <button name="set_done" states="open" string="Make Payments"  type ="object" icon="gtk-execute"/>
                 </tree>
             </field>
         </record>
@@ -241,7 +241,6 @@
                              <field name="state"/>
                         </page>
                         <page string="Information">
-
                             <separator colspan="4" string="General Information"/>
                             <group colspan="2">
                                 <field name="amount" select="1"/>

diff --git a/addons/account_payment/account_payment_workflow.xml b/addons/account_payment/account_payment_workflow.xml
index dd7aa2d..06ba7b8 100644 (file)
--- a/addons/account_payment/account_payment_workflow.xml
+++ b/addons/account_payment/account_payment_workflow.xml
@@ -24,6 +24,8 @@ write({'state':'open'})</field>
         <record id="act_done" model="workflow.activity">
             <field name="name">done</field>
             <field name="wkf_id" ref="wkf_payment_order"/>
+            <field name="action">write({'state':'done'})</field>
+            <field name="kind">function</field>
             <field name="flow_stop">True</field>
         </record>
         <record id="act_cancel" model="workflow.activity">
@@ -33,14 +35,14 @@ write({'state':'open'})</field>
             <field name="kind">function</field>
             <field name="flow_stop">True</field>
         </record>
-        
+
         <!-- Transition -->
         <record id="trans_draft_open" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_open"/>
             <field name="signal">open</field>
         </record>
-        
+
         <record id="trans_open_done" model="workflow.transition">
             <field name="act_from" ref="act_open"/>
             <field name="act_to" ref="act_done"/>
@@ -56,6 +58,6 @@ write({'state':'open'})</field>
             <field name="act_to" ref="act_cancel"/>
             <field name="signal">cancel</field>
         </record>
-        
+
     </data>
 </openerp>