← Back to branch summary

~vauxoo/addons-vauxoo/6.0-trunk

~vauxoo/addons-vauxoo/6.0-trunk

Viewing all changes in revision 543.318.24.

Committer: Humberto Arocha
Date: 2014-07-23 13:00:53 UTC
mfrom: (543.7.544 trunk)
mto: (543.374.2 7.0-aging_due_report-rev-1960-kty-copia)
mto: This revision was merged to the branch mainline in revision 865.
Revision ID: hbto@vauxoo.com-20140723130053-7xpmmrs4nq2hqqnk

[MERGE] From Trunk

files added:
user_story/model/custom_project_task.py

user_story/model/timesheet_all.py

user_story/view/custom_project_task_view.xml

user_story/view/hr_timesheet_all_view.xml

files modified:
stock_move_entries/model/stock_move_entries.py

user_story/__openerp__.py

user_story/model/__init__.py

user_story/security/ir.model.access.csv

user_story/security/userstory_security.xml

Show diffs side-by-side

added added

removed removed

stock_move_entries/model/stock_move_entries.py

user_story/__openerp__.py

user_story/model/__init__.py

user_story/model/custom_project_task.py

user_story/model/timesheet_all.py

user_story/security/ir.model.access.csv

user_story/security/userstory_security.xml

user_story/view/custom_project_task_view.xml

user_story/view/hr_timesheet_all_view.xml

Older »