Commit Graph

255 Commits

Author SHA1 Message Date
Jared Kipe
3603be41b7 Merge branch 'imp/14.0/hr_payroll_overtime__work_type_override' into '14.0'
imp/14.0/hr_payroll_overtime__work_type_override into 14.0

See merge request hibou-io/hibou-odoo/suite!724
2020-12-10 17:29:39 +00:00
Jared Kipe
0997b87930 [FIX] hr_payroll_overtime: tests after cherry-pick from 13.0 2020-12-09 16:00:55 -08:00
Jared Kipe
f61bb6e15c [IMP] hr_payroll_overtime: refactor to abstract override class and use on Work Types themselves
E.g. It is now possible to support "Sunday Pay" where before it was only possible to give "Sunday Overtime Pay" as an override to overtime itself.
2020-12-09 15:30:16 -08:00
Jared Kipe
b65a6f2420 Merge branch 'fix/14.0/H4936_account_invoice_margin__refactored_to_safely_index_list' into '14.0'
fix/14.0/H4936_account_invoice_margin__refactored_to_safely_index_list into 14.0

See merge request hibou-io/hibou-odoo/suite!720
2020-12-04 21:52:45 +00:00
Connor Christian
9917e057e2 [FIX] account_invoice_margin: refactored to safely index into a list and rename variable
H4936
2020-12-04 16:50:10 -05:00
Jared Kipe
656f9f7bf0 Merge branch 'mig/14.0/hr_payroll_timesheet' into '14.0'
mig/14.0/hr_payroll_timesheet into 14.0

See merge request hibou-io/hibou-odoo/suite!714
2020-11-28 00:37:04 +00:00
Jared Kipe
2d735743da [FIX] hr_payroll_attendance: tests and migration fixes 2020-11-27 16:30:59 -08:00
Jared Kipe
9c22f845fe [IMP] hr_payroll_overtime: expose the "Rate" field on Worked Day Lines 2020-11-27 16:30:23 -08:00
Jared Kipe
7da29f9972 [MIG] hr_payroll_timesheet: for Odoo Enterprise 14.0 2020-11-27 16:29:48 -08:00
Jared Kipe
c1b9fb4eff [IMP] hr_payroll_timesheet: normalize 'amount' on leave lines, require hibou_professional 2020-11-27 14:47:15 -08:00
Jared Kipe
be0d56d035 [IMP] hr_payroll_timesheet: require hr_timesheet_work_type and use the timesheet's specififed work entry type 2020-11-27 14:47:15 -08:00
Jared Kipe
6af3e23696 [IMP] hr_payroll_timesheet: Migration script for 13 2020-11-27 14:47:15 -08:00
Jared Kipe
95f88c4e87 [FIX] hr_payroll_timesheet: repeated onchange in a single change will duplicate timesheet in a set until saved 2020-11-27 14:47:15 -08:00
Jared Kipe
383a47e487 [FIX] hr_payroll_timesheet: Unlink behavior on timesheet entries and remove "Work Calendar" work lines. 2020-11-27 14:47:15 -08:00
Jared Kipe
2dafa61918 [MIG] hr_payroll_timesheet: to Odoo 13.0 + [ADD] Overtime calculations 2020-11-27 14:47:15 -08:00
Jared Kipe
fb1b1c2c5f MIG hr_payroll_timesheet to 12.0 2020-11-27 14:47:15 -08:00
Jared Kipe
b1c2987029 Initial commit of *new* hr_payroll_timesheet and hr_payroll_timesheet_old for 11.0 2020-11-27 14:47:15 -08:00
Jared Kipe
5fcad50d8b Proper migration to 11.0, and implementation of 'overtime rules' breakdown of hours/weeks. 2020-11-27 14:47:15 -08:00
Jared Kipe
b4847a5032 Adding all from 11.0 https://github.com/hibou-io/odoo-hr-payroll
hr_payroll_holidays
hr_payroll_input_name_report
hr_payroll_input_report
hr_payroll_payment
hr_payroll_timesheet
hr_payslip_line_date
l10n_us_fl_hr_payroll
l10n_us_hr_payroll
l10n_us_mo_hr_payroll
l10n_us_oh_hr_payroll
l10n_us_va_hr_payroll
2020-11-27 14:47:15 -08:00
Jared Kipe
baf9236835 [MIG] hr_timesheet_work_entry: to Odoo 14.0 2020-11-27 14:46:48 -08:00
Jared Kipe
c70737f359 [ADD] hr_timesheet_work_entry: for Odoo 13 2020-11-27 14:46:48 -08:00
Jared Kipe
0f17c1438c [IMP] hr_payroll_overtime: refactor/improve API (for hr_payroll_attendance) 2020-11-27 14:23:33 -08:00
Jared Kipe
16821f85c3 [IMP] hr_payroll_hibou: Control the 'wage_type' at the HR Contract Level
This will make it possible to be more abstract with 'work_type' or 'worked days lines' and overtime.
2020-11-27 14:22:16 -08:00
Jared Kipe
9f59dd2dee [MIG] hr_payroll_attendance: for Odoo Enterprise 13.0
Move some concerns to other modules, refactor new API to make it possible to use timesheets and attendances together.

