hda@tinyerp.com
parent
b4565f6c94
commit
5fc0b87896
|
|
@ -37,7 +37,7 @@ class wizard_account_chart(wizard.interface):
|
|||
<field name="fiscalyear"/>
|
||||
<field name="target_move"/>
|
||||
</form>'''
|
||||
|
||||
|
||||
_account_chart_fields = {
|
||||
'fiscalyear': {
|
||||
'string': 'Fiscal year',
|
||||
|
|
@ -46,10 +46,10 @@ class wizard_account_chart(wizard.interface):
|
|||
'help': 'Keep empty for all open fiscal year',
|
||||
},
|
||||
'target_move': {
|
||||
'string': 'Target Moves',
|
||||
'type': 'selection',
|
||||
'selection': [('all','All Entries'),('posted_only','All Posted Entries')],
|
||||
'required': True,
|
||||
'string': 'Target Moves',
|
||||
'type': 'selection',
|
||||
'selection': [('all','All Entries'),('posted_only','All Posted Entries')],
|
||||
'required': True,
|
||||
'default': lambda *a:"all",
|
||||
},
|
||||
}
|
||||
|
|
@ -68,6 +68,7 @@ class wizard_account_chart(wizard.interface):
|
|||
id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
|
||||
result = act_obj.read(cr, uid, [id])[0]
|
||||
result['context'] = str({'fiscalyear': data['form']['fiscalyear'],'target_move':data['form']['target_move']})
|
||||
result['name']+=':'+pooler.get_pool(cr.dbname).get('account.fiscalyear').read(cr,uid,[data['form']['fiscalyear']])[0]['code']
|
||||
return result
|
||||
|
||||
states = {
|
||||
|
|
|
|||
|
|
@ -300,7 +300,7 @@
|
|||
<field name="obj_num">2</field>
|
||||
<field name="obj_price">1500.00</field>
|
||||
<field name="bord_vnd_id" ref="auction_deposit_1" />
|
||||
<!--field name="product_id" ref="monproduit"/--> |
|
||||
<!--field name="product_id" ref="monproduit"/-->
|
||||
<field name="author_right" ref="auction_tax"/>
|
||||
<field name="product_id" model="product.product" search="[]"/>
|
||||
<!--<field name="tva" model="account.tax" search="[]"/>-->
|
||||
|
|
@ -317,7 +317,7 @@
|
|||
<field name="obj_num">4</field>
|
||||
<field name="obj_price">0.00</field>
|
||||
<field name="bord_vnd_id" ref="auction_deposit_2" />
|
||||
<!--field name="product_id" ref="monproduit"/--> | |
|
||||
<!--field name="product_id" ref="monproduit"/-->
|
||||
<field name="author_right" ref="auction_tax"/>
|
||||
<field name="product_id" model="product.product" search="[]"/>
|
||||
<!--<field name="tva" model="account.tax" search="[]"/>-->
|
||||
|
|
@ -334,7 +334,7 @@
|
|||
<field name="obj_num">4</field>
|
||||
<field name="obj_price">375</field>
|
||||
<field name="bord_vnd_id" ref="auction_deposit_2" />
|
||||
<!--field name="product_id" ref="monproduit"/--> | |
|
||||
<!--field name="product_id" ref="monproduit"/-->
|
||||
<field name="author_right" ref="auction_tax"/>
|
||||
<field name="product_id" model="product.product" search="[]"/>
|
||||
<!--<field name="tva" model="account.tax" search="[]"/>-->
|
||||
|
|
@ -782,11 +782,11 @@
|
|||
<!--demo data for the hr_employee-->
|
||||
|
||||
<record model="hr.employee" id="employee2">
|
||||
<field name="name">pritesh</field>
|
||||
<field name="regime">45</field>
|
||||
<field name="name">Demo</field>
|
||||
<!-- <field name="regime">45</field>-->
|
||||
<field name="user_id" search="[('login','=','admin')]" model="res.users"/>
|
||||
<field name="holiday_max">25</field>
|
||||
<field name="workgroups" ref="timesheet_group1" />
|
||||
<!-- <field name="holiday_max">25</field>
|
||||
<field name="workgroups" ref="timesheet_group1" />-->
|
||||
</record>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
"website" : "http://tinyerp.com/",
|
||||
"description": """Human Ressources: Holidays tracking and workflow
|
||||
|
||||
This module allows you to manage holidays and holidays requests. For each employee, you can also define a number of available holidays per holiday status.
|
||||
This module allows you to manage holidays and holidays requests. For each employee, you can also define a number of available holidays per holiday status.
|
||||
|
||||
Note that:
|
||||
- A synchronisation with an internal agenda (use of the crm module) is possible: in order to automaticly create a case when an holiday request is accepted, you have to link the holidays status to a case section. You can set up this info and your color preferencies in
|
||||
|
|
@ -26,7 +26,8 @@
|
|||
""",
|
||||
"depends" : ["hr","crm_configuration"],
|
||||
"init_xml" : [],
|
||||
"demo_xml" : ["hr_bel_holidays_2008.xml",],
|
||||
# "demo_xml" : ["hr_bel_holidays_2008.xml",],
|
||||
"demo_xml" : [],
|
||||
"update_xml" : ["hr_workflow.xml","hr_view.xml","hr_holidays_report.xml","hr_holidays_wizard.xml",],
|
||||
"active": False,
|
||||
"installable": True
|
||||
|
|
|
|||
|
|
@ -46,9 +46,23 @@ def strToDate(dt):
|
|||
dt_date=datetime.date(int(dt[0:4]),int(dt[5:7]),int(dt[8:10]))
|
||||
return dt_date
|
||||
|
||||
class hr_holidays_status(osv.osv):
|
||||
_name = "hr.holidays.status"
|
||||
# _inherit = 'hr.holidays.status'
|
||||
_description = "Holidays Status"
|
||||
_columns = {
|
||||
'name' : fields.char('Holiday Status', size=64, required=True, translate=True),
|
||||
'section_id': fields.many2one('crm.case.section', 'Section'),
|
||||
'color_name' : fields.selection([('red', 'Red'), ('lightgreen', 'Light Green'), ('lightblue','Light Blue'), ('lightyellow', 'Light Yellow'), ('magenta', 'Magenta'),('lightcyan', 'Light Cyan'),('black', 'Black'),('lightpink', 'Light Pink'),('brown', 'Brown'),('violet', 'Violet'),('lightcoral', 'Light Coral'),('lightsalmon', 'Light Salmon'),('lavender', 'Lavender'),('wheat', 'Wheat'),('ivory', 'Ivory')],'Color of the status', required=True),
|
||||
}
|
||||
_defaults = {
|
||||
'color_name': lambda *args: 'red',
|
||||
}
|
||||
hr_holidays_status()
|
||||
|
||||
class hr_holidays(osv.osv):
|
||||
_name = "hr.holidays"
|
||||
_inherit = 'hr.holidays'
|
||||
# _inherit = 'hr.holidays'
|
||||
_description = "Holidays"
|
||||
_columns = {
|
||||
'name' : fields.char('Description', required=True, readonly=True, size=64, states={'draft':[('readonly',False)]}),
|
||||
|
|
@ -171,20 +185,6 @@ class hr_holidays(osv.osv):
|
|||
return True
|
||||
hr_holidays()
|
||||
|
||||
class hr_holidays_status(osv.osv):
|
||||
_name = "hr.holidays.status"
|
||||
_inherit = 'hr.holidays.status'
|
||||
_description = "Holidays Status"
|
||||
_columns = {
|
||||
'name' : fields.char('Holiday Status', size=64, required=True, translate=True),
|
||||
'section_id': fields.many2one('crm.case.section', 'Section'),
|
||||
'color_name' : fields.selection([('red', 'Red'), ('lightgreen', 'Light Green'), ('lightblue','Light Blue'), ('lightyellow', 'Light Yellow'), ('magenta', 'Magenta'),('lightcyan', 'Light Cyan'),('black', 'Black'),('lightpink', 'Light Pink'),('brown', 'Brown'),('violet', 'Violet'),('lightcoral', 'Light Coral'),('lightsalmon', 'Light Salmon'),('lavender', 'Lavender'),('wheat', 'Wheat'),('ivory', 'Ivory')],'Color of the status', required=True),
|
||||
}
|
||||
_defaults = {
|
||||
'color_name': lambda *args: 'red',
|
||||
}
|
||||
hr_holidays_status()
|
||||
|
||||
|
||||
class hr_holidays_per_user(osv.osv):
|
||||
_name = "hr.holidays.per.user"
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@
|
|||
<newline />
|
||||
<field name="number_of_days" colspan="2"/>
|
||||
</form>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
|
@ -54,7 +53,7 @@
|
|||
<record model="ir.ui.view" id="view_holiday_2">
|
||||
<field name="name">hr.holidays.tree</field>
|
||||
<field name="model">hr.holidays</field>
|
||||
<field name="inherit_id" ref="hr.view_holiday"/>
|
||||
<field name="inherit_id" ref="view_holiday"/>
|
||||
<field name="type">tree</field>
|
||||
<field name="arch" type="xml">
|
||||
<field name="name" position="after">
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
"version" : "1.0",
|
||||
"author" : "Tiny",
|
||||
"website" : "http://tinyerp.com",
|
||||
"depends" : ["base", "product", "stock", "sale", "purchase"],
|
||||
"depends" : ["base", "product", "stock", "sale", "purchase", "report_stock"],
|
||||
"category" : "Generic Modules/Inventory Control",
|
||||
"description": "A module that adds intrastat reports.",
|
||||
"init_xml" : ["report_intrastat_data.xml",],
|
||||
|
|
|
|||
Loading…
Reference in New Issue