audrius/suite
1
0
Fork 1
mirror of https://gitlab.com/hibou-io/hibou-odoo/suite.git synced 2025-01-20 12:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity
780 Commits 170 Branches 0 Tags
c9d84ff2c4301ae7bc31bc7e1787fbd689487545
Commit Graph

780 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jared Kipe
be292db946 [FIX] hr_payroll_payment: require hibou_professional 2021-03-09 21:29:39 +00:00
Jared Kipe
ac150e80df [FIX] hr_payroll_payment: use manually set accounting date on payslip if filled 
Odoo EE upstream has functionally the same code, so the help for the field is a lie (currently).
 2021-03-09 21:29:39 +00:00
Jared Kipe
a356276c65 MIG hr_payroll_payment for Odoo 13 and improve 
Pay your Payroll
================

Hibou's Payroll Payments modifies, and abstracts, the way that the accounting for payslips is generated.

In stock Odoo 13, journal entries are grouped by account and name, but has no linking to partners.

On the Payroll Journal, you can now select optional journal entry creation with the options:

- Original: Stock Implementation
- Grouped: Lines are grouped by account and partner.  The slip line names will be comma separated in the line name.
- Payslip: Lines are grouped by account and partner, as above, but a single journal entry will be created per payslip.

Adds configuration on how you would pay your employees on the Payroll journal.  e.g. You write a "check" from "Bank"

Adds button on payslip and payslip batch to generate payment for the employee's payable portion.

When paying on a batch, a "Batch Payment" will be generated and linked to the whole payslip run.

Adds Accounting Date field on Batch to use when creating slips with the batch's date.

Tested
------

Passes original Payroll Accounting tests and additional ones for gouping behavior.
 2021-03-09 21:29:39 +00:00
Jared Kipe
1097e0f56f MIG hr_payroll_payment to 12.0. Known issue where you have to change the payment journal to see the methods. 2021-03-09 21:29:38 +00:00
Jared Kipe
99efd58c5a IMP hr_payroll_payment Allow some balances to be reconciled in advance externally (i.e. only pay non-reconciled lines) 2021-03-09 21:29:38 +00:00
Jared Kipe
a9b39d981f Initial commit of Forte Payment integration and parts of hr_payroll_payment to support it. 2021-03-09 21:29:38 +00:00
Jared Kipe
091196dcc1 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
 2021-03-09 21:29:38 +00:00
Jared Kipe
ecc5284ce9 Merge branch 'imp/14.0/us_payroll_2021' into '14.0' 
imp/14.0/us_payroll_2021 into 14.0

See merge request hibou-io/hibou-odoo/suite!777
 2021-02-23 17:54:17 +00:00
Hibou Bot
dbd71672b1 Merge branch 'imp/14.0/us_payroll_2021' into '14.0-test' 
imp/14.0/us_payroll_2021 into 14.0-test

See merge request hibou-io/hibou-odoo/suite!800
 2021-02-22 22:30:05 +00:00
Jared Kipe
23e0273121 [FIX] l10n_us_hr_payroll: 2021 fixes found during porting 2021-02-22 14:28:42 -08:00
Hibou Bot
32ad31f3dc Merge branch 'imp/14.0/us_payroll_2021' into '14.0-test' 
imp/14.0/us_payroll_2021 into 14.0-test

See merge request hibou-io/hibou-odoo/suite!789
 2021-01-28 23:43:11 +00:00
Jared Self
1262fb03de [FIX] l10n_us_hr_payroll: Fix parameters dates, python errors, and result values 
Fixed parameter dates in Hawaii, Python errors in wa_washington.xml, some results in Alabama and Iowa, and removing 2019 info in test_us_payslip_2020.py
 2021-01-28 16:41:55 -07:00
Hibou Bot
5d1488bcbb Merge branch 'imp/14.0/us_payroll_2021' into '14.0-test' 
imp/14.0/us_payroll_2021 into 14.0-test

See merge request hibou-io/hibou-odoo/suite!788
 2021-01-26 16:24:07 +00:00
Jared Self
b8b9209454 [FIX] l10n_us_hr_payroll: Virginia 2021 test had 2020 dates 2021-01-26 09:22:48 -07:00
Hibou Bot
700e539be4 Merge branch 'imp/14.0/us_payroll_2021' into '14.0-test' 
imp/14.0/us_payroll_2021 into 14.0-test

See merge request hibou-io/hibou-odoo/suite!781
 2021-01-25 16:27:23 +00:00
Jared Self
e0bf8bf8d0 [FIX] l10n_us_hr_payroll: Removed Debug From Maine Test 2021-01-25 09:26:10 -07:00
Hibou Bot
8b4bf43ae9 Merge branch 'imp/14.0/us_payroll_2021' into '14.0-test' 
imp/14.0/us_payroll_2021 into 14.0-test

See merge request hibou-io/hibou-odoo/suite!778
 2021-01-21 17:42:09 +00:00
Jared Self
a7360f9fb9 [FIX] l10n_us_hr_payroll: Missing Maine 2021-01-21 10:40:53 -07:00
Hibou Bot
a669051436 Merge branch 'imp/14.0/us_payroll_2021' into '14.0-test' 
imp/14.0/us_payroll_2021 into 14.0-test

See merge request hibou-io/hibou-odoo/suite!776
 2021-01-21 17:25:58 +00:00
