Commit Graph

768 Commits

Author SHA1 Message Date
Jared Kipe
d273ed9110 [FIX] delivery_hibou: adding fields that are ambiguous breaks existing xpaths 2022-02-18 15:33:58 -08:00
Jared Kipe
846a39f38e Merge branch 'wip/13.0/delivery_hibou__sig_req' into 13.0
# Conflicts:
# delivery_hibou/models/stock.py
# delivery_hibou/views/stock_views.xml
2022-02-15 12:45:10 -08:00
Jared Kipe
cf0c7a496a [FIX] sale_planner: non-multi fall back option 2022-02-09 09:46:31 -08:00
Jared Kipe
83c3006676 [FIX] delivery_fedex_hibou,delivery_hibou,delivery_ups_hibou,sale_planner: choose delivery packaging, warehouse specific fedex for 13 2022-02-08 12:32:45 -08:00
Jared Kipe
ca6ec69e2b [REL] delivery_fedex_hibou,delivery_gso,delivery_hibou,delivery_ups_hibou,sale_planner,stock_delivery_planner: per-package tracking from 11.0 2022-02-07 13:30:21 -08:00
Jared Kipe
bd98023478 pull Athene from 15 2022-02-01 15:46:08 -08:00
Jared Kipe
6318695aa4 Merge branch 'fix/13.0/hr_commission___sale_documents_only' into '13.0'
fix/13.0/hr_commission___sale_documents_only into 13.0

See merge request hibou-io/hibou-odoo/suite!1330
2022-02-01 22:13:44 +00:00
Jared Kipe
ff80fb96ed [FIX] hr_commission: filter to sales invoices
Additionally, don't require salesperson (e.g. commission structure or timesheets)
2022-02-01 14:03:44 -08:00
Jared Kipe
c342993bfd Merge branch 'new/13.0/hr_commission_timesheet' into '13.0'
new/13.0/hr_commission_timesheet into 13.0

See merge request hibou-io/hibou-odoo/suite!1328
2022-02-01 01:35:21 +00:00
Jared Kipe
c51bf0b73b Merge branch 'new/13.0/hr_commission_sale' into '13.0'
new/13.0/hr_commission_sale into 13.0

See merge request hibou-io/hibou-odoo/suite!1326
2022-02-01 01:34:28 +00:00
Jared Kipe
90155ab305 [ADD] hr_commission_timesheet: for 13.0 2022-01-31 16:37:03 -08:00
Jared Kipe
5365dfcefc [ADD] hr_commission_sale: bridge module to add menus 2022-01-31 16:32:33 -08:00
Jared Kipe
f10fb8a986 Merge branch 'imp/13.0/hr_commission__ready_timesheet' into '13.0'
imp/13.0/hr_commission__ready_timesheet into 13.0

See merge request hibou-io/hibou-odoo/suite!1324
2022-02-01 00:27:09 +00:00
Jared Kipe
f5895e070b [IMP] hr_commission: extended ahead of timesheet based commission
* Allow invoice to see commission it is deriving amount for. This allows for basing on amounts that may depend on the employee or contract config.
* Prevent making commissions if the employee rate or admin rates are not set.
* Updated views to work in both CE and EE
2022-01-31 16:22:18 -08:00
Jared Kipe
39dcb66459 Merge branch 'imp/13.0/payroll_2022' into '13.0'
imp/13.0/payroll_2022 into 13.0

See merge request hibou-io/hibou-odoo/suite!1271
2022-01-14 18:14:45 +00:00
Jared Kipe
4aa82ccee9 [FIX] hr_payroll_hibou: for Odoo 13.0 2022-01-13 15:08:34 -08:00
Jared Kipe
33ab9f3019 [REL] hr_payroll_hibou,l10n_us_hr_payroll,l10n_us_hr_payroll_401k: 2022 2022-01-13 13:47:56 -08:00
Jared Kipe
379c8e4dbd [FIX] l10n_us_hr_payroll_account: use injected code for journal config 2022-01-10 10:34:52 -08:00
Cedric Collins
27999072d3 Merge branch 'fix/13.0/H9311_rma_sale__use_union_operator' into '13.0'
fix/13.0/H9311_rma_sale__use_union_operator into 13.0

See merge request hibou-io/hibou-odoo/suite!1241
2022-01-04 16:59:26 +00:00
Cedric Collins
9f11a0acb2 [FIX] rma_sale: use union operator for recordset instead of addition
H9311
2022-01-03 18:29:59 -06:00
Cedric Collins
b82a89035a Merge branch 'fix/13.0/H7674_base_exception_user__empty_description' into '13.0'
fix/13.0/H7674_base_exception_user__empty_description into 13.0

See merge request hibou-io/hibou-odoo/suite!1061
2021-12-28 19:42:20 +00:00
Jared Kipe
e01a981fa5 Merge branch 'new/13.0/athene' into '13.0'
new/13.0/athene into 13.0

See merge request hibou-io/hibou-odoo/suite!1227
2021-12-14 16:19:22 +00:00
Jared Kipe
7f6417aae2 [ADD] Hibou Athene, upstream builds, and runconfig for Odoo 2021-12-10 11:24:07 -08:00
Jared Kipe
e879cda87e Merge branch 'fix/13.0/l10n_us_hr_payroll_401k__only_fit_exempt' into '13.0'
fix/13.0/l10n_us_hr_payroll_401k__only_fit_exempt into 13.0

