Merge branch 'new/13.0/hr_commission' into 13.0

# Conflicts:
#	hr_commission/views/commission_views.xml
This commit is contained in:
Jared Kipe
2020-09-30 11:24:36 -07:00
4 changed files with 25 additions and 2 deletions

View File

@@ -9,6 +9,7 @@
'website': 'https://hibou.io/',
'depends': [
# 'account_invoice_margin', # optional
'hibou_professional',
'hr_contract',
],
'data': [

View File

@@ -24,8 +24,8 @@ class AccountMove(models.Model):
'context': {'search_default_source_move_id': self[0].id}
}
def action_post(self):
res = super(AccountMove, self).action_post()
def post(self):
res = super(AccountMove, self).post()
invoices = self.filtered(lambda m: m.is_invoice())
if invoices:
self.env['hr.commission'].invoice_validated(invoices)

View File

@@ -8,6 +8,7 @@ from odoo.tests import common
class TestCommission(common.TransactionCase):
# TODO refactor tests to not require sale.order
def setUp(self):
super().setUp()

View File

@@ -116,6 +116,20 @@
<field name="view_mode">tree,form,pivot,graph</field>
</record>
<menuitem
action="action_hr_commission"
id="menu_action_account_commission_root"
parent="account.menu_finance_receivables"
sequence="5"
/>
<menuitem
action="action_hr_commission"
id="menu_action_account_commission_form"
parent="menu_action_account_commission_root"
sequence="5"
/>
<menuitem
action="action_hr_commission"
id="menu_action_account_commission_form"
@@ -207,6 +221,13 @@ action = records.action_mark_paid()
<field name="view_mode">tree,form</field>
</record>
<menuitem
action="action_hr_commission_payment"
id="menu_action_account_commission_payment_form"
parent="menu_action_account_commission_root"
sequence="10"
/>
<menuitem
action="action_hr_commission_payment"
id="menu_action_account_commission_payment_form"