Jared Kipe
d2ce696bbd [IMP] l10n_us_hr_payroll: Migrating States and Federal for 2021 
TX Texas Amended (+50 squashed commits)
Squashed commits:
[7da4d616] ID Idaho
[a2970d9b] FED amended
[8ebf4c24] FED
[080f6f05] TN Tennessee
[bf2aa103] MI Michigan
[493a6361] SC South Carolina
[8e97119d] LA Louisiana
[ee97a733] DE Delaware
[5d9a7ced] WY Wyoming
[8f72bfdd] WI Wisconsin
[88073c7e] WV West Virginia
[192ea027] VA Virginia
[a32b4630] VT Vermont
[1874a69f] TX Texas
[39db5caa] SD South Dakota
[21ebee50] RI Rhode Island
[677e6f78] PA Pennsylvania
[91cb694d] OK Oklahoma
[5d93e5c4] ND North Dakota
[f3d535ba] NM New Mexico
[308fd185] NJ New Jersey
[3c36600c] NH New Hampshire
[d422bef6] NV Nevada
[dc0551f1] NE Nebraska
[eaae1e2b] MO Missouri
[1ecd2521] MS Mississippi
[bb8734ad] MN Minnesota
[da6d84bb] Revert "ME Maine"

This reverts commit e866f89b2b.
[e866f89b] ME Maine
[c0a7d06c] KY Kentucky
[84556347] IN Indiana
[ed241bf0] IL Illinois
[d4c33133] HI Hawaii
[982bf274] GA Georgia
[5d0ef117] CT Connecticut
[e4713512] CA California
[24b867f3] WA Washington - formatting changes
[e754b3aa] AR Arkansas
[33482ad3] UT Utah
[25595393] WA Washington
[ac222b58] MT Montana
[55babb7b] AZ Arizona todo: Income Tax not calculated
[8b184e6f] AL Alabama
[cc688c9d] AK Alaska
[e8b105ad] OH Ohio
[bff5ca12] nc north carolina
[118e9a76] ny new york
[575953a3] fl florida
[401a7ce3] IA Iowa
 2021-01-21 10:22:56 -07:00
Jared Kipe
2748a832c3 Merge branch 'imp/14.0/pos_pax__debit' into '14.0' 
imp/14.0/pos_pax__debit into 14.0

See merge request hibou-io/hibou-odoo/suite!749
 2020-12-29 18:26:02 +00:00
Hibou Bot
160f4acf7d Merge branch 'imp/14.0/pos_pax__debit' into '14.0-test' 
imp/14.0/pos_pax__debit into 14.0-test

See merge request hibou-io/hibou-odoo/suite!748
 2020-12-29 16:44:18 +00:00
Jared Kipe
d17bca3556 [IMP] pos_pax: implement low level and UI for Debit cards. 2020-12-29 08:43:10 -08:00
Jared Kipe
ed87ca76d2 Merge branch 'fix/14.0/hr_payroll_overtime__view_colspan' into '14.0' 
fix/14.0/hr_payroll_overtime__view_colspan into 14.0

See merge request hibou-io/hibou-odoo/suite!735
 2020-12-17 20:39:37 +00:00
Hibou Bot
658c05fa27 Merge branch 'fix/14.0/hr_payroll_overtime__view_colspan' into '14.0-test' 
fix/14.0/hr_payroll_overtime__view_colspan into 14.0-test

See merge request hibou-io/hibou-odoo/suite!734
 2020-12-10 22:07:03 +00:00
Jared Kipe
2f51d491ef [FIX] hr_payroll_overtime: colspan 4 squishes above fields 
Essentially, the colspan=4 here pushed the two fields above it into a strange view because it is a single group that is already 4 col wide.

(cherry picked from commit d87fa8c923)
 2020-12-10 14:04:46 -08:00
Jared Kipe
52937f2fe5 Merge branch 'imp/14.0/hr_payroll_overtime__exempt' into '14.0' 
imp/14.0/hr_payroll_overtime__exempt into 14.0

See merge request hibou-io/hibou-odoo/suite!731
 2020-12-10 21:20:35 +00:00
Hibou Bot
9ac676e802 Merge branch 'imp/14.0/hr_payroll_overtime__exempt' into '14.0-test' 
imp/14.0/hr_payroll_overtime__exempt into 14.0-test

See merge request hibou-io/hibou-odoo/suite!730
 2020-12-10 17:49:37 +00:00
Jared Kipe
3da295572c [IMP] hr_payroll_overtime: implement exempt from overtime on contract 2020-12-10 09:48:31 -08:00
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
Hibou Bot
4627558345 Merge branch 'imp/14.0/hr_payroll_overtime__work_type_override' into '14.0-test' 
imp/14.0/hr_payroll_overtime__work_type_override into 14.0-test

See merge request hibou-io/hibou-odoo/suite!727
 2020-12-10 00:02:00 +00:00
Jared Kipe
0997b87930 [FIX] hr_payroll_overtime: tests after cherry-pick from 13.0 2020-12-09 16:00:55 -08:00
Hibou Bot
0112fb4c10 Merge branch 'imp/14.0/hr_payroll_overtime__work_type_override' into '14.0-test' 
imp/14.0/hr_payroll_overtime__work_type_override into 14.0-test

See merge request hibou-io/hibou-odoo/suite!723
 2020-12-09 23:53:41 +00: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
Hibou Bot
e57ad0ca4b Merge branch 'fix/14.0/H4936_account_invoice_margin__refactored_to_safely_index_list' into '14.0-test' 
fix/14.0/H4936_account_invoice_margin__refactored_to_safely_index_list into 14.0-test

See merge request hibou-io/hibou-odoo/suite!719
 2020-12-04 21:51:10 +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
Hibou Bot
15a1300d2c Merge branch 'mig/14.0/hr_payroll_timesheet' into '14.0-test' 
mig/14.0/hr_payroll_timesheet into 14.0-test

See merge request hibou-io/hibou-odoo/suite!713
 2020-11-28 00:31:59 +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