Commit Graph

783 Commits

Author SHA1 Message Date
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
Jared Kipe
020842a7b2 [IMP] hr_payroll_timesheet: normalize 'amount' on leave lines, require hibou_professional 2020-11-26 04:01:28 -08:00
Hibou Bot
9be47632ff Merge branch 'new/13.0/sale_payment_web' into '13.0-test'
new/13.0/sale_payment_web into 13.0-test

See merge request hibou-io/hibou-odoo/suite!696
2020-11-23 23:33:32 +00:00
Connor Christian
9171b08b7c [ADD] sale_payment_web: add further functionalities to register payment wizard 2020-11-23 18:32:26 -05:00
Leighton Pennicott
5e77fcaa81 Merge branch 'mig/13.0/purchase_by_sale_history' into 13.0-test
# Conflicts:
#	purchase_by_sale_history/tests/test_purchase_by_sale_history.py
#	purchase_by_sale_history/wizard/purchase_by_sale_history.py
2020-11-23 18:06:13 -05:00
Jared Kipe
fd2b48ddd4 Merge branch 'mig/13.0/purchase_by_sale_history' into '13.0'
mig/13.0/purchase_by_sale_history into 13.0

See merge request hibou-io/hibou-odoo/suite!695
2020-11-23 22:30:50 +00:00
Leighton Pennicott
6076687d9b [MIG] purchase_by_sale_history: migrate to Odoo 13.0 2020-11-23 17:26:02 -05:00
Jared Kipe
4a93bd81cf 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-23 19:55:27 +00:00
Jared Kipe
e8eb2fec5e MIG purchase_by_sale_history to 12.0 2020-11-23 19:55:27 +00:00
Jared Kipe
2099272c5c 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-23 19:55:27 +00:00
Jared Kipe
dd0056d21b Initial commit of purchase_by_sale_history module for 11.0 2020-11-23 19:55:27 +00:00
Hibou Bot
f01b3616fb Merge branch 'mig/13.0/purchase_by_sale_history' into '13.0-test'
mig/13.0/purchase_by_sale_history into 13.0-test

See merge request hibou-io/hibou-odoo/suite!682
2020-11-20 18:43:19 +00:00
Leighton Pennicott
fd91854c97 [MIG] purchase_by_sale_history: migrate to Odoo 13.0 2020-11-20 13:41:40 -05:00
Hibou Bot
ecaf14036f Merge branch 'mig/13.0/purchase_by_sale_history' into '13.0-test'
mig/13.0/purchase_by_sale_history into 13.0-test

See merge request hibou-io/hibou-odoo/suite!681
2020-11-20 17:39:30 +00:00
Leighton Pennicott
615934b543 [MIG] purchase_by_sale_history: migrate to Odoo 13.0 2020-11-20 12:37:14 -05:00
Hibou Bot
7a316445dd Merge branch 'mig/13.0/purchase_by_sale_history' into '13.0-test'
mig/13.0/purchase_by_sale_history into 13.0-test

See merge request hibou-io/hibou-odoo/suite!679
2020-11-19 22:21:30 +00:00