Skip to content

Commit

Permalink
[MIG] sale_commission: : Migrated to 10.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Nicola Malcontenti committed Mar 28, 2017
1 parent fb9a232 commit 594ecb1
Show file tree
Hide file tree
Showing 23 changed files with 69 additions and 334 deletions.
23 changes: 12 additions & 11 deletions sale_commission/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,16 @@ Known issues / Roadmap
Bug Tracker
===========

Bugs are tracked on `GitHub Issues <https://github.com/OCA/commission/issues>`_.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us smashing it by providing a detailed and welcomed feedback
`here <https://github.com/OCA/commission/issues/new?body=module:%20sale_commission%0Aversion:%208.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
Bugs are tracked on `GitHub Issues
<https://github.com/OCA/commission/issues>`_. In case of trouble, please
check there if your issue has already been reported. If you spotted it first,
help us smash it by providing detailed and welcomed feedback.


Credits
=======


Contributors
------------
* Pexego.
Expand All @@ -44,23 +45,23 @@ Contributors
* Daniel Campos <danielcampos@avanzosc.es>
* Pedro M. Baeza <pedro.baeza@serviciosbaeza.com>
* Oihane Crucelaegui <oihanecruce@gmail.com>
* Nicola Malcontenti <nicola.malcontenti@agilebg.com>

Icon
----
* http://commons.wikimedia.org/wiki/File:Percent_18e.svg
* https://openclipart.org/detail/43969/pile-of-golden-coins-by-j_alves
Images
-------
* Odoo Community Association: `Icon <https://github.com/OCA/maintainer-tools/blob/master/template/module/static/description/icon.svg>`_.

Maintainer
----------

.. image:: http://odoo-community.org/logo.png
.. image:: https://odoo-community.org/logo.png
:alt: Odoo Community Association
:target: http://odoo-community.org
:target: https://odoo-community.org

This module is maintained by the OCA.

OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and
promote its widespread use.

To contribute to this module, please visit http://odoo-community.org.
To contribute to this module, please visit https://odoo-community.org.
24 changes: 3 additions & 21 deletions sale_commission/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,15 @@

{
'name': 'Sales commissions',
'version': '8.0.2.3.0',
'author': 'Pexego, '
'Savoire-faire linux, '
'Avanzosc, '
'Abstract, '
'Serv. Tecnol. Avanzados - Pedro M. Baeza, '
'Odoo Community Association (OCA)',
'version': '10.0.1.0.0',
'author': 'Odoo Community Association (OCA)',
"category": "Sales Management",
'license': 'AGPL-3',
'depends': [
'base',
'account',
'product',
'sale'
],
'contributors': [
"Pexego",
"Davide Corio <davide.corio@domsense.com>",
"Joao Alfredo Gama Batista <joao.gama@savoirfairelinux.com>",
"Sandy Carter <sandy.carter@savoirfairelinux.com>",
"Giorgio Borelli <giorgio.borelli@abstract.it>",
"Daniel Campos <danielcampos@avanzosc.es>",
"Pedro M. Baeza <pedro.baeza@serviciosbaeza.com>",
"Oihane Crucelaegui <oihanecruce@gmail.com>",
"Iván Todorovich <ivan.todorovich@gmail.com",
],
"data": [
"security/ir.model.access.csv",
"views/product_template_view.xml",
Expand All @@ -42,13 +25,12 @@
"views/settlement_view.xml",
"wizard/wizard_settle.xml",
"wizard/wizard_invoice.xml",
# "report/cc_commission_report.xml"
],
"demo": [
'demo/sale_agent_demo.xml',
],
'test': [
'test/sale_commission_demo.yml',
],
'installable': False
'installable': True
}
4 changes: 2 additions & 2 deletions sale_commission/demo/sale_agent_demo.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<openerp>
<odoo>
<data>

<!-- Create the Commission Types -->
Expand Down Expand Up @@ -54,4 +54,4 @@
</record>