See merge request hibou-io/hibou-odoo/suite!1218
2021-12-07 23:04:30 +00:00
Jared Kipe
bb3cd7644d [FIX] l10n_us_hr_payroll: calculate ER as negative, not FICA/FUTA exempt 2021-12-07 13:35:54 -08:00
Cedric Collins
a621cc14e9 Merge branch 'fix/13.0/delivery_fedex_hibou__fix_intl_shipping' into '13.0'
fix/13.0/delivery_fedex_hibou__fix_intl_shipping into 13.0

See merge request hibou-io/hibou-odoo/suite!1194
2021-11-29 20:28:47 +00:00
Cedric Collins
4e33cca186 [FIX] delivery_fedex_hibou: get price per variant and fix reference to shipper_warehouse.partner_id 2021-11-29 14:24:56 -06:00
Jared Kipe
492630271b [FIX] delivery_fedex_hibou: 3rd party billing 2021-11-01 10:25:32 -07:00
Cedric Collins
e09ecee372 Merge branch 'fix/13.0/H5924_website_sale_payment_terms__refactor_amounts' into '13.0'
fix/13.0/H5924_website_sale_payment_terms__refactor_amounts into 13.0

See merge request hibou-io/hibou-odoo/suite!1166
2021-10-28 16:28:35 +00:00
Cedric Collins
a2a62b780f [FIX] website_sale_payment_terms: use amount_due_today to validate confirm without payment
H5924
2021-10-26 11:09:38 -05:00
Cedric Collins
b41e2c5783 [FIX] website_sale_payment_terms: fix errors in the payment process
* clear order terms if user rejects agreement
* set payment transaction amount to amount_due_today
* fix bad view inheritance spec
* fix default selected term when partner_term is not in website_terms
* do not render payment bypass form if amount_total is 0

H5924
2021-10-25 13:41:51 -05:00
Cedric Collins
2ed501ce2f [IMP] website_sale_payment_terms: remember term choice and restore Return to Cart button
H5924
2021-10-23 15:49:24 -05:00
Cedric Collins
94bbc7c8e9 [FIX] website_sale_payment_terms: calculate amounts based on term lines
add unit tests
refactor JS widget
H5924
2021-10-22 20:14:00 -05:00
Cedric Collins
5d2749772e Merge branch 'imp/13.0/website_sale_payment_terms__refactor_js' into '13.0'
imp/13.0/website_sale_payment_terms__refactor_js into 13.0

See merge request hibou-io/hibou-odoo/suite!1069
2021-10-22 18:45:27 +00:00
Cedric Collins
d0a2f75962 Merge branch 'fix/13.0/website_sale_payment_terms__access_error' into '13.0'
fix/13.0/website_sale_payment_terms__access_error into 13.0

See merge request hibou-io/hibou-odoo/suite!1067
2021-10-22 18:44:52 +00:00
Jared Kipe
0fea5c5eb2 [IMP] website_sale_signifyd: website handling via m2m to simplify setup 2021-10-21 12:57:08 -07:00
Kaylie Kipe
531cf7a6b2 Merge branch 'imp/13.0/H7261_delivery_hibou__filter_shipping_account' into '13.0'
imp/13.0/H7261_delivery_hibou__filter_shipping_account into 13.0

See merge request hibou-io/hibou-odoo/suite!1056
2021-10-12 22:54:23 +00:00
Kaylie Kipe
8f5fad4e3e [IMP] delivery_hibou: Added new field for commercial_partner_id and improved domain to show Shipping Accounts accordingly 2021-10-12 14:19:40 -07:00
Jared Kipe
ce3d4ed628 [IMP] delivery_gso: gso_convert package weight 2021-10-04 13:32:18 -07:00
Jared Kipe
279d6c0bf6 [IMP] delivery_fedex_hibou: fedex_convert package weight 2021-10-04 13:32:05 -07:00
Jared Kipe
8d2521142b [IMP] stock_delivery_planner: multi-rating per-package shipping backports from 14.0 2021-10-04 10:56:49 -07:00
Jared Kipe
c89967f764 [IMP] delivery_ups_hibou: multi-rating backports from 14.0 2021-10-04 10:56:19 -07:00
Jared Kipe
b441a010ce [IMP] delivery_stamps: multi-rating backports from 14.0 2021-10-04 10:55:58 -07:00
Jared Kipe
caf7f97d96 [IMP] delivery_gso: multi-rating backports from 14.0 2021-10-04 10:55:30 -07:00
Jared Kipe
7e3722a800 [IMP] delivery_fedex_hibou: multi-rating backports from 14.0 2021-10-04 10:54:35 -07:00
Jared Kipe
0941c34341 [IMP] delivery_hibou: multi rating and package tracking backports from 14.0 2021-10-04 10:54:08 -07:00
Jared Kipe
2533b61386 [FIX] delivery_fedex_hibou: don't use missing field (from sale_planner) 2021-09-29 07:45:53 -07:00
Cedric Collins
24d1b05931 [IMP] website_sale_payment_terms: leave payment button disabled if other modules set disabled reasons 2021-09-28 14:36:02 -05:00
Cedric Collins
7c6c933f96 [IMP] website_sale_payment_terms: refactor js into widget to facilitate inheritance 2021-09-27 21:21:29 -05:00
Cedric Collins
1f69eaf1ad [FIX] website_sale_payment_terms: give public user read access to payment terms 2021-09-27 11:11:19 -05:00