Commit Graph

831 Commits

Author SHA1 Message Date
Jared Kipe
c9a8644271 Merge branch '15.0' into 15.0-test 2022-06-24 13:22:41 -07:00
Jared Kipe
f4bb793834 Revert "[FIX] delivery_ups_hibou: use shipping weight over calculated"
This reverts commit b47b76ae6a.
2022-06-24 13:22:31 -07:00
Jared Kipe
a8ab6289ef Merge branch '15.0' into 15.0-test 2022-06-21 09:20:15 -07:00
Jared Kipe
b47b76ae6a [FIX] delivery_ups_hibou: use shipping weight over calculated 2022-06-21 16:16:25 +00:00
Jared Kipe
19a7824efa bump hiboubox 2022-06-21 16:15:20 +00:00
Hibou Bot
7086b94fe0 Merge branch 'imp/15.0/upstream' into '15.0-test'
imp/15.0/upstream into 15.0-test

See merge request hibou-io/hibou-odoo/suite!1434
2022-06-17 15:45:59 +00:00
Jared Kipe
9e1ad5b7ab Bump submodules to follow upstream. 2022-06-17 08:44:56 -07:00
Hibou Bot
3748d7f0c4 Merge branch 'imp/15.0/connector_opencart__product_management' into '15.0-test'
imp/15.0/connector_opencart__product_management into 15.0-test

See merge request hibou-io/hibou-odoo/suite!1432
2022-06-15 21:35:04 +00:00
Jared Kipe
a1d5364cdf [IMP] connector_opencart: add product name/skus to checkpoint activity 2022-06-15 21:33:51 +00:00
Jared Kipe
cca4bbf44e Merge branch '15.0' into 15.0-test 2022-06-15 21:24:05 +00:00
Jared Kipe
520f740e08 [FIX] delivery_hibou: performance on adding package 2022-06-15 21:23:39 +00:00
Jared Kipe
66f1fe6dfd Merge branch '15.0' into 15.0-test 2022-06-15 15:19:45 +00:00
Jared Kipe
33fa5b5e24 [FIX] l10n_pe_hr_payroll: remove assertions 2022-06-15 15:15:41 +00:00
Hibou Bot
ea9a8c68f7 Merge branch 'mig/15.0/payment_forte' into '15.0-test'
mig/15.0/payment_forte into 15.0-test

See merge request hibou-io/hibou-odoo/suite!1431
2022-06-08 18:31:10 +00:00
Jorge Che
e52c947da6 [MIG] payment_forte: to 15.0, add forte_type logic, clean-up code (WIP)
H4431
2022-06-08 18:29:16 +00:00
Hibou Bot
85a91a1cc9 Merge branch 'mig/15.0/payment_forte' into '15.0-test'
mig/15.0/payment_forte into 15.0-test

See merge request hibou-io/hibou-odoo/suite!1430
2022-06-08 15:53:07 +00:00
Jorge Che
d05d2b8042 [MIG] payment_forte: to 15.0, changes to make tests work (WIP)
H4431
2022-06-08 15:51:00 +00:00
Hibou Bot
7a6de8a1df Merge branch 'mig/15.0/payment_forte' into '15.0-test'
mig/15.0/payment_forte into 15.0-test

See merge request hibou-io/hibou-odoo/suite!1428
2022-06-07 15:46:11 +00:00
Jared Kipe
168661d1ec [MIG] payment_forte: to 15.0 (WIP) 2022-06-07 15:44:47 +00:00
Jared Kipe
827ba34753 Initial commit of Forte Payment integration and parts of hr_payroll_payment to support it. 2022-06-07 14:53:49 +00:00
Jared Kipe
30c38f2dfe Merge branch '15.0' into 15.0-test 2022-06-06 22:02:15 +00:00
Jared Kipe
57f28d8461 [ADD] mass_mailing_partner,mass_mailing_list_dynamic: from upstream 2022-06-06 21:59:39 +00:00
Jared Kipe
2778eb86bb Merge branch 'mig/15.0/mrp_bom_add' into '15.0'
WIP: mig/15.0/mrp_bom_add into 15.0

See merge request hibou-io/hibou-odoo/suite!1425
2022-06-01 19:35:29 +00:00
Hibou Bot
71eef2ed63 Merge branch 'mig/15.0/mrp_bom_add' into '15.0-test'
mig/15.0/mrp_bom_add into 15.0-test

