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

[MERGE] merge from trunk-addons master branch 

bzr revid: hmo@tinyerp.com-20100329125511-wxwp83p9gzpoia51
This commit is contained in:
Harry (Open ERP) 2010-03-29 18:25:11 +05:30
parent d598aac66f 3d4f428de6
commit 0d91bf5ffe
12 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/base_calendar/base_calendar.py
View File

@ -1173,7 +1173,10 @@ class virtual_report_spool(web_services.report_spool):
new_ids = []
for id in ids:
new_ids.append(base_calendar_id2real_id(id))
datas['id'] = base_calendar_id2real_id(datas['id'])
if datas is None:
datas = {}
if datas.get('id',False):
datas['id'] = base_calendar_id2real_id(datas['id'])
return super(virtual_report_spool, self).exp_report(db, uid, object, new_ids, datas, context)
virtual_report_spool()

1
addons/caldav/caldav_fs.py
View File

@ -38,7 +38,6 @@ from DAV.iface import *
import urllib
from DAV.davcmd import copyone, copytree, moveone, movetree, delone, deltree
from document.nodes import node_res_dir, node_res_obj
from caldav_cache import memoize
from tools import misc
CACHE_SIZE=20000

2
addons/hr/hr_view.xml
View File

@ -113,6 +113,8 @@
<group expand="1" string="Group By..." colspan="11" col="11">
<filter string="Manager" icon="terp-sale" domain="[]" context="{'group_by':'parent_id'}"/>
<filter string="Department" icon="terp-sale" domain="[]" context="{'group_by':'department_id'}"/>
<filter string="Job" icon="terp-sale" domain="[]" context="{'group_by':'job_id'}"/>
</group>
</search>
</field>

2
addons/hr_attendance/hr_attendance_view.xml
View File

@ -112,9 +112,11 @@
<field name="inherit_id" ref="hr.view_employee_form"/>
<field name="arch" type="xml">
<field name="coach_id" position="after">
<group col="7" colspan="4">
<field name="state"/>
<button name="attendance_action_change" states="absent" string="Sign In" type="object" icon="gtk-go-back" context="{'type':'sign_in'}"/>
<button name="attendance_action_change" states="present" string="Sign Out" type="object" icon="gtk-go-forward" context="{'type':'sign_out'}"/>
</group>
</field>
</field>
</record>

4
addons/hr_attendance/wizard/print_attendance_error.py
View File

@ -25,7 +25,7 @@ import pooler
from tools.translate import _
_date_form = '''<?xml version="1.0"?>
<form string="Select a time span">
<form string="Attendance Report">
<separator string="Analysis Information" colspan="4"/>
<field name="init_date"/>
<field name="end_date"/>
@ -62,7 +62,7 @@ class wiz_attendance(wizard.interface):
states = {
'init': {
'actions': [],
'result': {'type': 'form', 'arch':_date_form, 'fields':_date_fields, 'state':[('print','Print Attendance Report'),('end','Cancel') ]}
'result': {'type': 'form', 'arch':_date_form, 'fields':_date_fields, 'state':[('end','Cancel', 'gtk-cancel'),('print','Print', 'gtk-ok') ]}
},
'print': {
'actions': [_check_data],

6
addons/hr_attendance/wizard/print_bymonth.py
View File

@ -23,7 +23,7 @@ import wizard
import time
_date_form = '''<?xml version="1.0"?>
<form string="Select a month">
<form string="Timesheets by month">
<separator string="Select a month" colspan="4"/>
<field name="month"/>
<field name="year"/>
@ -49,11 +49,11 @@ class wiz_bymonth(wizard.interface):
states = {
'init': {
'actions': [],
'result': {'type': 'form', 'arch':_date_form, 'fields':_date_fields, 'state':[('print', 'Print Timesheet'), ('end', 'Cancel')]}
'result': {'type': 'form', 'arch':_date_form, 'fields':_date_fields, 'state':[ ('end', 'Cancel', 'gtk-cancel'),('print', 'Print', 'gtk-ok')] }
},
'print': {
'actions': [],
'result': {'type': 'print', 'report': 'hr.attendance.bymonth', 'state': 'end'}
'result': {'type': 'print', 'report': 'hr.attendance.bymonth', 'state': 'end' }
}
}
wiz_bymonth('hr.attendance.print_month')

4
addons/hr_attendance/wizard/print_byweek.py
View File