Now possible to add attendances by hand or import via smart button and 'recompute' attendances.
2020-11-27 14:20:26 -08:00
Jared Kipe
0dfee20750 [IMP] hr_payroll_attendance: normalize 'amount' on leave lines, require hibou_professional 2020-11-26 13:25:39 +00:00
Jared Kipe
73948e5c13 [IMP] hr_payroll_attendance: new default entry mechanisms, otherwise use the type from the attendance
Also skip putting it on the sheet if it is an unpaid type.
2020-11-26 13:25:39 +00:00
Jared Kipe
3aa19d714f [NEW] hr_attendance_work_entry: for Odoo 13 2020-11-26 13:25:39 +00:00
Jared Kipe
eeb4a40b69 [IMP] hr_payroll_attendance: Migration script for 13 2020-11-26 13:25:39 +00:00
Jared Kipe
d501d335b8 [FIX] hr_payroll_attendance: repeated onchange in a single change will duplicate attendances in a set until saved 2020-11-26 13:25:39 +00:00
Jared Kipe
c07254ef2b [FIX] hr_payroll_attendance: Unlink behavior on attendances and remove "Work Calendar" work lines. 2020-11-26 13:25:39 +00:00
Jared Kipe
cf399eb6c3 [FIX] hr_payroll_attendance: unlink behavior for multi-worked-lines 2020-11-26 13:25:39 +00:00
Jared Kipe
71709012bb [MIG] hr_payroll_attendance: to Odoo 13.0 + [ADD] Overtime calculations 2020-11-26 13:25:39 +00:00
Jared Kipe
d457394b64 MIG hr_payroll_attendance to 12.0 2020-11-26 13:25:39 +00:00
Jared Kipe
b69b22084a Initial commit of hr_payroll_attendance and hr_payroll_attendance_holidays modules for 11.0.
The purpose of this new functionality is to better distinguish between timesheets and attendance, as well as preventing the stock "salaried" time computations from working.
2020-11-26 13:25:38 +00:00
Jared Kipe
2b4d7c9edc Merge branch 'mig/14.0/hr_payroll_overtime' into '14.0'
mig/14.0/hr_payroll_overtime into 14.0

See merge request hibou-io/hibou-odoo/suite!710
2020-11-26 13:24:54 +00:00
Jared Kipe
e721b483fc [MIG] hr_payroll_overtime: for Odoo Enterprise 14.0 2020-11-26 05:21:54 -08:00
Jared Kipe
28dfe39273 [IMP] hr_payroll_overtime: implement date or day of week overrides to overtime rules 2020-11-26 13:04:35 +00:00
Jared Kipe
19ace4e3bf [IMP] hr_payroll_overtime: detect recursion and prevent the simplest type in the form view 2020-11-26 13:04:35 +00:00
Jared Kipe
06e887622d [IMP] hr_payroll_overtime: refactor calculation to allow 'recursion' or overtime on overtime
Example.  Lets say you have 8hr/day overtime at 1.5x, and 12hr/day overtime at 2x.
Now you can create a 2x overtime rules for 12 hours/day, and use it as the overtime rules for the original overtime worktype.
2020-11-26 13:04:35 +00:00
Jared Kipe
57f5ddf8e1 [ADD] hr_payroll_overtime: for Odoo 13.0 2020-11-26 13:04:35 +00:00
Jared Kipe
d196568a0b Merge branch 'mig/14.0/hr_attendance_work_entry' into '14.0'
mig/14.0/hr_attendance_work_entry into 14.0

See merge request hibou-io/hibou-odoo/suite!708
2020-11-26 13:03:00 +00:00
Jared Kipe
d2fa0eeff7 [MIG] hr_attendance_work_entry: to Odoo 14.0 2020-11-26 05:00:03 -08:00
Brett Spaulding
46f595fafa [IMP] hr_attendance_work_entry: Modified kiosk mode views and attendance views to allow for various punch types. 2020-11-26 12:34:19 +00:00
Jared Kipe
7862c8b764 [NEW] hr_attendance_work_entry: for Odoo 13 2020-11-26 12:34:19 +00:00
Jared Kipe
282cf9ce38 Merge branch 'mig/14.0/purchase_by_sale_history' into '14.0'
mig/14.0/purchase_by_sale_history into 14.0

See merge request hibou-io/hibou-odoo/suite!702
2020-11-25 16:04:12 +00:00
Leighton Pennicott
55241ed236 [MIG] purchase_by_sale_history: migrate to Odoo 14.0 2020-11-25 10:46:53 -05:00
Leighton Pennicott
63056afb1c [MIG] purchase_by_sale_history: migrate to Odoo 13.0 2020-11-24 14:15:48 +00:00
Jared Kipe
831392762e IMP purchase_by_sale_history Convert "to buy" QTY to the PO Line UOM.
This means that if it is making a new line, it will be the "Purchase UOM", if it is re-using a line it will be the current line UOM (which may have been changed by the user).
2020-11-24 14:15:48 +00:00
Jared Kipe
b6189f3940 MIG purchase_by_sale_history to 12.0 2020-11-24 14:15:48 +00:00
Jared Kipe
e0f69d6095 Initial commit of purchase_by_sale_history_mrp for 11.0
Additionally, refactor and improve `purchase_by_sale_history` to include current inventory demand (virtual_available) for specific warehouses.
2020-11-24 14:15:48 +00:00