See merge request hibou-io/hibou-odoo/suite!1424
2022-06-01 19:31:53 +00:00
Jared Kipe
9d69ae88a7 [MIG] mrp_bom_add: to 15.0 2022-06-01 19:29:57 +00:00
Bhoomi
fa5f6afa84 FIX mrp_bom_add Product Variant attributes set on BOM 2022-06-01 15:25:07 +00:00
Bhoomi
af7a0bfb4f MIG mrp_bom_add For Odoo 13.0 2022-06-01 15:25:07 +00:00
Jared Kipe
301f741591 IMP mrp_bom_add Optionally replace all existing lines on BoM for the selected product. 2022-06-01 15:25:07 +00:00
Jared Kipe
ec9a0417cb Initial commit of mrp_bom_add for 12.0 2022-06-01 15:25:07 +00:00
Jared Kipe
8dacce5932 Merge branch '15.0' into '15.0-test'
[FIX] delivery_gls_nl: field permissions in rating

See merge request hibou-io/hibou-odoo/suite!1423
2022-05-31 22:13:23 +00:00
Jared Kipe
5b28189b04 [FIX] delivery_gls_nl: field permissions in rating 2022-05-31 22:02:13 +00:00
Jared Kipe
3382ff7976 Merge branch '15.0' into 15.0-test 2022-05-23 22:51:16 +00:00
Jared Kipe
afb16de652 bump connector-ecommerce for fix to onchange 2022-05-23 22:50:48 +00:00
Jared Kipe
f3424a3851 Merge branch '15.0' into 15.0-test 2022-05-23 22:24:45 +00:00
Jared Kipe
729951af81 [FIX] auth_admin: deprecated Warning exception 2022-05-23 22:22:46 +00:00
Jared Kipe
768f2c38ca Merge branch 'fix/15.0/hr_payroll_gamification__badge_duplicate' into '15.0'
WIP: fix/15.0/hr_payroll_gamification__badge_duplicate into 15.0

See merge request hibou-io/hibou-odoo/suite!1422
2022-05-23 19:49:05 +00:00
Hibou Bot
f50d03220d Merge branch 'fix/15.0/hr_payroll_gamification__badge_duplicate' into '15.0-test'
fix/15.0/hr_payroll_gamification__badge_duplicate into 15.0-test

See merge request hibou-io/hibou-odoo/suite!1421
2022-05-23 19:24:29 +00:00
Jared Kipe
7c2a7bc2c3 [FIX] hr_payroll_gamification: modernize input line 2022-05-23 19:22:51 +00:00
Jared Kipe
a63681a820 Merge branch 'imp/15.0/sale_timesheet_work_entry_rat__compute_billing_amount' into '15.0'
WIP: imp/15.0/sale_timesheet_work_entry_rat__compute_billing_amount into 15.0

See merge request hibou-io/hibou-odoo/suite!1420
2022-05-23 19:15:23 +00:00
Hibou Bot
fd00301c49 Merge branch 'imp/15.0/sale_timesheet_work_entry_rat__compute_billing_amount' into '15.0-test'
imp/15.0/sale_timesheet_work_entry_rat__compute_billing_amount into 15.0-test

See merge request hibou-io/hibou-odoo/suite!1419
2022-05-23 18:50:42 +00:00
Jared Kipe
8c69cac537 [IMP] sale_timesheet_work_entry_rate: compute billing amount, display 2022-05-23 18:49:05 +00:00
Jared Kipe
cca3b6d632 Merge branch 'new/15.0/mail_debrand_mail_activity_board' into 15.0
# Conflicts:
#	.gitmodules
2022-05-23 09:26:14 -07:00
Jared Kipe
16172d29d8 Merge branch 'new/15.0/mail_debrand_mail_activity_board' into 15.0-test
# Conflicts:
#	.gitmodules
2022-05-23 09:25:37 -07:00
Jared Kipe
a2340bb775 [ADD] mail_activity_done: from OCA 15.0 2022-05-23 09:24:54 -07:00
Jared Kipe
f24c806459 Merge branch 'new/15.0/auditlog' into 15.0 2022-05-23 09:23:09 -07:00
Jared Kipe
fb1981b37c Merge branch 'new/15.0/web_m2x_options_web_m2x_options_manager' into '15.0'
WIP: new/15.0/web_m2x_options_web_m2x_options_manager into 15.0

See merge request hibou-io/hibou-odoo/suite!1414
2022-05-23 16:21:34 +00:00
Hibou Bot
3b67f158f1 Merge branch 'new/15.0/auditlog' into '15.0-test'
new/15.0/auditlog into 15.0-test

See merge request hibou-io/hibou-odoo/suite!1417
2022-05-23 15:48:54 +00:00
Jared Kipe
5709e7a019 [ADD] auditlog: from OCA 15.0 2022-05-23 15:46:48 +00:00
Jared Kipe
4cd577dc0a [ADD] mail_debrand,mail_activity_board: from OCA 15.0 2022-05-23 15:32:42 +00:00
Jared Kipe
1ca2103132 [FIX] athene: ignore local .var 2022-05-23 08:10:41 -07:00