Commit Graph

948 Commits

Author SHA1 Message Date
Jared Self
6f034b0760 DE Delaware 2021-01-25 20:41:49 -07:00
Jared Self
2e6835e07a AL Alabama 2021-01-25 20:39:18 -07:00
Jared Self
70a2caa108 [FIX] l10n_us_hr_payroll: Removed Debug From Maine Test 2021-01-25 09:28:01 -07:00
Hibou Bot
f243448d53 Merge branch 'new/13.0/website_sale_payment_terms' into '13.0-test'
new/13.0/website_sale_payment_terms into 13.0-test

See merge request hibou-io/hibou-odoo/suite!779
2021-01-22 20:17:45 +00:00
Cedric Collins
0fa4922c5f [ADD] website_sale_payment_terms: allow ecommerce customers to choose payment terms
H4799
2021-01-22 14:16:21 -06:00
Jared Self
0a74a71909 [FIX] l10n_us_hr_payroll: Missing Maine 2021-01-21 10:47:57 -07:00
Jared Kipe
c5c0aef1d9 [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:47:42 -07:00
Jared Kipe
6ca82cce6a Merge branch 'fix/13.0/pos_pax__chrome_ff_click' into '13.0'
fix/13.0/pos_pax__chrome_ff_click into 13.0

See merge request hibou-io/hibou-odoo/suite!771
2021-01-13 00:37:49 +00:00
Hibou Bot
5098abcc3e Merge branch 'fix/13.0/pos_pax__chrome_ff_click' into '13.0-test'
fix/13.0/pos_pax__chrome_ff_click into 13.0-test

See merge request hibou-io/hibou-odoo/suite!770
2021-01-12 23:59:56 +00:00
Jared Kipe
c2a26eec49 [FIX] pos_pax: chrome creats many requests
Appears to be bad click handling, as the 'click' is processed, but I also wrapped the ternary operators in case browsers handle that differently (.. I've seen 5+ requests...)
2021-01-12 15:58:43 -08:00
Hibou Bot
fe8cb95376 Merge branch 'add/13.0/box_base' into '13.0-test'
add/13.0/box_base into 13.0-test

See merge request hibou-io/hibou-odoo/suite!765
2021-01-10 22:16:01 +00:00
Jared Kipe
0f8a4b95d3 Bump submodule to include some new fixes. 2021-01-10 14:14:41 -08:00
Kaylie Kipe
d95da20f76 Merge branch 'new/13.0/H4721_sale_exception_website__show_exceptions' into '13.0'
new/13.0/H4721_sale_exception_website__show_exceptions into 13.0

See merge request hibou-io/hibou-odoo/suite!761
2021-01-10 16:40:50 +00:00
Hibou Bot
f77f49cf7b Merge branch 'add/13.0/box_base' into '13.0-test'
add/13.0/box_base into 13.0-test

See merge request hibou-io/hibou-odoo/suite!762
2021-01-05 22:13:32 +00:00
Jared Kipe
36692ebe43 [ADD] box_printbox_queue: from submodule hiboubox 2021-01-05 14:12:17 -08:00
Hibou Bot
ae24c8cfaf Merge branch 'new/13.0/H4721_sale_exception_website__show_exceptions' into '13.0-test'
new/13.0/H4721_sale_exception_website__show_exceptions into 13.0-test

See merge request hibou-io/hibou-odoo/suite!760
2021-01-04 17:11:07 +00:00
Cedric Collins
e9902c790c [ADD] sale_exception_website: display sale exceptions and prevent purchase
H4721
2021-01-04 11:09:46 -06:00
Jared Kipe
bda7368e33 Merge branch 'new/13.0/H4721_sale_exception_portal__show_exceptions' into '13.0'
new/13.0/H4721_sale_exception_portal__show_exceptions into 13.0

See merge request hibou-io/hibou-odoo/suite!759
2020-12-30 23:11:15 +00:00
Hibou Bot
d7989141cf Merge branch 'new/13.0/H4721_sale_exception_portal__show_exceptions' into '13.0-test'
new/13.0/H4721_sale_exception_portal__show_exceptions into 13.0-test

See merge request hibou-io/hibou-odoo/suite!758
2020-12-30 23:03:29 +00:00
Cedric Collins
26d5bab635 [ADD] sale_exception_portal: show exceptions on portal
H4721
2020-12-30 17:02:15 -06:00
Jared Kipe
e24b9b691c Merge branch 'imp/13.0/H4721_sale_credit_limit__add_partner_fields' into '13.0'
imp/13.0/H4721_sale_credit_limit__add_partner_fields into 13.0

See merge request hibou-io/hibou-odoo/suite!757
2020-12-29 21:52:49 +00:00
Hibou Bot
37b773379f Merge branch 'imp/13.0/H4721_sale_credit_limit__add_partner_fields' into '13.0-test'
imp/13.0/H4721_sale_credit_limit__add_partner_fields into 13.0-test

See merge request hibou-io/hibou-odoo/suite!756
2020-12-29 21:50:50 +00:00
Cedric Collins
38001e6e3e [IMP] sale_credit_limit: add partner fields and sale exceptions
H4721
2020-12-29 15:49:42 -06:00
Jared Kipe
dc3ce2a7bf Merge branch 'imp/13.0/pos_pax__debit' into '13.0'
imp/13.0/pos_pax__debit into 13.0

See merge request hibou-io/hibou-odoo/suite!751
2020-12-29 19:17:05 +00:00
Hibou Bot
90b83b9c64 Merge branch 'imp/13.0/pos_pax__debit' into '13.0-test'
imp/13.0/pos_pax__debit into 13.0-test

See merge request hibou-io/hibou-odoo/suite!750
2020-12-29 18:49:35 +00:00
Jared Kipe
b9a44f8600 [IMP] pos_pax: implement low level and UI for Debit cards. 2020-12-29 10:48:27 -08:00
Jared Kipe
16d3b698cb Merge branch 'fix/13.0/sale_payment_web__fix_improper_call_to_super' into '13.0'
fix/13.0/sale_payment_web__fix_improper_call_to_super into 13.0

See merge request hibou-io/hibou-odoo/suite!737
2020-12-17 20:39:48 +00:00
Jared Kipe
baef46adb6 Merge branch 'fix/13.0/sale_payment_deposit__order_confirm' into '13.0'
fix/13.0/sale_payment_deposit__order_confirm into 13.0

See merge request hibou-io/hibou-odoo/suite!739
2020-12-17 20:39:21 +00:00
Hibou Bot
4e9ca236aa Merge branch 'fix/13.0/sale_payment_deposit__order_confirm' into '13.0-test'
fix/13.0/sale_payment_deposit__order_confirm into 13.0-test

See merge request hibou-io/hibou-odoo/suite!738
2020-12-17 18:26:22 +00:00
Jared Kipe
63b4d212e7 [FIX] sale_payment_deposit: confirmation of orders stopped because transaction now validates amount 2020-12-17 10:25:12 -08:00
Hibou Bot
5adcadd455 Merge branch 'fix/13.0/sale_payment_web__fix_improper_call_to_super' into '13.0-test'
fix/13.0/sale_payment_web__fix_improper_call_to_super into 13.0-test

See merge request hibou-io/hibou-odoo/suite!736
2020-12-14 22:26:36 +00:00
Connor Christian
57170d6a74 [FIX] sale_payment_web: incorrect call on super 2020-12-14 17:25:24 -05:00
Kaylie Kipe
4a0b079507 Merge branch 'new/13.0/sale_payment_web' into '13.0'
new/13.0/sale_payment_web into 13.0

See merge request hibou-io/hibou-odoo/suite!506
2020-12-14 19:43:36 +00:00
Jared Kipe
807e1f4268 Merge branch 'fix/13.0/hr_payroll_overtime__view_colspan' into '13.0'
fix/13.0/hr_payroll_overtime__view_colspan into 13.0

See merge request hibou-io/hibou-odoo/suite!733
2020-12-10 22:03:29 +00:00
Hibou Bot
d2ee5a159a Merge branch 'fix/13.0/hr_payroll_overtime__view_colspan' into '13.0-test'
fix/13.0/hr_payroll_overtime__view_colspan into 13.0-test

See merge request hibou-io/hibou-odoo/suite!732
2020-12-10 22:02:13 +00:00
Jared Kipe
d87fa8c923 [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.
2020-12-10 14:01:00 -08:00
Jared Kipe
1934b45233 Merge branch 'imp/13.0/hr_payroll_overtime__exempt' into '13.0'
imp/13.0/hr_payroll_overtime__exempt into 13.0

See merge request hibou-io/hibou-odoo/suite!729
2020-12-10 21:20:26 +00:00
Hibou Bot
5b5ffbb6ea Merge branch 'imp/13.0/hr_payroll_overtime__exempt' into '13.0-test'
imp/13.0/hr_payroll_overtime__exempt into 13.0-test

See merge request hibou-io/hibou-odoo/suite!728
2020-12-10 17:41:18 +00:00
Jared Kipe
8d41b9c574 [IMP] hr_payroll_overtime: implement exempt from overtime on contract 2020-12-10 09:40:06 -08:00
Jared Kipe
33a20ffa02 Merge branch 'imp/13.0/hr_payroll_overtime__work_type_override' into '13.0'
imp/13.0/hr_payroll_overtime__work_type_override into 13.0

See merge request hibou-io/hibou-odoo/suite!726
2020-12-10 17:29:49 +00:00
Hibou Bot
ad18d63396 Merge branch 'imp/13.0/hr_payroll_overtime__work_type_override' into '13.0-test'
imp/13.0/hr_payroll_overtime__work_type_override into 13.0-test

See merge request hibou-io/hibou-odoo/suite!725
2020-12-09 23:55:22 +00:00
Jared Kipe
72c5a219fb [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:21:29 -08:00
Jared Kipe
755e28a3c7 Merge branch 'add/13.0/box_base' into 13.0-test
# Conflicts:
#	.gitmodules
2020-12-09 12:00:12 -08:00
Jared Kipe
df379f4bee [MOV] shipbox: remove hibou-shipbox submodule, use shipbox module from hiboubox submodule 2020-12-09 11:56:00 -08:00
Jared Kipe
65f1c709b5 [ADD] box_base, box_printbox, box_shipbox: from submodule hiboubox 2020-12-09 11:42:03 -08:00
Jared Kipe
c05eab6598 Merge branch 'imp/13.0/hr_payroll_attendance__normalize_leaves' into '13.0'
imp/13.0/hr_payroll_attendance__normalize_leaves into 13.0

See merge request hibou-io/hibou-odoo/suite!706
2020-11-26 12:22:10 +00:00
Jared Kipe
9318a7d566 Merge branch 'imp/13.0/hr_payroll_timesheet__normalize_leaves' into '13.0'
imp/13.0/hr_payroll_timesheet__normalize_leaves into 13.0

See merge request hibou-io/hibou-odoo/suite!704
2020-11-26 12:17:32 +00:00
Hibou Bot
e3962e4f2e Merge branch 'imp/13.0/hr_payroll_attendance__normalize_leaves' into '13.0-test'
imp/13.0/hr_payroll_attendance__normalize_leaves into 13.0-test

See merge request hibou-io/hibou-odoo/suite!705
2020-11-26 12:16:29 +00:00
Jared Kipe
5879874f74 [IMP] hr_payroll_attendance: normalize 'amount' on leave lines, require hibou_professional 2020-11-26 04:15:20 -08:00
Hibou Bot
5dc49fec65 Merge branch 'imp/13.0/hr_payroll_timesheet__normalize_leaves' into '13.0-test'
imp/13.0/hr_payroll_timesheet__normalize_leaves into 13.0-test

See merge request hibou-io/hibou-odoo/suite!703
2020-11-26 12:02:40 +00:00