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
1,032 Commits 170 Branches 0 Tags
a254b7fb940f2a9f6f58f12a91b8e86511c407d8
Commit Graph

1032 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hibou Bot
a254b7fb94 Merge branch 'new/13.0/athene' into '13.0-test' 
new/13.0/athene into 13.0-test

See merge request hibou-io/hibou-odoo/suite!1226
 2021-12-10 19:30:21 +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
Hibou Bot
1743c4b805 Merge branch 'fix/13.0/l10n_us_hr_payroll_401k__only_fit_exempt' into '13.0-test' 
fix/13.0/l10n_us_hr_payroll_401k__only_fit_exempt into 13.0-test

See merge request hibou-io/hibou-odoo/suite!1217
 2021-12-07 21:37:21 +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
Hibou Bot
fb21ead0a3 Merge branch 'fix/13.0/delivery_fedex_hibou__fix_intl_shipping' into '13.0-test' 
fix/13.0/delivery_fedex_hibou__fix_intl_shipping into 13.0-test

See merge request hibou-io/hibou-odoo/suite!1193
 2021-11-29 20:26:13 +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
Hibou Bot
29ba1ff015 Merge branch 'fix/13.0/H5924_website_sale_payment_terms__refactor_amounts' into '13.0-test' 
fix/13.0/H5924_website_sale_payment_terms__refactor_amounts into 13.0-test

See merge request hibou-io/hibou-odoo/suite!1165
 2021-10-26 16:11:21 +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
a7e9f4b53c Merge branch '13.0' into 13.0-test 2021-10-21 12:57:22 -07: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
2aeccfe123 Merge branch 'imp/13.0/H7261_delivery_hibou__filter_shipping_account' into 13.0-test 
# Conflicts:
#	delivery_hibou/models/stock.py
#	delivery_hibou/views/stock_views.xml
 2021-10-12 14:41:57 -07: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
79f9d1c02c Merge branch 'imp/13.0/delivery_planner_backport' into 13.0-test 
# Conflicts:
#	delivery_hibou/views/stock_views.xml
 2021-10-04 13:34:03 -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
ad86cd2e11 Merge branch '13.0' into 13.0-test 2021-09-29 07:46:11 -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
Hibou Bot
b39ab18820 Merge branch 'imp/13.0/website_sale_payment_terms__refactor_js' into '13.0-test' 
imp/13.0/website_sale_payment_terms__refactor_js into 13.0-test

See merge request hibou-io/hibou-odoo/suite!1070
 2021-09-28 19:37:17 +00: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
Hibou Bot
7fa790412b Merge branch 'imp/13.0/website_sale_payment_terms__refactor_js' into '13.0-test' 
imp/13.0/website_sale_payment_terms__refactor_js into 13.0-test

See merge request hibou-io/hibou-odoo/suite!1068
 2021-09-28 02:22:45 +00:00
Cedric Collins
7c6c933f96 [IMP] website_sale_payment_terms: refactor js into widget to facilitate inheritance 2021-09-27 21:21:29 -05:00
Hibou Bot
f005661217 Merge branch 'fix/13.0/website_sale_payment_terms__access_error' into '13.0-test' 
fix/13.0/website_sale_payment_terms__access_error into 13.0-test

See merge request hibou-io/hibou-odoo/suite!1066
 2021-09-27 16:12:34 +00: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
Jared Kipe
400981aadf Merge branch '13.0' into 13.0-test 2021-09-24 09:25:23 -07:00
Jared Kipe
9dc931a9f5 [IMP] l10n_us_hr_payroll: new September 2021 Ohio multiplier 2021-09-24 09:24:25 -07:00
Hibou Bot
959574c5e0 Merge branch 'fix/13.0/H7674_base_exception_user__empty_description' into '13.0-test' 
fix/13.0/H7674_base_exception_user__empty_description into 13.0-test

See merge request hibou-io/hibou-odoo/suite!1060
 2021-09-24 16:12:35 +00:00
Cedric Collins
84f4a3ee2b [FIX] base_exception_user: fix stack trace when exception description is False 
H7674
 2021-09-24 11:11:25 -05:00
Hibou Bot
a593baf3ae Merge branch 'imp/13.0/H7261_delivery_hibou__filter_shipping_account' into '13.0-test' 
imp/13.0/H7261_delivery_hibou__filter_shipping_account into 13.0-test

See merge request hibou-io/hibou-odoo/suite!1055
 2021-09-22 23:03:38 +00:00
Cedric Collins
33b7dbf91e [IMP] delivery_hibou: filter shipping account by partner on delivery orders 
H7261
 2021-09-22 17:47:56 -05:00
Kaylie Kipe
1a48375b51 Merge branch 'new/13.0/web_m2x_options' into '13.0' 
new/13.0/web_m2x_options into 13.0

See merge request hibou-io/hibou-odoo/suite!1050
 2021-09-22 19:04:55 +00:00
Kaylie Kipe
7158f1d27d Merge branch 'new/13.0/web_m2x_options' into 13.0-test 
# Conflicts:
#	.gitmodules
 2021-09-22 11:47:20 -07:00
Kaylie Kipe
5cd81ff9f3 [ADD] web_m2x_options: From upstream OCA for Odoo 13 2021-09-22 11:31:45 -07:00
Kaylie Kipe
13012b10d5 Merge branch 'new/13.0/H7539_base_exception_user_sale_exception_user_stock_exception' into '13.0' 
new/13.0/H7539_base_exception_user_sale_exception_user_stock_exception into 13.0

See merge request hibou-io/hibou-odoo/suite!1045
 2021-09-21 18:56:49 +00:00
Hibou Bot
d18426ada4 Merge branch 'new/13.0/H7539_base_exception_user_sale_exception_user_stock_exception' into '13.0-test' 
new/13.0/H7539_base_exception_user_sale_exception_user_stock_exception into 13.0-test

See merge request hibou-io/hibou-odoo/suite!1044
 2021-09-20 15:45:28 +00:00