@ -23,7 +23,7 @@ import wizard
import time
_date_form = '''<?xml version="1.0"?>
<form string="Select a time span">
<form string="Timesheets by week">
<separator string="Select a starting and a end date" colspan="4"/>
<field name="init_date"/>
<newline/>
@ -39,7 +39,7 @@ class wiz_byweek(wizard.interface):
states = {
'init': {
'actions': [],
'result': {'type': 'form', 'arch':_date_form, 'fields':_date_fields, 'state':[('print','Print Timesheet'),('end','Cancel') ]}
'result': {'type': 'form', 'arch':_date_form, 'fields':_date_fields, 'state':[('end','Cancel', 'gtk-cancel'), ('print','Print', 'gtk-ok')]}
},
'print': {
'actions': [],

8
addons/hr_expense/hr_expense.py
View File

@ -56,17 +56,17 @@ class hr_expense_expense(osv.osv):
'id': fields.integer('Sheet ID', readonly=True),
'ref': fields.char('Reference', size=32),
'date': fields.date('Date'),
'journal_id': fields.many2one('account.journal', 'Force Journal'),
'journal_id': fields.many2one('account.journal', 'Force Journal', help = "The journal used when the expense is invoiced"),
'employee_id': fields.many2one('hr.employee', "Employee's Name", required=True),
'user_id': fields.many2one('res.users', 'User', required=True),
'date_confirm': fields.date('Date Confirmed'),
'date_valid': fields.date('Date Validated'),
'date_confirm': fields.date('Confirmation Date', help = "Date of the confirmation of the sheet expense. It's filled when the button Confirm is pressed."),
'date_valid': fields.date('Validation Date', help = "Date of the acceptation of the sheet expense. It's filled when the button Accept is pressed."),
'user_valid': fields.many2one('res.users', 'Validation User'),
'account_move_id': fields.many2one('account.move', 'Ledger Posting'),
'line_ids': fields.one2many('hr.expense.line', 'expense_id', 'Expense Lines', readonly=True, states={'draft':[('readonly',False)]} ),
'note': fields.text('Note'),
'amount': fields.function(_amount, method=True, string='Total Amount'),
'invoice_id': fields.many2one('account.invoice', 'Invoice'),
'invoice_id': fields.many2one('account.invoice', "Employee's Invoice"),
'currency_id': fields.many2one('res.currency', 'Currency', required=True),
'department_id':fields.many2one('hr.department','Department'),
'company_id': fields.many2one('res.company', 'Company', required=True),

8
addons/hr_expense/hr_expense_view.xml
View File

@ -68,7 +68,7 @@
<group colspan="4" col="6">
<field name="name" select="1"/>
<field name="employee_id" select="1"/>
<field name="id" select="2"/>
<field name="ref" select="2"/>
<field name="date" select="1"/>
<field name="amount"/>
<field name="currency_id"/>
@ -77,7 +77,6 @@
</group>
<notebook colspan="4">
<page string="Expense Sheet">
<field name="ref" select="2"/>
<newline/>
<field colspan="4" name="line_ids" nolabel="1">
<form string="Expense Lines">
@ -108,8 +107,8 @@
<separator colspan="4" string="Accounting data"/>
<field name="journal_id"/>
<separator colspan="4" string="Validation"/>
<field name="date_confirm" select="2"/>
<field name="date_valid" select="2"/>
<field name="date_confirm" select="2" readonly = "1"/>
<field name="date_valid" select="2" readonly = "1"/>
<field name="user_valid" select="2"/>
<field name="invoice_id" select="2"/>
<separator colspan="4" string="Notes"/>
@ -145,6 +144,7 @@
help="Expenses to Invoice"/>
<separator orientation="vertical"/>
<field name="name" select='1'/>
<field name="date" select='1'/>
<field name="user_id" select="1" widget="selection">
<filter
icon="gtk-execute"

9
addons/hr_holidays/hr_holidays_view.xml
View File

@ -24,6 +24,13 @@
help="My Departments Leaves"/>
</field>
</group>
<newline/>
<group expand="1" string="Group By..." colspan="2" col="2">
<filter string="Employee" icon="terp-sale" domain="[]" context="{'group_by':'employee_id'}"/>
<filter string="Department" icon="terp-sale" domain="[]" context="{'group_by':'department_id'}"/>
<filter string="Manager" icon="terp-sale" domain="[]" context="{'group_by':'manager_id'}"/>
</group>
</search>
</field>
</record>
@ -289,7 +296,7 @@
parent="hr.menu_open_view_attendance_reason_config"/>
<!-- Shortcuts -->
<act_window name="My Holiday Requests"
<act_window name="Holidays"
domain="[('employee_id', '=', active_id), ('type','=','remove')]"
res_model="hr.holidays"
src_model="hr.employee"

4
addons/hr_holidays/wizard/holidays_summary_employees.py
View File

@ -26,7 +26,7 @@ import pooler
form='''<?xml version="1.0"?>
<form string="Report Options">
<form string="Employee's Holidays">
<field name="date_from" colspan="2" />
<field name="holiday_type" colspan="2" />
<field name="emp" colspan="4" invisible="True"/>
@ -67,7 +67,7 @@ class wizard_report(wizard.interface):
states={
'init':{
'actions':[_check],
'result':{'type':'form', 'arch':form, 'fields':fields, 'state':[('end', 'Cancel'), ('checkemp', 'Print')]}
'result':{'type':'form', 'arch':form, 'fields':fields, 'state':[('end', 'Cancel', 'gtk-cancel'), ('checkemp', 'Print', 'gtk-ok')]}
},
'checkemp': {
'actions': [],

2
addons/point_of_sale/statement_report.xml
View File

@ -22,6 +22,7 @@
rml="point_of_sale/report/account_statement.rml"
/>
<report
id="all_closed_cashbox_of_the_day"
string="All Cloded CashBOx"
@ -32,6 +33,7 @@
menu = 'False'
rml="point_of_sale/report/all_closed_cashbox_of_the_day.rml"
/>
<report
id="pos_users_product_re"
string="User's Product"