mirror of
https://gitlab.com/hibou-io/hibou-odoo/suite.git
synced 2025-01-20 12:37:31 +02:00
Merge branch 'new/13.0/hr_commission' into 13.0
# Conflicts: # hr_commission/views/commission_views.xml
This commit is contained in:
@@ -9,6 +9,7 @@
|
|||||||
'website': 'https://hibou.io/',
|
'website': 'https://hibou.io/',
|
||||||
'depends': [
|
'depends': [
|
||||||
# 'account_invoice_margin', # optional
|
# 'account_invoice_margin', # optional
|
||||||
|
'hibou_professional',
|
||||||
'hr_contract',
|
'hr_contract',
|
||||||
],
|
],
|
||||||
'data': [
|
'data': [
|
||||||
|
|||||||
@@ -24,8 +24,8 @@ class AccountMove(models.Model):
|
|||||||
'context': {'search_default_source_move_id': self[0].id}
|
'context': {'search_default_source_move_id': self[0].id}
|
||||||
}
|
}
|
||||||
|
|
||||||
def action_post(self):
|
def post(self):
|
||||||
res = super(AccountMove, self).action_post()
|
res = super(AccountMove, self).post()
|
||||||
invoices = self.filtered(lambda m: m.is_invoice())
|
invoices = self.filtered(lambda m: m.is_invoice())
|
||||||
if invoices:
|
if invoices:
|
||||||
self.env['hr.commission'].invoice_validated(invoices)
|
self.env['hr.commission'].invoice_validated(invoices)
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ from odoo.tests import common
|
|||||||
|
|
||||||
|
|
||||||
class TestCommission(common.TransactionCase):
|
class TestCommission(common.TransactionCase):
|
||||||
|
# TODO refactor tests to not require sale.order
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super().setUp()
|
super().setUp()
|
||||||
|
|||||||
@@ -116,6 +116,20 @@
|
|||||||
<field name="view_mode">tree,form,pivot,graph</field>
|
<field name="view_mode">tree,form,pivot,graph</field>
|
||||||
</record>
|
</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
|
<menuitem
|
||||||
action="action_hr_commission"
|
action="action_hr_commission"
|
||||||
id="menu_action_account_commission_form"
|
id="menu_action_account_commission_form"
|
||||||
@@ -207,6 +221,13 @@ action = records.action_mark_paid()
|
|||||||
<field name="view_mode">tree,form</field>
|
<field name="view_mode">tree,form</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
|
<menuitem
|
||||||
|
action="action_hr_commission_payment"
|
||||||
|
id="menu_action_account_commission_payment_form"
|
||||||
|
parent="menu_action_account_commission_root"
|
||||||
|
sequence="10"
|
||||||
|
/>
|
||||||
|
|
||||||
<menuitem
|
<menuitem
|
||||||
action="action_hr_commission_payment"
|
action="action_hr_commission_payment"
|
||||||
id="menu_action_account_commission_payment_form"
|
id="menu_action_account_commission_payment_form"
|
||||||
|
|||||||
Reference in New Issue
Block a user