lp:~openerp-dev/openobject-addons/trunk-hr_timesheet-aja

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:openobject-addons

OpenERP Core Team: Pending requested 2013-05-29

Diff: 318 lines (+69/-72)

9 files modified

analytic/analytic.py (+0/-1)
hr_timesheet_sheet/hr_timesheet_sheet.py (+5/-1)
hr_timesheet_sheet/hr_timesheet_sheet_demo.xml (+3/-4)
hr_timesheet_sheet/static/src/css/timesheet.css (+3/-1)
hr_timesheet_sheet/static/src/css/timesheet.sass (+4/-0)
hr_timesheet_sheet/static/src/js/timesheet.js (+44/-13)
hr_timesheet_sheet/static/src/xml/timesheet.xml (+10/-2)
web_shortcuts/i18n/bs.po (+0/-25)
web_shortcuts/i18n/fi.po (+0/-25)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

8754. By ajay javiya (OpenERP) on 2013-11-11

[MERGE]: with trunk

8753. By ajay javiya (OpenERP) on 2013-10-29

[MERGE]: with trunk

8752. By ajay javiya (OpenERP) on 2013-09-12

[FIX]: traceback : null value in column 'name' violates not-null constraint

8751. By ajay javiya (OpenERP) on 2013-09-04

[IMP]: Rename from global_desc to sheet_note
-> remove unwanted demo data

8750. By ajay javiya (OpenERP) on 2013-09-03

[MERGE]: with trunk

8749. By Paramjit Singh Sahota(OpenERP) on 2013-08-13

[MERGE] Merged lp:openobject-addons.

8748. By Paramjit Singh Sahota(OpenERP) on 2013-07-09

[IMP] Revert the code of if condition as present in rev no 8743.

8747. By Paramjit Singh Sahota(OpenERP) on 2013-07-09

[IMP] Now the global description will be different for days from where it is changed.

8746. By Paramjit Singh Sahota(OpenERP) on 2013-07-04

[MERGE] Sync with lp:openobject-addons.

8745. By Paramjit Singh Sahota(OpenERP) on 2013-07-03

[IMP]Solved the issue of FALSE in global description and added demo data for hr_timesheet_sheet.