[FIX]: improvement in hr_payroll and account recurring wizard

bzr revid: mga@tinyerp.com-20100722121342-4kx7jv06zonmv5g2

addons/account/wizard/account_use_model_view.xml

@@ -10,7 +10,8 @@
             <form string="Create Entries From Models">
                 <group height="240" width="510">
                     <separator string="This wizard will create recurring accounting entries" colspan="4"/>
-                    <field name="model"/>
+                    <label string="Select recurring to create a manualy recurring accounting entries" width="400"/>
+                    <field name="model" colspan="4" nolabel="1"/>
                     <separator colspan="4"/>
                     <group colspan="4" col="2">
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>

addons/hr_payroll/__init__.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #-*- coding:utf-8 -*-
 ##############################################################################
 #
@@ -25,4 +24,4 @@ import hr_payroll
 import report
 import wizard
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/hr_payroll/__openerp__.py

@@ -53,13 +53,11 @@
         'wizard/hr_payroll_create_analytic.xml',
         'wizard/hr_payroll_employees_detail.xml',
         'wizard/hr_payroll_year_salary.xml',
-
     ],
     'test': [
-             'test/payslip.yml',
-             'test/payment_advice.yml',
-             'test/payroll_register.yml',
- 
+         'test/payslip.yml',
+         'test/payment_advice.yml',
+         'test/payroll_register.yml',
     ],
     'demo_xml': [
         'hr_payroll_demo.xml'

addons/hr_payroll/hr_payroll.py

@@ -1145,27 +1145,6 @@ class hr_payslip_line(osv.osv):
     _name = 'hr.payslip.line'
     _description = 'Payslip Line'
 
-#    def _calculate(self, cr, uid, ids, field_names, arg, context):
-#        res = {}
-#        obj = {}
-#        for line in self.browse(cr, uid, ids, context):
-#            obj['basic'] = line.slip_id.basic
-#            amount = 0.0
-#
-#            if line.amount_type == 'per' and line.base:
-#                print 'XXXXXXXXXXXXXXXX : ', obj
-#                amount = line.amount * eval(line.base, obj)
-#            elif line.amount_type in ('fix', 'func'):
-#                amount = line.amount
-
-#            cd = line.category_id.code.lower()
-#            obj[cd] = amount
-#            print 'XXXXXXXXXXXXXXXXXX : ', cd
-#
-#            res[line.id] = amount
-#        print 'XXXXXXXXXXXX : ', obj
-#        return res
-
     def onchange_category(self, cr, uid, ids, category_id):
         seq = 0
         res = {

addons/hr_payroll/hr_payroll_wizard.xml

@@ -25,16 +25,5 @@
             parent="menu_hr_payroll_reporting" 
             name="Employee Salary Statement"
             type="wizard"/>
-
-<!--        <wizard id="wizard_payroll_analysis"-->
-<!--            menu="False" -->
-<!--            model="account.analytic.account" -->
-<!--            name="payroll.analysis" -->
-<!--            string="Create Analytic Structure"/>-->
-<!--        <menuitem  id="menu_wizard_payroll_analysis" -->
-<!--            action="wizard_payroll_analysis" -->
-<!--            parent="payroll_configure" -->
-<!--            name="Create Analytic Structure"-->
-<!--            type="wizard"/>-->
     </data>
 </openerp>