odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

Improvements 

bzr revid: fp@tinyerp.com-e1eabd16140dfd8fe828d58b003868c9ded36021
This commit is contained in:
Fabien Pinckaers 2008-07-01 16:09:07 +00:00
parent 75f9e53b97
commit 401c130f5c
5 changed files with 16 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/account/__terp__.py
View File

@ -68,9 +68,9 @@
"project/project_security.xml",
"account_assert_test.xml",
],
# "translations" : {
# "fr": "i18n/french_fr.csv"
# },
"translations" : {
"fr": "i18n/french_fr.csv"
},
"active": False,
"installable": True
}

39
addons/custom/corporate_rml_header.rml
View File

@ -1,39 +0,0 @@
<header>
<pageTemplate>
<frame id="first" x1="1cm" y1="2.5cm" width="19.0cm" height="23.0cm"/>
<pageGraphics>
<!-- You Logo - Change X,Y,Width and Height -->
<image x="1.5cm" y="26cm" height="80.0" width="110.0">[[company.logo]]</image>
<setFont name="Helvetica" size="30"/>
<fill color="black"/>
<stroke color="black"/>
<!--drawString x="1cm" y="27.8cm">[[ company.partner_id.name ]]</drawString-->
<lines>1cm 27.7cm 20cm 27.7cm</lines>
<setFont name="Helvetica" size="10"/>
<drawRightString x="20cm" y="27.8cm">[[ company.rml_header1 ]]</drawRightString>
<drawString x="1cm" y="27.2cm">[[ company.partner_id.name ]]</drawString>
<drawString x="1cm" y="26.8cm">[[ company.partner_id.address and company.partner_id.address[0].street ]]</drawString>
<drawString x="1cm" y="26.4cm">[[ company.partner_id.address and company.partner_id.address[0].zip ]] [[ company.partner_id.address and company.partner_id.address[0].city ]] - [[ company.partner_id.address and company.partner_id.address[0].country_id and company.partner_id.address[0].country_id.name ]]</drawString>
<drawString x="1cm" y="26.0cm">Phone:</drawString>
<drawRightString x="7cm" y="26.0cm">[[ company.partner_id.address and company.partner_id.address[0].phone ]]</drawRightString>
<drawString x="1cm" y="25.6cm">Mail:</drawString>
<drawRightString x="7cm" y="25.6cm">[[ company.partner_id.address and company.partner_id.address[0].email ]]</drawRightString>
<lines>1cm 25.5cm 7cm 25.5cm</lines>
<!--page bottom-->
<lines>1.5cm 2.15cm 19.9cm 2.15cm</lines>
<drawCentredString x="10.5cm" y="1.7cm">[[ company.rml_footer1 ]]</drawCentredString>
<drawCentredString x="10.5cm" y="1.25cm">[[ company.rml_footer2 ]]</drawCentredString>
<drawCentredString x="10.5cm" y="0.8cm">Contact : [[ user.name ]]</drawCentredString>
</pageGraphics>
</pageTemplate>
</header>

4
addons/hr/hr.py
View File

@ -34,10 +34,10 @@ from osv import fields, osv
class hr_timesheet_group(osv.osv):
_name = "hr.timesheet.group"
_description = "Timesheet"
_description = "Working Time"
_columns = {
'name' : fields.char("Group name", size=64, required=True),
'timesheet_id' : fields.one2many('hr.timesheet', 'tgroup_id', 'Timesheet'),
'timesheet_id' : fields.one2many('hr.timesheet', 'tgroup_id', 'Working Time'),
'manager' : fields.many2one('res.users', 'Workgroup manager'),
}
#

18
addons/hr/hr_view.xml
View File

@ -141,7 +141,7 @@
<!--
============
Timesheets
Working Time
============
-->
<record id="create_group" model="ir.ui.view">
@ -149,18 +149,16 @@
<field name="model">hr.timesheet.group</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Timesheet category">
<form string="Working Time Category">
<field name="name" select="1"/>
<field name="manager" select="1"/>
<newline/>
<separator colspan="4" string="Timesheets"/>
<newline/>
<field colspan="4" name="timesheet_id" nolabel="1" widget="one2many_list"/>
</form>
</field>
</record>
<record id="edit_workgroup" model="ir.actions.act_window">
<field name="name">Timesheet Categories</field>
<field name="name">Working Time Categories</field>
<field name="res_model">hr.timesheet.group</field>
<field name="view_type">form</field>
<field name="view_id" ref="create_group"/>
@ -172,7 +170,7 @@
<field name="model">hr.timesheet</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Timesheet">
<tree string="Working Time">
<field name="name"/>
<field name="dayofweek"/>
<field name="hour_from"/>
@ -185,7 +183,7 @@
<field name="model">hr.timesheet</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Timesheet">
<form string="Working Time">
<field colspan="4" name="name" select="1"/>
<field name="date_from"/>
<field name="dayofweek" select="1"/>
@ -260,7 +258,7 @@
<field name="name">Categories of Employee</field>
<field name="res_model">hr.employee.category</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem action="open_view_categ_form" groups="base.group_admin" id="menu_view_employee_category_form" parent="hr.menu_hr_configuration"/>
@ -342,7 +340,7 @@
</field>
</record>
<record id="open_ask_holidays" model="ir.actions.act_window">
<field name="name">Vacation Request</field>
<field name="name">Vacation Requests</field>
<field name="res_model">hr.holidays</field>
<field name="view_type">form</field>
<field name="view_id" ref="view_holiday"/>
@ -414,4 +412,4 @@
<menuitem action="open_view_attendance_reason" groups="base.group_admin" id="menu_open_view_attendance_reason" parent="hr.menu_hr_configuration"/>
</data>
</terp>
</terp>

6
addons/product/product_view.xml
View File

@ -116,7 +116,7 @@
<field name="view_id" ref="product_product_tree_view"/>
</record>
<menuitem action="product_normal_action" id="menu_products" parent="product.menu_main_product"/>
<menuitem action="product_normal_action" id="menu_products" parent="product.menu_main_product" sequence="18"/>
<record id="product_category_form_view" model="ir.ui.view">
<field name="name">product.category.form</field>
@ -152,7 +152,7 @@
<field name="view_type">tree</field>
<field name="view_id" ref="product_category_tree_view"/>
</record>
<menuitem action="product_category_action" id="menu_product_category_action" parent="product.menu_main_product"/>
<menuitem action="product_category_action" id="menu_product_category_action" parent="product.menu_main_product" sequence="16"/>
<record id="product_category_action_form" model="ir.actions.act_window">
<field name="name">Products Categories</field>
@ -450,4 +450,4 @@
</data>
</terp>
</terp>