Browse Source

[MIG] sequence_reset_period: Change dates to new date field standard

pull/64/head
Jaume Planas 6 years ago
parent
commit
892d93936b
  1. 14
      sequence_reset_period/models/ir_sequence.py
  2. 407
      sequence_reset_period/static/description/index.html
  3. 20
      sequence_reset_period/tests/test_period.py

14
sequence_reset_period/models/ir_sequence.py

@ -2,7 +2,7 @@
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
from odoo import fields, models from odoo import fields, models
from datetime import datetime, timedelta, date as datetime_date
from datetime import timedelta, date as datetime_date
from dateutil.relativedelta import relativedelta from dateutil.relativedelta import relativedelta
@ -18,7 +18,7 @@ class IrSequence(models.Model):
def _compute_date_from_to(self, date): def _compute_date_from_to(self, date):
self.ensure_one() self.ensure_one()
date_from = date_to = fields.Date.from_string(date)
date_from = date_to = date
if self.range_reset == 'weekly': if self.range_reset == 'weekly':
date_from = date_from - timedelta(days=date_from.weekday()) date_from = date_from - timedelta(days=date_from.weekday())
date_to = date_from + timedelta(days=6) date_to = date_from + timedelta(days=6)
@ -29,7 +29,7 @@ class IrSequence(models.Model):
elif self.range_reset == 'yearly': elif self.range_reset == 'yearly':
date_from = datetime_date(date_from.year, 1, 1) date_from = datetime_date(date_from.year, 1, 1)
date_to = datetime_date(date_from.year, 12, 31) date_to = datetime_date(date_from.year, 12, 31)
return date_from.strftime('%Y-%m-%d'), date_to.strftime('%Y-%m-%d')
return date_from, date_to
def _create_date_range_seq(self, date): def _create_date_range_seq(self, date):
self.ensure_one() self.ensure_one()
@ -40,16 +40,12 @@ class IrSequence(models.Model):
[('sequence_id', '=', self.id), ('date_from', '>=', date), [('sequence_id', '=', self.id), ('date_from', '>=', date),
('date_from', '<=', date_to)], order='date_from desc', limit=1) ('date_from', '<=', date_to)], order='date_from desc', limit=1)
if date_range: if date_range:
date_to = datetime.strptime(date_range.date_from,
'%Y-%m-%d') + timedelta(days=-1)
date_to = date_to.strftime('%Y-%m-%d')
date_to = date_range.date_from + timedelta(days=-1)
date_range = self.env['ir.sequence.date_range'].search( date_range = self.env['ir.sequence.date_range'].search(
[('sequence_id', '=', self.id), ('date_to', '>=', date_from), [('sequence_id', '=', self.id), ('date_to', '>=', date_from),
('date_to', '<=', date)], order='date_to desc', limit=1) ('date_to', '<=', date)], order='date_to desc', limit=1)
if date_range: if date_range:
date_from = datetime.strptime(date_range.date_to,
'%Y-%m-%d') + timedelta(days=1)
date_from = date_from.strftime('%Y-%m-%d')
date_from = date_range.date_to + timedelta(days=1)
seq_date_range = self.env['ir.sequence.date_range'].sudo().create({ seq_date_range = self.env['ir.sequence.date_range'].sudo().create({
'date_from': date_from, 'date_from': date_from,
'date_to': date_to, 'date_to': date_to,

407
sequence_reset_period/static/description/index.html

@ -0,0 +1,407 @@
<?xml version="1.0" encoding="utf-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
<title>Reset Sequences on selected period ranges</title>
<style type="text/css">
/*
:Author: David Goodger (goodger@python.org)
:Id: $Id: html4css1.css 7614 2013-02-21 15:55:51Z milde $
:Copyright: This stylesheet has been placed in the public domain.
Default cascading style sheet for the HTML output of Docutils.
See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
customize this style sheet.
*/
/* used to remove borders from tables and images */
.borderless, table.borderless td, table.borderless th {
border: 0 }
table.borderless td, table.borderless th {
/* Override padding for "table.docutils td" with "! important".
The right padding separates the table cells. */
padding: 0 0.5em 0 0 ! important }
.first {
/* Override more specific margin styles with "! important". */
margin-top: 0 ! important }
.last, .with-subtitle {
margin-bottom: 0 ! important }
.hidden {
display: none }
a.toc-backref {
text-decoration: none ;
color: black }
blockquote.epigraph {
margin: 2em 5em ; }
dl.docutils dd {
margin-bottom: 0.5em }
object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
overflow: hidden;
}
/* Uncomment (and remove this text!) to get bold-faced definition list terms
dl.docutils dt {
font-weight: bold }
*/
div.abstract {
margin: 2em 5em }
div.abstract p.topic-title {
font-weight: bold ;
text-align: center }
div.admonition, div.attention, div.caution, div.danger, div.error,
div.hint, div.important, div.note, div.tip, div.warning {
margin: 2em ;
border: medium outset ;
padding: 1em }
div.admonition p.admonition-title, div.hint p.admonition-title,
div.important p.admonition-title, div.note p.admonition-title,
div.tip p.admonition-title {
font-weight: bold ;
font-family: sans-serif }
div.attention p.admonition-title, div.caution p.admonition-title,
div.danger p.admonition-title, div.error p.admonition-title,
div.warning p.admonition-title, .code .error {
color: red ;
font-weight: bold ;
font-family: sans-serif }
/* Uncomment (and remove this text!) to get reduced vertical space in
compound paragraphs.
div.compound .compound-first, div.compound .compound-middle {
margin-bottom: 0.5em }
div.compound .compound-last, div.compound .compound-middle {
margin-top: 0.5em }
*/
div.dedication {
margin: 2em 5em ;
text-align: center ;
font-style: italic }
div.dedication p.topic-title {
font-weight: bold ;
font-style: normal }
div.figure {
margin-left: 2em ;
margin-right: 2em }
div.footer, div.header {
clear: both;
font-size: smaller }
div.line-block {
display: block ;
margin-top: 1em ;
margin-bottom: 1em }
div.line-block div.line-block {
margin-top: 0 ;
margin-bottom: 0 ;
margin-left: 1.5em }
div.sidebar {
margin: 0 0 0.5em 1em ;
border: medium outset ;
padding: 1em ;
background-color: #ffffee ;
width: 40% ;
float: right ;
clear: right }
div.sidebar p.rubric {
font-family: sans-serif ;
font-size: medium }
div.system-messages {
margin: 5em }
div.system-messages h1 {
color: red }
div.system-message {
border: medium outset ;
padding: 1em }
div.system-message p.system-message-title {
color: red ;
font-weight: bold }
div.topic {
margin: 2em }
h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
margin-top: 0.4em }
h1.title {
text-align: center }
h2.subtitle {
text-align: center }
hr.docutils {
width: 75% }
img.align-left, .figure.align-left, object.align-left {
clear: left ;
float: left ;
margin-right: 1em }
img.align-right, .figure.align-right, object.align-right {
clear: right ;
float: right ;
margin-left: 1em }
img.align-center, .figure.align-center, object.align-center {
display: block;
margin-left: auto;
margin-right: auto;
}
.align-left {
text-align: left }
.align-center {
clear: both ;
text-align: center }
.align-right {
text-align: right }
/* reset inner alignment in figures */
div.align-right {
text-align: inherit }
/* div.align-center * { */
/* text-align: left } */
ol.simple, ul.simple {
margin-bottom: 1em }
ol.arabic {
list-style: decimal }
ol.loweralpha {
list-style: lower-alpha }
ol.upperalpha {
list-style: upper-alpha }
ol.lowerroman {
list-style: lower-roman }
ol.upperroman {
list-style: upper-roman }
p.attribution {
text-align: right ;
margin-left: 50% }
p.caption {
font-style: italic }
p.credits {
font-style: italic ;
font-size: smaller }
p.label {
white-space: nowrap }
p.rubric {
font-weight: bold ;
font-size: larger ;
color: maroon ;
text-align: center }
p.sidebar-title {
font-family: sans-serif ;
font-weight: bold ;
font-size: larger }
p.sidebar-subtitle {
font-family: sans-serif ;
font-weight: bold }
p.topic-title {
font-weight: bold }
pre.address {
margin-bottom: 0 ;
margin-top: 0 ;
font: inherit }
pre.literal-block, pre.doctest-block, pre.math, pre.code {
margin-left: 2em ;
margin-right: 2em }
pre.code .ln { color: grey; } /* line numbers */
pre.code, code { background-color: #eeeeee }
pre.code .comment, code .comment { color: #5C6576 }
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
pre.code .literal.string, code .literal.string { color: #0C5404 }
pre.code .name.builtin, code .name.builtin { color: #352B84 }
pre.code .deleted, code .deleted { background-color: #DEB0A1}
pre.code .inserted, code .inserted { background-color: #A3D289}
span.classifier {
font-family: sans-serif ;
font-style: oblique }
span.classifier-delimiter {
font-family: sans-serif ;
font-weight: bold }
span.interpreted {
font-family: sans-serif }
span.option {
white-space: nowrap }
span.pre {
white-space: pre }
span.problematic {
color: red }
span.section-subtitle {
/* font-size relative to parent (h1..h6 element) */
font-size: 80% }
table.citation {
border-left: solid 1px gray;
margin-left: 1px }
table.docinfo {
margin: 2em 4em }
table.docutils {
margin-top: 0.5em ;
margin-bottom: 0.5em }
table.footnote {
border-left: solid 1px black;
margin-left: 1px }
table.docutils td, table.docutils th,
table.docinfo td, table.docinfo th {
padding-left: 0.5em ;
padding-right: 0.5em ;
vertical-align: top }
table.docutils th.field-name, table.docinfo th.docinfo-name {
font-weight: bold ;
text-align: left ;
white-space: nowrap ;
padding-left: 0 }
/* "booktabs" style (no vertical lines) */
table.docutils.booktabs {
border: 0px;
border-top: 2px solid;
border-bottom: 2px solid;
border-collapse: collapse;
}
table.docutils.booktabs * {
border: 0px;
}
table.docutils.booktabs th {
border-bottom: thin solid;
text-align: left;
}
h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
font-size: 100% }
ul.auto-toc {
list-style-type: none }
</style>
</head>
<body>
<div class="document" id="reset-sequences-on-selected-period-ranges">
<h1 class="title">Reset Sequences on selected period ranges</h1>
<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/licence-LGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/server-ux/tree/12.0-mig-sequence_reset_period/sequence_reset_period"><img alt="OCA/server-ux" src="https://img.shields.io/badge/github-OCA%2Fserver--ux-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/server-ux-12-0-mig-sequence_reset_period/server-ux-12-0-mig-sequence_reset_period-sequence_reset_period"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/250/12.0-mig-sequence_reset_period"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
<p>This module was written to reset the sequences on the specified times, because
by default they are reset yearly.</p>
<p><strong>Table of contents</strong></p>
<div class="contents local topic" id="contents">
<ul class="simple">
<li><a class="reference internal" href="#usage" id="id1">Usage</a></li>
<li><a class="reference internal" href="#bug-tracker" id="id2">Bug Tracker</a></li>
<li><a class="reference internal" href="#credits" id="id3">Credits</a><ul>
<li><a class="reference internal" href="#authors" id="id4">Authors</a></li>
<li><a class="reference internal" href="#contributors" id="id5">Contributors</a></li>
<li><a class="reference internal" href="#maintainers" id="id6">Maintainers</a></li>
</ul>
</li>
</ul>
</div>
<div class="section" id="usage">
<h1><a class="toc-backref" href="#id1">Usage</a></h1>
<ul class="simple">
<li>Access sequences and configurate the model to use.</li>
<li>When sequence is computed, date_range will follow the specified rules</li>
</ul>
</div>
<div class="section" id="bug-tracker">
<h1><a class="toc-backref" href="#id2">Bug Tracker</a></h1>
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/server-ux/issues">GitHub Issues</a>.
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
<a class="reference external" href="https://github.com/OCA/server-ux/issues/new?body=module:%20sequence_reset_period%0Aversion:%2012.0-mig-sequence_reset_period%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
<p>Do not contact contributors directly about support or help with technical issues.</p>
</div>
<div class="section" id="credits">
<h1><a class="toc-backref" href="#id3">Credits</a></h1>
<div class="section" id="authors">
<h2><a class="toc-backref" href="#id4">Authors</a></h2>
<ul class="simple">
<li>Creu Blanca</li>
</ul>
</div>
<div class="section" id="contributors">
<h2><a class="toc-backref" href="#id5">Contributors</a></h2>
<ul class="simple">
<li>Enric Tobella &lt;<a class="reference external" href="mailto:etobella&#64;creublanca.es">etobella&#64;creublanca.es</a>&gt;</li>
<li>Jaume Planas &lt;<a class="reference external" href="mailto:jaume.planas&#64;minorisa.net">jaume.planas&#64;minorisa.net</a>&gt;</li>
</ul>
</div>
<div class="section" id="maintainers">
<h2><a class="toc-backref" href="#id6">Maintainers</a></h2>
<p>This module is maintained by the OCA.</p>
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
<p>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.</p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/server-ux/tree/12.0-mig-sequence_reset_period/sequence_reset_period">OCA/server-ux</a> project on GitHub.</p>
<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
</div>
</div>
</div>
</body>
</html>

20
sequence_reset_period/tests/test_period.py

@ -3,13 +3,13 @@
from odoo.tests import common from odoo.tests import common
from datetime import datetime
from datetime import date
class TestSequence(common.TransactionCase): class TestSequence(common.TransactionCase):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
self.date = datetime(2018, 3, 14).strftime('%Y-%m-%d')
self.date = date(2018, 3, 14)
def get_sequence(self, method): def get_sequence(self, method):
return self.env['ir.sequence'].create({ return self.env['ir.sequence'].create({
@ -27,8 +27,8 @@ class TestSequence(common.TransactionCase):
ir_sequence_date=self.date).next_by_id()) ir_sequence_date=self.date).next_by_id())
range = sequence.date_range_ids range = sequence.date_range_ids
self.assertTrue(range) self.assertTrue(range)
self.assertEqual('2018-01-01', range.date_from)
self.assertEqual('2018-12-31', range.date_to)
self.assertEqual(date(2018, 1, 1), range.date_from)
self.assertEqual(date(2018, 12, 31), range.date_to)
def test_daily(self): def test_daily(self):
sequence = self.get_sequence('daily') sequence = self.get_sequence('daily')
@ -47,8 +47,8 @@ class TestSequence(common.TransactionCase):
ir_sequence_date=self.date).next_by_id()) ir_sequence_date=self.date).next_by_id())
range = sequence.date_range_ids range = sequence.date_range_ids
self.assertTrue(range) self.assertTrue(range)
self.assertEqual('2018-03-12', range.date_from)
self.assertEqual('2018-03-18', range.date_to)
self.assertEqual(date(2018, 3, 12), range.date_from)
self.assertEqual(date(2018, 3, 18), range.date_to)
def test_monthly(self): def test_monthly(self):
sequence = self.get_sequence('monthly') sequence = self.get_sequence('monthly')
@ -57,8 +57,8 @@ class TestSequence(common.TransactionCase):
ir_sequence_date=self.date).next_by_id()) ir_sequence_date=self.date).next_by_id())
range = sequence.date_range_ids range = sequence.date_range_ids
self.assertTrue(range) self.assertTrue(range)
self.assertEqual('2018-03-01', range.date_from)
self.assertEqual('2018-03-31', range.date_to)
self.assertEqual(date(2018, 3, 1), range.date_from)
self.assertEqual(date(2018, 3, 31), range.date_to)
def test_yearly(self): def test_yearly(self):
sequence = self.get_sequence('yearly') sequence = self.get_sequence('yearly')
@ -67,5 +67,5 @@ class TestSequence(common.TransactionCase):
ir_sequence_date=self.date).next_by_id()) ir_sequence_date=self.date).next_by_id())
range = sequence.date_range_ids range = sequence.date_range_ids
self.assertTrue(range) self.assertTrue(range)
self.assertEqual('2018-01-01', range.date_from)
self.assertEqual('2018-12-31', range.date_to)
self.assertEqual(date(2018, 1, 1), range.date_from)
self.assertEqual(date(2018, 12, 31), range.date_to)
Loading…
Cancel
Save