[MERGE] payroll: fixed error in schema of hr_contract

bzr revid: qdp-launchpad@openerp.com-20110711103326-rti0sjuex2a6mcmq

addons/hr_payroll/hr_payroll.py

@@ -119,7 +119,7 @@ class hr_contract(osv.osv):
     _inherit = 'hr.contract'
     _description = 'Employee Contract'
     _columns = {
-        'struct_id': fields.many2one('hr.payroll.structure', 'Salary Structure', required=True),
+        'struct_id': fields.many2one('hr.payroll.structure', 'Salary Structure'),
         'schedule_pay': fields.selection([
             ('monthly', 'Monthly'),
             ('quarterly', 'Quarterly'),

addons/hr_payroll/hr_payroll_view.xml

@@ -45,7 +45,7 @@
             <field name="arch" type="xml">
             <data>
                 <xpath expr="/form/notebook/page/group/field[@name='advantages']" position="before">
-                    <field name="struct_id" select="1"/>
+                    <field name="struct_id" required="1"/>
                 </xpath>
                  <xpath expr="/form/notebook/page/group/field[@name='working_hours']" position="after">
                     <field name="schedule_pay"/>