tryton-do/tryton
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Allow to define many relativedelta on payment term

Browse Source 
Replace the set of fields defined on payment term line by a list of
relativedelta containing the same set of fields.

issue4573
review6911002
This commit is contained in:
Cédric Krier
2015-03-02 23:28:12 +01:00
parent 77011c9b6b
commit ff0a261389
15 changed files with 231 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG
+1
View File
@@ -1,3 +1,4 @@
* Allow to define many relativedelta on payment term
* Add test wizard for payment term
* Use TaxableMixin
__init__.py
+1
View File
@@ -12,6 +12,7 @@ def register():
Pool.register(
PaymentTerm,
PaymentTermLine,
PaymentTermLineRelativeDelta,
TestPaymentTermView,
TestPaymentTermViewResult,
Invoice,
payment_term.py
+106 -48
View File
@@ -3,7 +3,7 @@
from decimal import Decimal
from dateutil.relativedelta import relativedelta
from sql import Null
from sql import Null, Column
from trytond.model import ModelView, ModelSQL, fields
from trytond import backend
@@ -12,7 +12,7 @@ from trytond.transaction import Transaction
from trytond.pool import Pool
from trytond.wizard import Wizard, StateView, Button
__all__ = ['PaymentTerm', 'PaymentTermLine',
__all__ = ['PaymentTerm', 'PaymentTermLine', 'PaymentTermLineRelativeDelta',
'TestPaymentTerm', 'TestPaymentTermView', 'TestPaymentTermViewResult']
@@ -126,44 +126,13 @@ class PaymentTermLine(ModelSQL, ModelView):
}, depends=['type'])
currency_digits = fields.Function(fields.Integer('Currency Digits'),
'on_change_with_currency_digits')
day = fields.Integer('Day of Month')
month = fields.Selection([
(None, ''),
('1', 'January'),
('2', 'February'),
('3', 'March'),
('4', 'April'),
('5', 'May'),
('6', 'June'),
('7', 'July'),
('8', 'August'),
('9', 'September'),
('10', 'October'),
('11', 'November'),
('12', 'December'),
], 'Month', sort=False)
weekday = fields.Selection([
(None, ''),
('0', 'Monday'),
('1', 'Tuesday'),
('2', 'Wednesday'),
('3', 'Thursday'),
('4', 'Friday'),
('5', 'Saturday'),
('6', 'Sunday'),
], 'Day of Week', sort=False)
months = fields.Integer('Number of Months', required=True)
weeks = fields.Integer('Number of Weeks', required=True)
days = fields.Integer('Number of Days', required=True)
relativedeltas = fields.One2Many(
'account.invoice.payment_term.line.relativedelta', 'line', 'Deltas')
@classmethod
def __setup__(cls):
super(PaymentTermLine, cls).__setup__()
cls._order.insert(0, ('sequence', 'ASC'))
cls._sql_constraints += [
('day', 'CHECK(day BETWEEN 1 AND 31)',
'Day of month must be between 1 and 31.'),
]
cls._error_messages.update({
'invalid_percentage_and_divisor': ('Percentage and '
'Divisor values are not consistent in line "%(line)s" '
@@ -216,18 +185,6 @@ class PaymentTermLine(ModelSQL, ModelView):
def default_type():
return 'remainder'
@staticmethod
def default_months():
return 0
@staticmethod
def default_weeks():
return 0
@staticmethod
def default_days():
return 0
@fields.depends('type')
def on_change_type(self):
if self.type != 'fixed':
@@ -270,7 +227,9 @@ class PaymentTermLine(ModelSQL, ModelView):
}
def get_date(self, date):
return date + relativedelta(**self.get_delta())
for relativedelta_ in self.relativedeltas:
date += relativedelta_.get()
return date
def get_value(self, remainder, amount, currency):
Currency = Pool().get('currency.currency')
@@ -326,6 +285,105 @@ class PaymentTermLine(ModelSQL, ModelView):
})
class PaymentTermLineRelativeDelta(ModelSQL, ModelView):
'Payment Term Line Relative Delta'
__name__ = 'account.invoice.payment_term.line.relativedelta'
sequence = fields.Integer('Sequence')
line = fields.Many2One('account.invoice.payment_term.line',
'Payment Term Line', required=True, ondelete='CASCADE')
day = fields.Integer('Day of Month',
domain=['OR',
('day', '=', None),
[('day', '>=', 1), ('day', '<=', 31)],
])
month = fields.Selection([
(None, ''),
('1', 'January'),
('2', 'February'),
('3', 'March'),
('4', 'April'),
('5', 'May'),
('6', 'June'),
('7', 'July'),
('8', 'August'),
('9', 'September'),
('10', 'October'),
('11', 'November'),
('12', 'December'),
], 'Month', sort=False)
weekday = fields.Selection([
(None, ''),
('0', 'Monday'),
('1', 'Tuesday'),
('2', 'Wednesday'),
('3', 'Thursday'),
('4', 'Friday'),
('5', 'Saturday'),
('6', 'Sunday'),
], 'Day of Week', sort=False)
months = fields.Integer('Number of Months', required=True)
weeks = fields.Integer('Number of Weeks', required=True)
days = fields.Integer('Number of Days', required=True)
@classmethod
def __setup__(cls):
super(PaymentTermLineRelativeDelta, cls).__setup__()
cls._order.insert(0, ('sequence', 'ASC'))
@classmethod
def __register__(cls, module_name):
TableHandler = backend.get('TableHandler')
cursor = Transaction().cursor
pool = Pool()
Line = pool.get('account.invoice.payment_term.line')
sql_table = cls.__table__()
line = Line.__table__()
super(PaymentTermLineRelativeDelta, cls).__register__(module_name)
line_table = TableHandler(cursor, Line, module_name)
# Migration from 3.4
fields = ['day', 'month', 'weekday', 'months', 'weeks', 'days']
if any(line_table.column_exist(f) for f in fields):
columns = ([line.id.as_('line')]
+ [Column(line, f) for f in fields])
cursor.execute(*sql_table.insert(
columns=[sql_table.line]
+ [Column(sql_table, f) for f in fields],
values=line.select(*columns)))
for field in fields:
line_table.drop_column(field, exception=True)
@staticmethod
def order_sequence(tables):
table, _ = tables[None]
return [table.sequence == Null, table.sequence]
@staticmethod
def default_months():
return 0
@staticmethod
def default_weeks():
return 0
@staticmethod
def default_days():
return 0
def get(self):
"Return the relativedelta"
return relativedelta(
day=self.day,
month=int(self.month) if self.month else None,
days=self.days,
weeks=self.weeks,
months=self.months,
weekday=int(self.weekday) if self.weekday else None,
)
class TestPaymentTerm(Wizard):
'Test Payment Term'
__name__ = 'account.invoice.payment_term.test'
payment_term.xml
+40
View File
@@ -85,6 +85,46 @@ this repository contains the full copyright notices and license terms. -->
<field name="perm_delete" eval="True"/>
</record>
<record model="ir.ui.view"
id="payment_term_line_relativedelta_view_list">
<field name="model">account.invoice.payment_term.line.relativedelta</field>
<field name="type">tree</field>
<field name="priority" eval="10"/>
<field name="name">payment_term_line_relativedelta_list</field>
</record>
<record model="ir.ui.view"
id="payment_term_line_relativedelta_view_list_sequence">
<field name="model">account.invoice.payment_term.line.relativedelta</field>
<field name="type">tree</field>
<field name="priority" eval="20"/>
<field name="name">payment_term_line_relativedelta_list_sequence</field>
</record>
<record model="ir.ui.view" id="payment_term_line_relativedelta_view_form">
<field name="model">account.invoice.payment_term.line.relativedelta</field>
<field name="type">form</field>
<field name="name">payment_term_line_relativedelta_form</field>
</record>
<record model="ir.model.access" id="access_payment_term_line_relativedelta">
<field name="model"
search="[('model', '=', 'account.invoice.payment_term.line.relativedelta')]"/>
<field name="perm_read" eval="True"/>
<field name="perm_write" eval="False"/>
<field name="perm_create" eval="False"/>
<field name="perm_delete" eval="False"/>
</record>
<record model="ir.model.access"
id="access_payment_term_line_relativedelta_account_admin">
<field name="model"
search="[('model', '=', 'account.invoice.payment_term.line.relativedelta')]"/>
<field name="group" ref="account.group_account_admin"/>
<field name="perm_read" eval="True"/>
<field name="perm_write" eval="True"/>
<field name="perm_create" eval="True"/>
<field name="perm_delete" eval="True"/>
</record>
<record model="ir.action.wizard" id="wizard_payment_term_test">
<field name="name">Test Payment Term</field>
<field name="wiz_name">account.invoice.payment_term.test</field>
tests/scenario_invoice.rst
+4 -6
View File
@@ -88,13 +88,11 @@ Create product::
Create payment term::
>>> PaymentTerm = Model.get('account.invoice.payment_term')
>>> PaymentTermLine = Model.get('account.invoice.payment_term.line')
>>> payment_term = PaymentTerm(name='Term')
>>> payment_term_line = PaymentTermLine(type='percent', days=20,
... percentage=Decimal(50))
>>> payment_term.lines.append(payment_term_line)
>>> payment_term_line = PaymentTermLine(type='remainder', days=40)
>>> payment_term.lines.append(payment_term_line)
>>> line = payment_term.lines.new(type='percent', percentage=Decimal(50))
>>> delta = line.relativedeltas.new(days=20)
>>> line = payment_term.lines.new(type='remainder')
>>> delta = line.relativedeltas.new(days=40)
>>> payment_term.save()
Create invoice::
tests/scenario_invoice_alternate_currency.rst
+4 -6
View File
@@ -90,13 +90,11 @@ Create product::
Create payment term::
>>> PaymentTerm = Model.get('account.invoice.payment_term')
>>> PaymentTermLine = Model.get('account.invoice.payment_term.line')
>>> payment_term = PaymentTerm(name='Term')
>>> payment_term_line = PaymentTermLine(type='percent', days=20,
... percentage=Decimal(50))
>>> payment_term.lines.append(payment_term_line)
>>> payment_term_line = PaymentTermLine(type='remainder', days=40)
>>> payment_term.lines.append(payment_term_line)
>>> line = payment_term.lines.new(type='percent', percentage=Decimal(50))
>>> delta = line.relativedeltas.new(days=20)
>>> line = payment_term.lines.new(type='remainder')
>>> delta = line.relativedeltas.new(days=40)
>>> payment_term.save()
Create invoice with alternate currency::
tests/scenario_invoice_supplier.rst
+1 -3
View File
@@ -87,10 +87,8 @@ Create product::
Create payment term::
>>> PaymentTerm = Model.get('account.invoice.payment_term')
>>> PaymentTermLine = Model.get('account.invoice.payment_term.line')
>>> payment_term = PaymentTerm(name='Term')
>>> payment_term_line = PaymentTermLine(type='remainder')
>>> payment_term.lines.append(payment_term_line)
>>> line = payment_term.lines.new(type='remainder')
>>> payment_term.save()
Create invoice::
tests/test_account_invoice.py
+23 -7
View File
@@ -37,26 +37,42 @@ class AccountInvoiceTestCase(ModuleTestCase):
'type': 'percent',
'divisor': 4,
'percentage': 25,
'days': 30,
'relativedeltas': [('create', [{
'days': 30,
},
]),
],
}, {
'sequence': 1,
'type': 'percent_on_total',
'divisor': 4,
'percentage': 25,
'months': 1,
'relativedeltas': [('create', [{
'months': 1,
},
]),
],
}, {
'sequence': 2,
'type': 'fixed',
'months': 1,
'days': 30,
'amount': Decimal('396.84'),
'currency': cu1.id,
'relativedeltas': [('create', [{
'months': 1,
'days': 30,
},
]),
],
}, {
'sequence': 3,
'type': 'remainder',
'months': 2,
'days': 30,
'day': 15,
'relativedeltas': [('create', [{
'months': 2,
'days': 30,
'day': 15,
},
]),
],
}])]
}])
terms = term.compute(Decimal('1587.35'), cu1,
tests/tools.py
+1 -1
View File
@@ -24,5 +24,5 @@ def create_payment_term(config=None):
PaymentTerm = Model.get('account.invoice.payment_term')
payment_term = PaymentTerm(name='Direct')
payment_term.lines.new(type='remainder', days=0)
payment_term.lines.new(type='remainder')
return payment_term
view/payment_term_line_form.xml
+5 -15
View File
@@ -1,29 +1,19 @@
<?xml version="1.0"?>
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
this repository contains the full copyright notices and license terms. -->
<form string="Payment Term Lines">
<form string="Payment Term Line">
<label name="type"/>
<field name="type"/>
<newline/>
<label name="sequence"/>
<field name="sequence"/>
<label name="amount"/>
<field name="amount"/>
<label name="currency"/>
<field name="currency"/>
<newline/>
<label name="percentage"/>
<field name="percentage"/>
<label name="divisor"/>
<field name="divisor"/>
<label name="months"/>
<field name="months"/>
<label name="month"/>
<field name="month"/>
<label name="weeks"/>
<field name="weeks"/>
<label name="weekday"/>
<field name="weekday"/>
<label name="days"/>
<field name="days"/>
<label name="day"/>
<field name="day"/>
<field name="relativedeltas" mode="form,tree" colspan="4"
view_ids="account_invoice.payment_term_line_relativedelta_view_form,account_invoice.payment_term_line_relativedelta_view_list_sequence"/>
</form>
view/payment_term_line_list.xml
-8
View File
@@ -7,12 +7,4 @@ this repository contains the full copyright notices and license terms. -->
<field name="percentage"/>
<field name="amount"/>
<field name="currency"/>
<field name="months"/>
<field name="month"/>
<field name="weeks"/>
<field name="weekday"/>
<field name="days"/>
<field name="day"/>
<field name="sequence" tree_invisible="1"/>
<field name="currency_digits" tree_invisible="1"/>
</tree>
view/payment_term_line_list_sequence.xml
-8
View File
@@ -6,12 +6,4 @@ this repository contains the full copyright notices and license terms. -->
<field name="percentage"/>
<field name="amount"/>
<field name="currency"/>
<field name="months"/>
<field name="month"/>
<field name="weeks"/>
<field name="weekday"/>
<field name="days"/>
<field name="day"/>
<field name="sequence" tree_invisible="1"/>
<field name="currency_digits" tree_invisible="1"/>
</tree>
view/payment_term_line_relativedelta_form.xml
+21
View File
@@ -0,0 +1,21 @@
<?xml version="1.0"?>
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
this repository contains the full copyright notices and license terms. -->
<form string="Payment Term Line Relative Delta">
<label name="line"/>
<field name="line"/>
<label name="sequence"/>
<field name="sequence"/>
<label name="months"/>
<field name="months"/>
<label name="month"/>
<field name="month"/>
<label name="weeks"/>
<field name="weeks"/>
<label name="weekday"/>
<field name="weekday"/>
<label name="days"/>
<field name="days"/>
<label name="day"/>
<field name="day"/>
</form>
view/payment_term_line_relativedelta_list.xml
+12
View File
@@ -0,0 +1,12 @@
<?xml version="1.0"?>
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
this repository contains the full copyright notices and license terms. -->
<tree string="Payment Term Line Relative Deltas">
<field name="line"/>
<field name="months"/>
<field name="month"/>
<field name="weeks"/>
<field name="weekday"/>
<field name="days"/>
<field name="day"/>
</tree>
view/payment_term_line_relativedelta_list_sequence.xml
+12
View File
@@ -0,0 +1,12 @@
<?xml version="1.0"?>
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
this repository contains the full copyright notices and license terms. -->
<tree string="Payment Term Line Relative Deltas" sequence="sequence">
<field name="line"/>
<field name="months"/>
<field name="month"/>
<field name="weeks"/>
<field name="weekday"/>
<field name="days"/>
<field name="day"/>
</tree>