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

Merge branch 'fix/15.0/hr_commission__test_paid' into '15.0-test'

Browse Source 
fix/15.0/hr_commission__test_paid into 15.0-test

See merge request hibou-io/hibou-odoo/suite!1298
This commit is contained in:
Hibou Bot
2022-01-18 18:56:58 +00:00
parent 95cc879faa 7635274762
commit c737d7fd39
3 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
.theia/launch.json
View File

@@ -28,6 +28,26 @@
"--test-enable", "--no-xmlrpc", "--stop-after-init"], "--test-enable", "--no-xmlrpc", "--stop-after-init"],
"console": "integratedTerminal" "console": "integratedTerminal"
}, },
{
"name": "Odoo: INIT 'hr_commission'",
"type": "python",
"request": "launch",
"program": "/opt/odoo/hibou-suite/odoo-run.py",
"args": ["-i", "hr_commission",
"-u", "hr_commission",
"--stop-after-init"],
"console": "integratedTerminal"
},
{
"name": "Odoo: TEST 'hr_commission'",
"type": "python",
"request": "launch",
"program": "/opt/odoo/hibou-suite/odoo-run.py",
"args": ["-i", "hr_commission",
"-u", "hr_commission",
"--test-enable", "--no-xmlrpc", "--stop-after-init"],
"console": "integratedTerminal"
},
{ {
"name": "Odoo: INIT 'hr_payroll_hibou'", "name": "Odoo: INIT 'hr_payroll_hibou'",
"type": "python", "type": "python",

4
hr_commission/tests/test_commission.py
View File

@@ -114,7 +114,7 @@ class TestCommission(common.TransactionCase):
receivable_line = payment.move_id.line_ids.filtered('credit') receivable_line = payment.move_id.line_ids.filtered('credit')
inv.js_assign_outstanding_line(receivable_line.id) inv.js_assign_outstanding_line(receivable_line.id)
self.assertEqual(inv.payment_state, 'in_payment', 'Invoice is not paid.') self.assertEqual(inv.payment_state, 'paid', 'Invoice is not paid.')
user_commission = inv.commission_ids.filtered(lambda c: c.employee_id.id == emp.id) user_commission = inv.commission_ids.filtered(lambda c: c.employee_id.id == emp.id)
self.assertEqual(user_commission.state, 'done', 'Commission is not done.') self.assertEqual(user_commission.state, 'done', 'Commission is not done.')
@@ -274,7 +274,7 @@ class TestCommission(common.TransactionCase):
receivable_line = payment.move_id.line_ids.filtered('credit') receivable_line = payment.move_id.line_ids.filtered('credit')
inv.js_assign_outstanding_line(receivable_line.id) inv.js_assign_outstanding_line(receivable_line.id)
self.assertEqual(inv.payment_state, 'in_payment', 'Invoice is not paid.') self.assertEqual(inv.payment_state, 'paid', 'Invoice is not paid.')
user_commission = inv.commission_ids.filtered(lambda c: c.employee_id.id == emp.id) user_commission = inv.commission_ids.filtered(lambda c: c.employee_id.id == emp.id)
self.assertEqual(user_commission.state, 'done', 'Commission is not done.') self.assertEqual(user_commission.state, 'done', 'Commission is not done.')

4
hr_commission/views/res_config_settings_views.xml
View File

@@ -7,9 +7,9 @@
<field name="priority" eval="50"/> <field name="priority" eval="50"/>
<field name="inherit_id" ref="account.res_config_settings_view_form"/> <field name="inherit_id" ref="account.res_config_settings_view_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//div[@id='invoicing_settings']" position="after"> <xpath expr="//div[hasclass('settings')]" position="inside">
<h2>Commissions</h2> <h2>Commissions</h2>
<div class="row mt16 o_settings_container" id="commission_settings" groups="account.group_account_user"> <div class="row mt16 o_settings_container" id="commission_settings" groups="account.group_account_manager">
<div class="col-xs-12 col-md-6 o_setting_box" title="These taxes are set in any new product created."> <div class="col-xs-12 col-md-6 o_setting_box" title="These taxes are set in any new product created.">
<div class="o_setting_left_pane"/> <div class="o_setting_left_pane"/>
<div class="o_setting_right_pane"> <div class="o_setting_right_pane">