</data>
</openerp>
</odoo>
8 changes: 4 additions & 4 deletions sale_commission/models/account_invoice.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@
# © 2015 Pedro M. Baeza (<http://www.serviciosbaeza.com>)
# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html

from openerp import api, fields, models
from odoo import api, fields, models


class AccountInvoice(models.Model):
"""Invoice inherit to add salesman"""
_inherit = "account.invoice"

@api.depends('invoice_line.agents.amount')
@api.depends('invoice_line_ids.agents.amount')
def _compute_commission_total(self):
for record in self:
record.commission_total = 0.0
for line in record.invoice_line:
for line in record.invoice_line_ids:
record.commission_total += sum(x.amount for x in line.agents)

commission_total = fields.Float(
Expand Down Expand Up @@ -53,7 +53,7 @@ def _refund_cleanup_lines(self, lines):
for agent in agents:
agent_vals = agent[2]
del agent_vals['invoice']
del agent_vals['invoice_line']
del agent_vals['invoice_line_ids']
vals['agents'] = agents
return res

Expand Down
2 changes: 1 addition & 1 deletion sale_commission/models/product_template.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# © 2015 Pedro M. Baeza (<http://www.serviciosbaeza.com>)
# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html

from openerp import fields, models
from odoo import fields, models


class ProductTemplate(models.Model):
Expand Down
2 changes: 1 addition & 1 deletion sale_commission/models/res_partner.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# © 2015 Pedro M. Baeza (<http://www.serviciosbaeza.com>)
# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html

from openerp import api, fields, models
from odoo import api, fields, models


class ResPartner(models.Model):
Expand Down
11 changes: 6 additions & 5 deletions sale_commission/models/sale_commission.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# © 2015 Pedro M. Baeza (<http://www.serviciosbaeza.com>)
# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html

from openerp import api, exceptions, fields, models, _
from odoo import api, exceptions, fields, models, _


class SaleCommission(models.Model):
Expand Down Expand Up @@ -47,9 +47,10 @@ class SaleCommissionSection(models.Model):
amount_to = fields.Float(string="To")
percent = fields.Float(string="Percent", required=True)

@api.one
@api.multi
@api.constrains('amount_from', 'amount_to')
def _check_amounts(self):
if self.amount_to < self.amount_from:
raise exceptions.ValidationError(
_("The lower limit cannot be greater than upper one."))
for section in self:
if self.amount_to < self.amount_from:
raise exceptions.ValidationError(
_("The lower limit cannot be greater than upper one."))
2 changes: 1 addition & 1 deletion sale_commission/models/sale_order.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# © 2015 Pedro M. Baeza (<http://www.serviciosbaeza.com>)
# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html

from openerp import api, fields, models
from odoo import api, fields, models


class SaleOrder(models.Model):
Expand Down
6 changes: 3 additions & 3 deletions sale_commission/models/settlement.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# © 2015 Pedro M. Baeza (<http://www.serviciosbaeza.com>)
# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html

from openerp import api, exceptions, fields, models, _
from odoo import api, exceptions, fields, models, _


class Settlement(models.Model):
Expand Down Expand Up @@ -142,8 +142,8 @@ def make_invoices(self, journal, refund_journal, product, date=False):
if invoice_vals['type'] == 'in_refund':
for line in invoice_lines_vals:
line['price_unit'] = -line['price_unit']
invoice_vals['invoice_line'] = [(0, 0, x)
for x in invoice_lines_vals]
invoice_vals['invoice_line_ids'] = [(0, 0, x)
for x in invoice_lines_vals]
invoice = invoice_obj.create(invoice_vals)
settlement.state = 'invoiced'
settlement.invoice = invoice.id
Expand Down
11 changes: 0 additions & 11 deletions sale_commission/report/cc_commission_report.xml

This file was deleted.

Loading

0 comments on commit 594ecb1

Please sign in to comment.