Commit Graph

635 Commits

Author SHA1 Message Date
Hibou Bot
710ecddf4b Merge branch 'imp/15.0/hr_commission___timesheet' into '15.0-test'
imp/15.0/hr_commission___timesheet into 15.0-test

See merge request hibou-io/hibou-odoo/suite!1333
2022-02-01 22:18:50 +00:00
Jared Kipe
9a79def4bf [FIX] hr_commission: filter to sales invoices
Additionally, don't require salesperson (e.g. commission structure or timesheets)
2022-02-01 14:17:34 -08:00
Jared Kipe
9b0278002c [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-02-01 14:14:06 -08:00
Jared Kipe
d11f196592 [FIX] hr_commission: use new invoice level salesperson field 2022-01-31 16:16:34 -08:00
Cedric Collins
6ef238a558 Merge branch 'fix/15.0/sale_payment_deposit__fix_errors' into '15.0'
fix/15.0/sale_payment_deposit__fix_errors into 15.0

See merge request hibou-io/hibou-odoo/suite!1322
2022-01-28 01:54:20 +00:00
Hibou Bot
9df0e8b634 Merge branch 'fix/15.0/sale_payment_deposit__fix_errors' into '15.0-test'
fix/15.0/sale_payment_deposit__fix_errors into 15.0-test

See merge request hibou-io/hibou-odoo/suite!1321
2022-01-28 01:51:07 +00:00
Cedric Collins
a6a6c33361 [FIX] sale_payment_deposit: remove unneeded code and fix sale portal template 2022-01-27 19:49:52 -06:00
Cedric Collins
d3f9e546ee Merge branch 'mig/15.0/website_sale_payment_terms' into '15.0'
mig/15.0/website_sale_payment_terms into 15.0

See merge request hibou-io/hibou-odoo/suite!1320
2022-01-28 00:01:52 +00:00
Hibou Bot
c61c0cc16e Merge branch 'mig/15.0/website_sale_payment_terms' into '15.0-test'
mig/15.0/website_sale_payment_terms into 15.0-test

See merge request hibou-io/hibou-odoo/suite!1319
2022-01-27 23:58:27 +00:00
Cedric Collins
e4b3631565 [MIG] website_sale_payment_terms: migrate to 15.0
1. Use new web assets management
2. Set company currency in unit tests
3. Refactor payment transaction creation
2022-01-27 17:57:17 -06:00
Cedric Collins
862914cd69 [MIG] website_sale_payment_terms: migrated to 14.0
H5924
2022-01-27 18:05:22 +00:00
Cedric Collins
b94b27e33f [FIX] website_sale_payment_terms: use amount_due_today to validate confirm without payment
H5924
2022-01-27 18:05:22 +00:00
Cedric Collins
b79f9487b9 [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
2022-01-27 18:05:22 +00:00
Cedric Collins
7d758539c0 [IMP] website_sale_payment_terms: remember term choice and restore Return to Cart button
H5924
2022-01-27 18:05:22 +00:00
Cedric Collins
2372eeff83 [FIX] website_sale_payment_terms: calculate amounts based on term lines
add unit tests
refactor JS widget
H5924
2022-01-27 18:05:22 +00:00
Cedric Collins
4320de51e9 [IMP] website_sale_payment_terms: leave payment button disabled if other modules set disabled reasons 2022-01-27 18:05:21 +00:00
Cedric Collins
14c61df176 [IMP] website_sale_payment_terms: refactor js into widget to facilitate inheritance 2022-01-27 18:05:21 +00:00
Cedric Collins
99f8871ba4 [FIX] website_sale_payment_terms: give public user read access to payment terms 2022-01-27 18:05:21 +00:00
Cedric Collins
cb0c6361cc [ADD] website_sale_payment_terms: allow ecommerce customers to choose payment terms
H4799
2022-01-27 18:05:21 +00:00
Jared Kipe
e34bdbf52e Merge branch 'mig/15.0/hiboubox' into '15.0'
mig/15.0/hiboubox into 15.0

See merge request hibou-io/hibou-odoo/suite!1315
2022-01-25 21:38:54 +00:00
Hibou Bot
57566e6cc8 Merge branch 'mig/15.0/hiboubox' into '15.0-test'
mig/15.0/hiboubox into 15.0-test

See merge request hibou-io/hibou-odoo/suite!1314
2022-01-25 21:25:46 +00:00
Jared Kipe
4d20c77daf [MIG] box_*: to 15.0 2022-01-25 13:24:34 -08:00
Jared Kipe
c843532ea6 Merge branch 'fix/15.0/product_cores_report__move_type' into '15.0'
fix/15.0/product_cores_report__move_type into 15.0

See merge request hibou-io/hibou-odoo/suite!1313
2022-01-24 23:32:22 +00:00
Jared Kipe
e10135148f Merge branch 'fix/15.0/rma_product_cores__user_cores_wiz_access' into '15.0'
fix/15.0/rma_product_cores__user_cores_wiz_access into 15.0

See merge request hibou-io/hibou-odoo/suite!1311
2022-01-24 23:32:08 +00:00
Hibou Bot
ee8923930f Merge branch 'fix/15.0/product_cores_report__move_type' into '15.0-test'
fix/15.0/product_cores_report__move_type into 15.0-test

See merge request hibou-io/hibou-odoo/suite!1312
2022-01-24 23:21:28 +00:00
Jared Kipe
9b3b9b4b19 [FIX] product_cores_report: move_type field change 2022-01-24 15:20:12 -08:00
Hibou Bot
ee6902d25b Merge branch 'fix/15.0/rma_product_cores__user_cores_wiz_access' into '15.0-test'
fix/15.0/rma_product_cores__user_cores_wiz_access into 15.0-test

See merge request hibou-io/hibou-odoo/suite!1310
2022-01-24 23:11:49 +00:00
Jared Kipe
f1b7513a2c [FIX] rma_product_cores: ACL for add lines wizard 2022-01-24 15:10:33 -08:00
Jared Kipe
a299632aaa Merge branch 'fix/15.0/hr_payroll_payment__method_line' into '15.0'
fix/15.0/hr_payroll_payment__method_line into 15.0

See merge request hibou-io/hibou-odoo/suite!1303
2022-01-19 15:34:08 +00:00
Jared Kipe
c512dbf843 Merge branch 'fix/15.0/hr_payroll_attendance__create_attn' into '15.0'
fix/15.0/hr_payroll_attendance__create_attn into 15.0

See merge request hibou-io/hibou-odoo/suite!1301
2022-01-19 15:33:53 +00:00
Hibou Bot
03af50d277 Merge branch 'fix/15.0/hr_payroll_payment__method_line' into '15.0-test'
fix/15.0/hr_payroll_payment__method_line into 15.0-test

See merge request hibou-io/hibou-odoo/suite!1302
2022-01-19 00:15:13 +00:00
Jared Kipe
f506fce6d6 [FIX] hr_payroll_payment: find/use method lines for journal in 15 2022-01-18 16:13:52 -08:00
Hibou Bot
e0a21642f5 Merge branch 'fix/15.0/hr_payroll_attendance__create_attn' into '15.0-test'
fix/15.0/hr_payroll_attendance__create_attn into 15.0-test

See merge request hibou-io/hibou-odoo/suite!1300
2022-01-18 23:32:56 +00:00
Jared Kipe
c086446bac [FIX] hr_payroll_attendance: exception with .exists() 2022-01-18 15:31:40 -08:00
Hibou Bot
c737d7fd39 Merge branch 'fix/15.0/hr_commission__test_paid' into '15.0-test'
fix/15.0/hr_commission__test_paid into 15.0-test

See merge request hibou-io/hibou-odoo/suite!1298
2022-01-18 18:56:58 +00:00
Jared Kipe
7635274762 [FIX] hr_commission: tests can now be 'paid', use invoicing manager group 2022-01-18 10:55:41 -08:00
Cedric Collins
7df176e74b Merge branch 'mig/15.0/sale_exception_website' into '15.0'
mig/15.0/sale_exception_website into 15.0

See merge request hibou-io/hibou-odoo/suite!1295
2022-01-17 06:02:28 +00:00
Hibou Bot
95cc879faa Merge branch 'mig/15.0/sale_exception_website' into '15.0-test'
mig/15.0/sale_exception_website into 15.0-test

See merge request hibou-io/hibou-odoo/suite!1294
2022-01-17 05:57:16 +00:00
Cedric Collins
af211c112b [MIG] sale_exception_website: bump version 2022-01-16 23:56:01 -06:00
Cedric Collins
eb1e88da43 [MIG] sale_exception_website: migrate to 14.0
H5655
2022-01-17 05:40:25 +00:00
Cedric Collins
42177b4a83 [ADD] sale_exception_website: display sale exceptions and prevent purchase
H4721
2022-01-17 05:40:25 +00:00
Cedric Collins
048ec5a53a Merge branch 'mig/15.0/sale_exception_portal' into '15.0'
mig/15.0/sale_exception_portal into 15.0

See merge request hibou-io/hibou-odoo/suite!1293
2022-01-17 05:39:45 +00:00
Hibou Bot
a36625c645 Merge branch 'mig/15.0/sale_exception_portal' into '15.0-test'
mig/15.0/sale_exception_portal into 15.0-test

See merge request hibou-io/hibou-odoo/suite!1292
2022-01-17 05:36:31 +00:00
Cedric Collins
0de8e097ee [MIG] sale_exception_portal: bump version and fix test exception 2022-01-16 23:35:16 -06:00
Cedric Collins
1c8d02e628 [MIG] sale_exception_portal: migrate to 14.0
H5654
2022-01-17 05:16:41 +00:00
Cedric Collins
b9e0dad10a [IMP] sale_exception_portal: add tests and use safe_eval
H5654
2022-01-17 05:16:41 +00:00
Cedric Collins
8363dc3657 [ADD] sale_exception_portal: show exceptions on portal
H4721
2022-01-17 05:16:40 +00:00
Cedric Collins
9959acd46f Merge branch 'mig/15.0/base_exception_user' into '15.0'
mig/15.0/base_exception_user into 15.0

See merge request hibou-io/hibou-odoo/suite!1291
2022-01-17 05:12:59 +00:00
Hibou Bot
da8ab689c6 Merge branch 'mig/15.0/base_exception_user' into '15.0-test'
mig/15.0/base_exception_user into 15.0-test

See merge request hibou-io/hibou-odoo/suite!1290
2022-01-17 05:09:50 +00:00
Cedric Collins
5c5cf02637 [IMP] base_exception_user: comment out broken test 2022-01-16 23:08:36 -06:00