Compare commits
5 commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
1bfa987746 | ||
![]() |
f7fee173d7 | ||
![]() |
a98b4387c4 | ||
![]() |
176c8d93a7 | ||
![]() |
126daacf0a |
8 changed files with 66 additions and 44 deletions
2
.hgignore → .gitignore
vendored
2
.hgignore → .gitignore
vendored
|
@ -1,4 +1,4 @@
|
|||
syntax: glob
|
||||
*.pyc
|
||||
build/*
|
||||
mds_cashbook_bookcategory.egg-info/*
|
||||
dist/*
|
|
@ -9,11 +9,11 @@ pip install mds-cashbook-bookcategory
|
|||
|
||||
Requires
|
||||
========
|
||||
- Tryton 6.8
|
||||
- Tryton 7.0
|
||||
|
||||
Changes
|
||||
=======
|
||||
|
||||
*6.8.4 - 05.06.2023*
|
||||
*7.0.0 - 01.12.2023*
|
||||
|
||||
- code optimized, porting to Tryton 6.8
|
||||
- compatibilty to Tryton 7.0
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
from trytond.pool import Pool
|
||||
from .category import Category
|
||||
from .book import CategoryCashbookRel, Cashbook
|
||||
from .ir import Rule
|
||||
|
||||
|
||||
def register():
|
||||
|
@ -13,4 +14,5 @@ def register():
|
|||
Category,
|
||||
Cashbook,
|
||||
CategoryCashbookRel,
|
||||
Rule,
|
||||
module='cashbook_bookcategory', type_='model')
|
||||
|
|
|
@ -115,7 +115,7 @@
|
|||
</record>
|
||||
<record model="ir.rule" id="rg_category_rw_owner-1">
|
||||
<field name="domain" eval="[
|
||||
('create_uid.id', '=', Eval('user', {}).get('id', -1)),
|
||||
('create_uid.id', '=', Eval('user_id', -1)),
|
||||
]" pyson="1"/>
|
||||
<field name="rule_group" ref="rg_category_rw_owner"/>
|
||||
</record>
|
||||
|
|
21
ir.py
Normal file
21
ir.py
Normal file
|
@ -0,0 +1,21 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# This file is part of the cashbook-module from m-ds.de for Tryton.
|
||||
# The COPYRIGHT file at the top level of this repository contains the
|
||||
# full copyright notices and license terms.
|
||||
|
||||
from trytond.pool import PoolMeta
|
||||
|
||||
|
||||
class Rule(metaclass=PoolMeta):
|
||||
__name__ = 'ir.rule'
|
||||
|
||||
@classmethod
|
||||
def _context_modelnames(cls):
|
||||
""" list of models to add 'user_id' to context
|
||||
"""
|
||||
result = super(Rule, cls)._context_modelnames()
|
||||
return result | {
|
||||
'cashbook.bookcategory',
|
||||
}
|
||||
|
||||
# end Rule
|
73
setup.py
73
setup.py
|
@ -2,7 +2,7 @@
|
|||
"""
|
||||
|
||||
# Always prefer setuptools over distutils
|
||||
from setuptools import setup, find_packages
|
||||
from setuptools import setup
|
||||
# To use a consistent encoding
|
||||
from codecs import open
|
||||
from os import path
|
||||
|
@ -36,11 +36,11 @@ with open(path.join(here, 'versiondep.txt'), encoding='utf-8') as f:
|
|||
l2 = i.strip().split(';')
|
||||
if len(l2) < 4:
|
||||
continue
|
||||
modversion[l2[0]] = {'min':l2[1], 'max':l2[2], 'prefix':l2[3]}
|
||||
modversion[l2[0]] = {'min': l2[1], 'max': l2[2], 'prefix': l2[3]}
|
||||
|
||||
# tryton-version
|
||||
major_version = 6
|
||||
minor_version = 8
|
||||
major_version = 7
|
||||
minor_version = 0
|
||||
|
||||
requires = []
|
||||
for dep in info.get('depends', []):
|
||||
|
@ -51,19 +51,21 @@ for dep in info.get('depends', []):
|
|||
prefix = modversion[dep]['prefix']
|
||||
|
||||
if len(modversion[dep]['max']) > 0:
|
||||
requires.append('%s_%s >= %s, <= %s' %
|
||||
(prefix, dep, modversion[dep]['min'], modversion[dep]['max']))
|
||||
else :
|
||||
requires.append('%s_%s >= %s' %
|
||||
(prefix, dep, modversion[dep]['min']))
|
||||
else :
|
||||
requires.append('%s_%s >= %s.%s, < %s.%s' %
|
||||
('trytond', dep, major_version, minor_version,
|
||||
requires.append('%s_%s >= %s, <= %s' % (
|
||||
prefix, dep, modversion[dep]['min'],
|
||||
modversion[dep]['max']))
|
||||
else:
|
||||
requires.append('%s_%s >= %s' % (
|
||||
prefix, dep, modversion[dep]['min']))
|
||||
else:
|
||||
requires.append('%s_%s >= %s.%s, < %s.%s' % (
|
||||
'trytond', dep, major_version, minor_version,
|
||||
major_version, minor_version + 1))
|
||||
requires.append('trytond >= %s.%s, < %s.%s' %
|
||||
(major_version, minor_version, major_version, minor_version + 1))
|
||||
requires.append('trytond >= %s.%s, < %s.%s' % (
|
||||
major_version, minor_version, major_version, minor_version + 1))
|
||||
|
||||
setup(name='%s_%s' % (PREFIX, MODULE),
|
||||
setup(
|
||||
name='%s_%s' % (PREFIX, MODULE),
|
||||
version=info.get('version', '0.0.1'),
|
||||
description='Tryton module to add categories for cashbooks.',
|
||||
long_description=long_description,
|
||||
|
@ -74,36 +76,33 @@ setup(name='%s_%s' % (PREFIX, MODULE),
|
|||
author_email='service@m-ds.de',
|
||||
license='GPL-3',
|
||||
classifiers=[
|
||||
'Development Status :: 5 - Production/Stable',
|
||||
'Environment :: Plugins',
|
||||
'Framework :: Tryton',
|
||||
'Intended Audience :: Developers',
|
||||
'Intended Audience :: Customer Service',
|
||||
'Intended Audience :: Information Technology',
|
||||
'Intended Audience :: Financial and Insurance Industry',
|
||||
'Topic :: Office/Business',
|
||||
'Topic :: Office/Business :: Financial :: Accounting',
|
||||
'Natural Language :: German',
|
||||
'Natural Language :: English',
|
||||
'Operating System :: OS Independent',
|
||||
'License :: OSI Approved :: GNU General Public License (GPL)',
|
||||
'Programming Language :: Python :: 3.7',
|
||||
'Programming Language :: Python :: 3.8',
|
||||
'Programming Language :: Python :: 3.9',
|
||||
'Development Status :: 5 - Production/Stable',
|
||||
'Environment :: Plugins',
|
||||
'Framework :: Tryton',
|
||||
'Intended Audience :: Developers',
|
||||
'Intended Audience :: Customer Service',
|
||||
'Intended Audience :: Information Technology',
|
||||
'Intended Audience :: Financial and Insurance Industry',
|
||||
'Topic :: Office/Business',
|
||||
'Topic :: Office/Business :: Financial :: Accounting',
|
||||
'Natural Language :: German',
|
||||
'Natural Language :: English',
|
||||
'Operating System :: OS Independent',
|
||||
'License :: OSI Approved :: GNU General Public License (GPL)',
|
||||
'Programming Language :: Python :: 3.7',
|
||||
'Programming Language :: Python :: 3.8',
|
||||
'Programming Language :: Python :: 3.9',
|
||||
],
|
||||
|
||||
keywords='tryton cashbook category',
|
||||
package_dir={'trytond.modules.%s' % MODULE: '.'},
|
||||
packages=[
|
||||
'trytond.modules.%s' % MODULE,
|
||||
],
|
||||
package_data={
|
||||
'trytond.modules.%s' % MODULE: (info.get('xml', [])
|
||||
+ ['tryton.cfg', 'locale/*.po', 'tests/*.py',
|
||||
'view/*.xml',
|
||||
'versiondep.txt', 'README.rst']),
|
||||
'trytond.modules.%s' % MODULE: (info.get('xml', []) + [
|
||||
'tryton.cfg', 'locale/*.po', 'tests/*.py',
|
||||
'view/*.xml', 'versiondep.txt', 'README.rst']),
|
||||
},
|
||||
|
||||
install_requires=requires,
|
||||
zip_safe=False,
|
||||
entry_points="""
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
[tryton]
|
||||
version=6.8.4
|
||||
version=7.0.0
|
||||
depends:
|
||||
cashbook
|
||||
xml:
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
cashbook;6.8.28;6.8.999;mds
|
||||
cashbook;7.0.31;7.0.999;mds
|
||||
|
||||
|
|
Loading…
Reference in a new issue