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,068 Commits 170 Branches 0 Tags
b482196735652db1af1d337f11db6b699747bf1a
Commit Graph

1068 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jared Kipe
b482196735 Merge branch '13.0' into 13.0-test 2022-03-11 09:05:30 -08:00
Jared Kipe
8d6b5bddca [IMP] stock_delivery_planner: method to collect carriers to make it easier to provide or filter 2022-03-11 09:05:07 -08:00
Jared Kipe
b364aca90b [IMP] stock_delivery_planner: method to collect carriers to make it easier to provide or filter 2022-03-11 09:04:48 -08:00
Jared Kipe
ab9d5e74b2 Merge branch '13.0' into 13.0-test 2022-03-09 13:49:14 -08:00
Jared Kipe
b439e243bd [IMP] delivery_stamps: add GlobalPost methods and APO/FPO 2022-03-09 13:49:02 -08:00
Jared Kipe
87fef48e9e Merge branch '13.0' into 13.0-test 
# Conflicts:
#	delivery_hibou/views/stock_views.xml
 2022-02-18 15:37:56 -08:00
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
77dbe6a46f Merge branch 'wip/13.0/delivery_hibou__sig_req' into 13.0-test 
# Conflicts:
#	delivery_hibou/views/stock_views.xml
 2022-02-15 12:42:57 -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
cd66104b84 Merge branch '13.0' into 13.0-test 2022-02-01 15:46:24 -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
Hibou Bot
74f3651a42 Merge branch 'fix/13.0/hr_commission___sale_documents_only' into '13.0-test' 
fix/13.0/hr_commission___sale_documents_only into 13.0-test

See merge request hibou-io/hibou-odoo/suite!1329
 2022-02-01 22:04:59 +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
Hibou Bot
7c6fd85fe4 Merge branch 'new/13.0/hr_commission_timesheet' into '13.0-test' 
new/13.0/hr_commission_timesheet into 13.0-test

See merge request hibou-io/hibou-odoo/suite!1327
 2022-02-01 00:38:20 +00:00
Jared Kipe
90155ab305 [ADD] hr_commission_timesheet: for 13.0 2022-01-31 16:37:03 -08:00
Hibou Bot
c42c32afc8 Merge branch 'new/13.0/hr_commission_sale' into '13.0-test' 
new/13.0/hr_commission_sale into 13.0-test

See merge request hibou-io/hibou-odoo/suite!1325
 2022-02-01 00:33:48 +00: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
Hibou Bot
0391583ffc Merge branch 'imp/13.0/hr_commission__ready_timesheet' into '13.0-test' 
imp/13.0/hr_commission__ready_timesheet into 13.0-test

See merge request hibou-io/hibou-odoo/suite!1323
 2022-02-01 00:23:33 +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
Hibou Bot
455a7483e7 Merge branch 'imp/13.0/payroll_2022' into '13.0-test' 
imp/13.0/payroll_2022 into 13.0-test

See merge request hibou-io/hibou-odoo/suite!1270
 2022-01-14 15:18:19 +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
Hibou Bot
a06cc06a2b Merge branch 'fix/13.0/H9311_rma_sale__use_union_operator' into '13.0-test' 
fix/13.0/H9311_rma_sale__use_union_operator into 13.0-test

See merge request hibou-io/hibou-odoo/suite!1240
 2022-01-04 00:31:15 +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
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