Release v6.0
This commit is contained in:
parent
989e0485eb
commit
67a501fc56
|
@ -2,10 +2,10 @@
|
|||
# this repository contains the full copyright notices and license terms.
|
||||
|
||||
from trytond.pool import Pool
|
||||
import commission
|
||||
import invoice
|
||||
import sale
|
||||
import agent
|
||||
from . import commission
|
||||
from . import invoice
|
||||
from . import sale
|
||||
from . import agent
|
||||
|
||||
|
||||
def register():
|
||||
|
|
|
@ -1,15 +1,9 @@
|
|||
# This file is part of Tryton. The COPYRIGHT file at the top level of
|
||||
# this repository contains the full copyright notices and license terms.
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from trytond.pool import PoolMeta
|
||||
|
||||
|
||||
__all__ = ['Move']
|
||||
|
||||
|
||||
class Move:
|
||||
__metaclass__ = PoolMeta
|
||||
class Move(metaclass=PoolMeta):
|
||||
__name__ = 'account.move'
|
||||
|
||||
@classmethod
|
||||
|
|
7
agent.py
7
agent.py
|
@ -8,9 +8,6 @@ from trytond.transaction import Transaction
|
|||
from trytond.wizard import Wizard, StateView, StateReport, Button, StateTransition
|
||||
from trytond.report import Report
|
||||
|
||||
__all__ = ['AgentCommissionSalesStart',
|
||||
'AgentCommissionSales', 'AgentCommissionSalesReport']
|
||||
|
||||
|
||||
class AgentCommissionSalesStart(ModelView):
|
||||
'Agent Commission Sales Start'
|
||||
|
@ -56,8 +53,8 @@ class AgentCommissionSalesReport(Report):
|
|||
__name__ = 'commission_global.agent_commission_sales_report'
|
||||
|
||||
@classmethod
|
||||
def get_context(cls, records, data):
|
||||
report_context = super(AgentCommissionSalesReport, cls).get_context(records, data)
|
||||
def get_context(cls, records, header, data):
|
||||
report_context = super().get_context(records, header, data)
|
||||
pool = Pool()
|
||||
Company = pool.get('company.company')
|
||||
Agent = pool.get('commission.agent')
|
||||
|
|
|
@ -8,10 +8,6 @@ from trytond.transaction import Transaction
|
|||
from trytond.wizard import Wizard, StateTransition
|
||||
|
||||
|
||||
__all__ = ['Plan', 'Commission', 'CreateInvoiceAsk',
|
||||
'CreateInvoice', 'CreateInvoiceDirect']
|
||||
|
||||
|
||||
class Plan(metaclass=PoolMeta):
|
||||
__name__ = 'commission.plan'
|
||||
percentage = fields.Float('Percentage', digits=(2,2))
|
||||
|
|
|
@ -1,15 +1,11 @@
|
|||
# This file is part of Tryton. The COPYRIGHT file at the top level of
|
||||
# this repository contains the full copyright notices and license terms.
|
||||
from __future__ import unicode_literals
|
||||
from decimal import Decimal
|
||||
|
||||
from trytond.pool import PoolMeta, Pool
|
||||
from trytond.model import fields
|
||||
|
||||
|
||||
__all__ = ['Invoice']
|
||||
|
||||
|
||||
class Invoice(metaclass=PoolMeta):
|
||||
__name__ = 'account.invoice'
|
||||
commission = fields.Float('Commission', states={
|
||||
|
|
3
party.py
3
party.py
|
@ -4,13 +4,12 @@
|
|||
from trytond.pool import Pool, PoolMeta
|
||||
from trytond.model import fields
|
||||
|
||||
__all__ = ['PartyDunningReport', 'Party']
|
||||
|
||||
|
||||
class Party(metaclass=PoolMeta):
|
||||
__name__ = 'party.party'
|
||||
agent = fields.Many2One('commission.agent', 'Agent')
|
||||
|
||||
|
||||
class PartyDunningReport(metaclass=PoolMeta):
|
||||
__name__ = 'invoice_report.party_dunning'
|
||||
|
||||
|
|
6
sale.py
6
sale.py
|
@ -1,15 +1,10 @@
|
|||
# This file is part of Tryton. The COPYRIGHT file at the top level of
|
||||
# this repository contains the full copyright notices and license terms.
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from trytond.pool import PoolMeta
|
||||
from trytond.model import fields
|
||||
from trytond.pyson import Eval
|
||||
|
||||
|
||||
__all__ = ['Sale', 'SaleLine']
|
||||
|
||||
|
||||
class Sale(metaclass=PoolMeta):
|
||||
__name__ = 'sale.sale'
|
||||
commission = fields.Float('Commission', states={
|
||||
|
@ -19,7 +14,6 @@ class Sale(metaclass=PoolMeta):
|
|||
def create_invoice(self):
|
||||
# FIXME maybe we need move thi method to sale_pos_commission
|
||||
invoice = super(Sale, self).create_invoice()
|
||||
print('Si entra a comision.......', invoice)
|
||||
if invoice:
|
||||
invoice.agent = self.agent
|
||||
invoice.commission = self.commission
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
[tryton]
|
||||
version=5.0.1
|
||||
version=6.0.0
|
||||
depends:
|
||||
ir
|
||||
account
|
||||
|
|
Loading…
Reference in New Issue