← Back to branch summary

~jgrandguillaume-c2c/openobject-addons/multi-company-cost-price

« back to all changes in this revision

Viewing changes to hr_contract/hr_contract_view.xml

  • Committer: Joël Grand-Guillaume
  • Date: 2010-04-08 09:00:10 UTC
  • mfrom: (2533.3.664)
  • Revision ID: joel.grandguillaume@camptocamp.com-20100408090010-c0pqjan341s18bxs
[MRG] Merge from last trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
hr_contract/hr_contract_view.xml
7
7
            <field name="model">hr.contract.wage.type.period</field>
8
8
            <field name="type">form</field>
9
9
            <field name="arch" type="xml">
10
 
                <form string="Wage period">
 
10
                <form string="Wage Period">
11
11
                    <field colspan="4" name="name"/>
12
12
                    <field name="factor_days"/>
13
13
                </form>
14
14
            </field>
15
15
        </record>
16
16
 
17
 
 
18
 
        <record id="hr_hr_employee_marital_status_form" model="ir.ui.view">
19
 
            <field name="name">hr.hr.employee.marital.status</field>
20
 
            <field name="model">hr.employee.marital.status</field>
21
 
            <field name="type">form</field>
22
 
            <field name="arch" type="xml">
23
 
                <form string="Marital Status">
24
 
                    <field colspan="4" name="name" nolabel="1" select="1"/>
25
 
                    <field colspan="4" name="description" nolabel="1"/>
26
 
                </form>
27
 
            </field>
28
 
        </record>
29
 
 
30
17
        <record id="hr_contract_wage_type_view_form" model="ir.ui.view">
31
18
            <field name="name">hr.contract.wage.type.view.form</field>
32
19
            <field name="model">hr.contract.wage.type</field>
70
57
            <field name="res_model">hr.contract.wage.type.period</field>
71
58
            <field name="view_type">form</field>
72
59
        </record>
73
 
        <menuitem 
74
 
                action="action_hr_contract_wage_type_period" 
75
 
                id="hr_menu_contract_wage_type_period" 
 
60
        <menuitem
 
61
                action="action_hr_contract_wage_type_period"
 
62
                id="hr_menu_contract_wage_type_period"
76
63
                parent="hr_contract.next_id_56"/>
77
64
 
78
65
 
86
73
                        <field colspan="4" name="contract_ids" nolabel="1">
87
74
                            <tree string="Contracts">
88
75
                                <field name="name"/>
89
 
                                <field name="function"/>
 
76
                                <field name="job_id"/>
90
77
                                <field name="date_start"/>
91
78
                                <field name="date_end"/>
92
 
                                <field name="working_hours_per_day_id"/>
 
79
                                <field name="working_hours"/>
93
80
                                <field name="wage_type_id"/>
94
81
                                <field name="wage"/>
95
82
                            </tree>
96
 
 
97
83
                            <form string="Contract">
98
 
                                <separator colspan="4" string="Generalities"/>
99
 
                                <field colspan="4" name="name" select="1"/>
100
 
                                <newline/>
101
 
                                <separator colspan="4" string="Contract Duration"/>
102
 
                                <field name="function"/>
103
 
                                <field name="working_hours_per_day_id"/>
104
 
                                <field name="date_start" select="1"/>
105
 
                                <field name="date_end" select="1"/>
106
 
 
107
 
                                <separator colspan="4" string="Salary"/>
108
 
                                <field name="wage_type_id"/>
109
 
                                <field name="wage"/>
110
 
 
111
 
                                <separator colspan="4" string="Notes"/>
112
 
                                <field colspan="4" name="notes" nolabel="1"/>
 
84
                                <group colspan="3" col="6">
 
85
                                    <field name="name" select="1"/>
 
86
                                    <field name="job_id"/>
 
87
                                    <newline/>
 
88
                                    <field name="wage"/>
 
89
                                    <field name="wage_type_id" widget="selection"/>
 
90
                                    <field name="type_id" widget="selection"/>
 
91
                                </group>
 
92
                                <notebook>
 
93
                                <page string="Main Data">
 
94
                                    <group col="2" colspan="2">
 
95
                                        <separator colspan="2" string="Duration"/>
 
96
                                        <field name="date_start" select="1"/>
 
97
                                        <field name="date_end" select="1"/>
 
98
                                        <field name="working_hours"/>
 
99
                                    </group>
 
100
                                    <group col="2" colspan="2">
 
101
                                        <separator colspan="2" string="Advantages"/>
 
102
                                        <field name="advantages_net"/>
 
103
                                        <field name="advantages_gross"/>
 
104
                                        <field name="advantages" nolabel="1" colspan="2"/>
 
105
                                    </group>
 
106
                                    <separator colspan="4" string="Notes"/>
 
107
                                    <field colspan="4" name="notes" nolabel="1"/>
 
108
                                </page>
 
109
                                </notebook>
113
110
                            </form>
114
111
                        </field>
115
112
                    </page>
116
113
                    <page string="Miscelleanous">
117
 
                        <field name="manager" select="1"/>
118
 
                        <field name="medic_exam" select="1"/>
119
 
                        <field name="audiens_num"/>
120
 
                        <field name="place_of_birth"/>
121
 
                        <field name="marital_status"/>
122
 
                        <field name="children"/>
 
