lp:~camptocamp/hr-timesheet/full-fill-timesheet-account-type-vre
Created by
Vincent Renaville@camptocamp
and last modified
- Get this branch:
- bzr branch lp:~camptocamp/hr-timesheet/full-fill-timesheet-account-type-vre
Members of
Camptocamp
can upload to this branch. Log in for directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- Stéphane Bidoul (Acsone) (community): Approve (code review)
- Yannick Vaucher @ Camptocamp: Approve (code review, no tests)
- Pedro Manuel Baeza: Approve (code review)
- Joël Grand-Guillaume @ camptocamp: Pending (code review, no tests) requested
-
Diff: 12 lines (+1/-1)1 file modifiedhr_timesheet_fulfill/wizard/timesheet_fulfill.py (+1/-1)
Superseded
for merging
into
lp:~hr-core-editors/hr-timesheet/6.1
- Yannick Vaucher @ Camptocamp: Needs Resubmitting
- Joël Grand-Guillaume @ camptocamp: Needs Fixing (code review, no tests)
-
Diff: 7196 lines (+4884/-1282) (has conflicts)65 files modifiedhr_attendance_analysis/AUTHORS.txt (+1/-0)
hr_attendance_analysis/__init__.py (+26/-0)
hr_attendance_analysis/__openerp__.py (+51/-0)
hr_attendance_analysis/company_view.xml (+17/-0)
hr_attendance_analysis/hr_attendance.py (+419/-0)
hr_attendance_analysis/hr_attendance_view.xml (+80/-0)
hr_attendance_analysis/hr_contract.py (+56/-0)
hr_attendance_analysis/i18n/hr_attendance_analysis.pot (+564/-0)
hr_attendance_analysis/i18n/it.po (+611/-0)
hr_attendance_analysis/report/__init__.py (+21/-0)
hr_attendance_analysis/report/calendar_report.mako (+138/-0)
hr_attendance_analysis/report/calendar_report.py (+96/-0)
hr_attendance_analysis/reports.xml (+86/-0)
hr_attendance_analysis/resource.py (+102/-0)
hr_attendance_analysis/resource_view.xml (+52/-0)
hr_attendance_analysis/security/ir.model.access.csv (+3/-0)
hr_attendance_analysis/wizard/__init__.py (+23/-0)
hr_attendance_analysis/wizard/print_calendar_report.py (+366/-0)
hr_attendance_analysis/wizard/print_calendar_report.xml (+38/-0)
hr_timesheet_fulfill/__init__.py (+18/-25)
hr_timesheet_fulfill/__openerp__.py (+39/-50)
hr_timesheet_fulfill/wizard/__init__.py (+3/-0)
hr_timesheet_fulfill/wizard/timesheet_fulfill.py (+36/-44)
hr_timesheet_fulfill/wizard/timesheet_fulfill_view.xml (+55/-40)
hr_timesheet_holidays/__openerp__.py (+1/-1)
hr_timesheet_improvement/__init__.py (+22/-0)
hr_timesheet_improvement/__openerp__.py (+50/-0)
hr_timesheet_improvement/hr_attendance.py (+98/-0)
hr_timesheet_improvement/hr_timesheet.py (+51/-0)
hr_timesheet_improvement/hr_timesheet_view.xml (+17/-0)
hr_timesheet_print/__openerp__.py (+1/-1)
hr_timesheet_reminder/__init__.py (+15/-26)
hr_timesheet_reminder/__openerp__.py (+41/-43)
hr_timesheet_reminder/company.py (+51/-49)
hr_timesheet_reminder/hr_employee.py (+42/-53)
hr_timesheet_reminder/hr_employee_view.xml (+0/-1)
hr_timesheet_reminder/reminder.py (+100/-88)
hr_timesheet_reminder/report/__init__.py (+16/-25)
hr_timesheet_reminder/report/timesheet_status.py (+63/-65)
hr_timesheet_reminder/report/timesheet_status.rml (+157/-163)
hr_timesheet_reminder/timesheet_report.xml (+10/-10)
hr_timesheet_reminder/wizard/reminder_config.py (+37/-45)
hr_timesheet_reminder/wizard/reminder_config_view.xml (+38/-28)
hr_timesheet_reminder/wizard/reminder_status.py (+35/-44)
hr_timesheet_reminder/wizard/reminder_status_view.xml (+22/-21)
hr_timesheet_task/__init__.py (+15/-25)
hr_timesheet_task/__openerp__.py (+13/-9)
hr_timesheet_task/hr_analytic_timesheet_view.xml (+15/-28)
hr_timesheet_task/hr_timesheet_sheet_view.xml (+14/-12)
hr_timesheet_task/i18n/fr.po (+42/-0)
hr_timesheet_task/static/src/css/timesheet.css (+7/-0)
hr_timesheet_task/static/src/js/timesheet.js (+252/-0)
hr_timesheet_task/static/src/xml/timesheet.xml (+35/-0)
hr_timesheet_task/wizard/__init__.py (+0/-3)
hr_timesheet_task/wizard/associate_analytic_timesheet.py (+0/-48)
hr_timesheet_task/wizard/dissociate_analytic_timesheet.py (+0/-47)
hr_timesheet_task/wizard/hr_timesheet_invoice_create.py (+0/-46)
hr_timesheet_task/wizard/wizard_actions.xml (+0/-34)
timesheet_task/__init__.py (+15/-23)
timesheet_task/__openerp__.py (+25/-15)
timesheet_task/i18n/fr.po (+53/-0)
timesheet_task/project_task.py (+145/-104)
timesheet_task/project_task_view.xml (+203/-37)
timesheet_task/test/task_timesheet_indicators.yml (+282/-0)
timesheet_task/tmp_file_for_project_indicator.py (+0/-29)
Related bugs
Bug #1250085: full fill timesheet account type | Undecided | Fix Released |
Related blueprints
Branch information
Recent revisions
- 58. By Vincent Renaville@camptocamp
-
[FIX] change type from normal to contract to match project linked analytic account instead of standard analytic account
- 56. By Nicolas Bessi - Camptocamp
-
[IMP] in timesheet_task module:
Fix propagation of indicator at project level when aa/timesheet line are altered
Fix remaining_hours when a task is added on aa line without taskAdd YAML tests
Improve tooltips of indicators - 54. By Yannick Vaucher @ Camptocamp
-
[FIX] hr-timesheet - add a dummy hr_analytic_
timesheet_ id field on hr.analytic. timesheet to be able to write name and project_id on project.task as project.task write method - 51. By Lorenzo Battistini
-
[FIX] consider attendances of type 'action' while searching for previous sign in
- 50. By Laetitia Gangloff (Acsone)
-
[FIX] fix the bug lp:1200183. allow duplicate contract. contract without trial period is not active contract
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:~hr-core-editors/hr-timesheet/6.1