114
                        <group colspan="2" col="2">
 
115
                            <separator string="Personal Info" colspan="2"/>
 
116
                            <field name="bank_account"/>
 
117
                            <field name="place_of_birth"/>
 
118
                            <field name="children"/>
 
119
                        </group>
 
120
                        <group colspan="2" col="2">
 
121
                            <separator string="Job Info" colspan="2"/>
 
122
                            <field name="manager" select="1"/>
 
123
                            <field name="vehicle" select="1"/>
 
124
                            <field name="vehicle_distance" select="1"/>
 
125
                            <field name="medic_exam" select="1"/>
 
126
                        </group>
 
127
                        <group colspan="2" col="2">
 
128
                            <separator string="Others Info" colspan="2"/>
 
129
                            <field name="medic_exam" select="1"/>
 
130
                        </group>
123
131
                    </page>
124
132
                </notebook>
125
133
            </field>
137
145
            </field>
138
146
        </record>
139
147
 
140
 
        <record id="action_hr_marital_status" model="ir.actions.act_window">
141
 
            <field name="name">Marital Status</field>
142
 
            <field name="res_model">hr.employee.marital.status</field>
143
 
            <field name="view_type">form</field>
144
 
            <field name="view_mode">tree,form</field>
145
 
        </record>
146
 
 
147
 
        <menuitem 
148
 
                action="action_hr_marital_status" 
149
 
                id="hr_menu_marital_status" 
150
 
                parent="hr.menu_view_employee_category_configuration_form" sequence="3"/>
151
 
 
152
148
        <record id="hr_contract_view_form" model="ir.ui.view">
153
149
            <field name="name">hr.contract.view.form</field>
154
150
            <field name="model">hr.contract</field>
155
151
            <field name="type">form</field>
156
152
            <field name="arch" type="xml">
157
153
                <form string="Contract">
158
 
                    <separator colspan="4" string="Generalities"/>
159
 
                    <field name="name" select="1"/>
160
 
                    <field name="employee_id" select="1"/>
161
 
                    <field name="function"/>
162
 
                    <newline/>
163
 
 
164
 
                    <separator colspan="4" string="Contract Duration"/>
165
 
                    <field name="date_start" select="1"/>
166
 
                    <field name="date_end" select="1"/>
167
 
                    <field name="working_hours_per_day_id"/>
168
 
                    <newline/>
169
 
 
170
 
                    <separator colspan="4" string="Remuneration"/>
171
 
                    <field name="wage_type_id"/>
172
 
                    <field name="wage"/>
173
 
                    <separator colspan="4" string="Notes"/>
174
 
                    <field colspan="4" name="notes" nolabel="1"/>
 
154
                    <group colspan="3" col="6">
 
155
                        <field name="name" select="1"/>
 
156
                        <field name="employee_id" select="1"/>
 
157
                        <field name="job_id"/>
 
158
                        <field name="wage"/>
 
159
                        <field name="wage_type_id" widget="selection"/>
 
160
                        <field name="type_id" widget="selection"/>
 
161
                    </group>
 
162
                    <notebook>
 
163
                    <page string="Main Data">
 
164
                        <group col="2" colspan="2">
 
165
                            <separator colspan="2" string="Duration"/>
 
166
                            <field name="date_start" select="1"/>
 
167
                            <field name="date_end" select="1"/>
 
168
                            <field name="working_hours"/>
 
169
                        </group>
 
170
                        <group col="2" colspan="2">
 
171
                            <separator colspan="2" string="Advantages"/>
 
172
                            <field name="advantages_net"/>
 
173
                            <field name="advantages_gross"/>
 
174
                            <field name="advantages" nolabel="1" colspan="2"/>
 
175
                        </group>
 
176
                        <separator colspan="4" string="Notes"/>
 
177
                        <field colspan="4" name="notes" nolabel="1"/>
 
178
                    </page>
 
179
                    </notebook>
175
180
                </form>
176
181
            </field>
177
182
        </record>
195
200
                <tree string="Contracts">
196
201
                    <field name="name"/>
197
202
                    <field name="employee_id"/>
198
 
                    <field name="function"/>
 
203
                    <field name="job_id"/>
 
204
                    <field name="department_id"/>
199
205
                    <field name="date_start"/>
200
206
                    <field name="date_end"/>
201
 
                    <field name="working_hours_per_day_id"/>
 
207
                    <field name="working_hours"/>
202
208
                    <field name="wage_type_id"/>
203
209
                    <field name="wage"/>
204
210
                </tree>
214
220
        </record>
215
221
 
216
222
 
217
 
     <!--   <menuitem name="Contract" id="menu_hr_contract" parent="hr.menu_hr_human_resources"/>-->
218
 
     <!--   <menuitem action="action_hr_contract" id="hr_menu_contract" parent="menu_hr_contract"/>-->
219
 
     <menuitem  id="hr_menu_contract_main" parent="hr.menu_hr_root" name="Contracts" sequence="3"/>
220
 
      <menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr_menu_contract_main" name="Contracts"/>
 
223
        <menuitem  id="hr_menu_contract_main" parent="hr.menu_hr_root" name="Contracts" sequence="3"/>
 
224
        <menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr_menu_contract_main" name="Contracts"/>
221
225
    </data>
222
226
</openerp>