Compare commits
26 commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
08d8121f57 | ||
![]() |
6aca58bcc2 | ||
![]() |
400ebed692 | ||
![]() |
865a2c7fa6 | ||
![]() |
852ff6871d | ||
![]() |
65437bc52e | ||
![]() |
206cd1e0e5 | ||
![]() |
d0f5b0aa38 | ||
![]() |
52011f5166 | ||
![]() |
f9e55fab77 | ||
![]() |
0442591d52 | ||
![]() |
5ef3a52fdc | ||
![]() |
5d8f924960 | ||
![]() |
9ef465f40f | ||
![]() |
d2ad96db35 | ||
![]() |
e79bcca989 | ||
![]() |
52e788db17 | ||
![]() |
72f0325a71 | ||
![]() |
7e6d2660ad | ||
![]() |
cf92b2d7b5 | ||
![]() |
7062399319 | ||
![]() |
fbdc68c642 | ||
![]() |
7220cff5ac | ||
![]() |
77ee7d15b7 | ||
![]() |
90298d3eb8 | ||
![]() |
e605d5f0d3 |
17 changed files with 46 additions and 71 deletions
2
.hgignore → .gitignore
vendored
2
.hgignore → .gitignore
vendored
|
@ -1,4 +1,4 @@
|
|||
syntax: glob
|
||||
*.pyc
|
||||
build/*
|
||||
dist/*
|
||||
mds_cashbook.egg-info/*
|
35
README.rst
35
README.rst
|
@ -9,7 +9,7 @@ pip install mds-cashbook
|
|||
|
||||
Requires
|
||||
========
|
||||
- Tryton 6.8
|
||||
- Tryton 7.0
|
||||
|
||||
How to
|
||||
======
|
||||
|
@ -153,35 +153,6 @@ currency are converted into the display currency of the parent cash book.
|
|||
Changes
|
||||
=======
|
||||
|
||||
*6.8.35 - 01.06.2024*
|
||||
*7.0.0 - 30.11.2023*
|
||||
|
||||
- add: config setting for fixate in booking-wizard
|
||||
|
||||
*6.8.34 - 30.05.2024*
|
||||
|
||||
- add: fixate of booking from booking-wizard
|
||||
|
||||
*6.8.33 - 31.12.2023*
|
||||
|
||||
- remove caching
|
||||
- add worker-based precalculation of cashbook-values
|
||||
|
||||
*6.8.32 - 06.12.2023*
|
||||
|
||||
- columns optional
|
||||
|
||||
*6.8.31 - 30.11.2023*
|
||||
|
||||
- optimized ir.rule
|
||||
|
||||
*6.8.30 - 25.07.2023*
|
||||
|
||||
- updt: optimize code, add tests
|
||||
|
||||
*6.8.29 - 24.07.2023*
|
||||
|
||||
- fix: type of indexes
|
||||
|
||||
*6.8.28 - 05.06.2023*
|
||||
|
||||
- init
|
||||
- compatibility to Tryton 7.0
|
||||
|
|
|
@ -17,6 +17,7 @@ from .reconciliation import Reconciliation
|
|||
from .cbreport import ReconciliationReport
|
||||
from .currency import CurrencyRate
|
||||
from .valuestore import ValueStore
|
||||
from .ir import Rule
|
||||
from .cron import Cron
|
||||
|
||||
|
||||
|
@ -36,6 +37,7 @@ def register():
|
|||
RunCbReportStart,
|
||||
EnterBookingStart,
|
||||
ValueStore,
|
||||
Rule,
|
||||
Cron,
|
||||
module='cashbook', type_='model')
|
||||
Pool.register(
|
||||
|
|
2
book.xml
2
book.xml
|
@ -121,7 +121,7 @@ full copyright notices and license terms. -->
|
|||
</record>
|
||||
<record model="ir.rule" id="rg_book_rw_owner-1">
|
||||
<field name="domain" eval="[
|
||||
('owner.id', '=', Eval('user', {}).get('id', -1)),
|
||||
('owner.id', '=', Eval('user_id', -1)),
|
||||
]" pyson="1"/>
|
||||
<field name="rule_group" ref="rg_book_rw_owner"/>
|
||||
</record>
|
||||
|
|
24
ir.py
Normal file
24
ir.py
Normal file
|
@ -0,0 +1,24 @@
|
|||
# -*- 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.book',
|
||||
'cashbook.line',
|
||||
'cashbook.recon',
|
||||
'cashbook.split'
|
||||
}
|
||||
|
||||
# end Rule
|
2
line.xml
2
line.xml
|
@ -145,7 +145,7 @@ full copyright notices and license terms. -->
|
|||
</record>
|
||||
<record model="ir.rule" id="rg_line_write-1">
|
||||
<field name="domain" eval="['OR',
|
||||
('cashbook.owner.id', '=', Eval('user', {}).get('id', -1)),
|
||||
('cashbook.owner.id', '=', Eval('user_id', -1)),
|
||||
('cashbook.reviewer.id', 'in', Eval('groups', [])),
|
||||
]" pyson="1"/>
|
||||
<field name="rule_group" ref="rg_line_write"/>
|
||||
|
|
12
locale/de.po
12
locale/de.po
|
@ -466,10 +466,6 @@ msgctxt "view:cashbook.book:"
|
|||
msgid "Amount and Numbering"
|
||||
msgstr "Betrag und Nummerierung"
|
||||
|
||||
msgctxt "view:cashbook.book:"
|
||||
msgid "Balance"
|
||||
msgstr "Saldo"
|
||||
|
||||
msgctxt "view:cashbook.book:"
|
||||
msgid "Reconciliations"
|
||||
msgstr "Abstimmungen"
|
||||
|
@ -794,14 +790,6 @@ msgctxt "model:cashbook.line,name:"
|
|||
msgid "Cashbook Line"
|
||||
msgstr "Kassenbuchzeile"
|
||||
|
||||
msgctxt "view:cashbook.line:"
|
||||
msgid "Credit"
|
||||
msgstr "Einnahme"
|
||||
|
||||
msgctxt "view:cashbook.line:"
|
||||
msgid "Debit"
|
||||
msgstr "Ausgabe"
|
||||
|
||||
msgctxt "view:cashbook.line:"
|
||||
msgid "Cashbook Line"
|
||||
msgstr "Kassenbuchzeile"
|
||||
|
|
12
locale/en.po
12
locale/en.po
|
@ -426,10 +426,6 @@ msgctxt "view:cashbook.book:"
|
|||
msgid "Amount and Numbering"
|
||||
msgstr "Amount and Numbering"
|
||||
|
||||
msgctxt "view:cashbook.book:"
|
||||
msgid "Balance"
|
||||
msgstr "Balance"
|
||||
|
||||
msgctxt "view:cashbook.book:"
|
||||
msgid "Reconciliations"
|
||||
msgstr "Reconciliations"
|
||||
|
@ -746,14 +742,6 @@ msgctxt "model:cashbook.line,name:"
|
|||
msgid "Cashbook Line"
|
||||
msgstr "Cashbook Line"
|
||||
|
||||
msgctxt "view:cashbook.line:"
|
||||
msgid "Credit"
|
||||
msgstr "Credit"
|
||||
|
||||
msgctxt "view:cashbook.line:"
|
||||
msgid "Debit"
|
||||
msgstr "Debit"
|
||||
|
||||
msgctxt "view:cashbook.line:"
|
||||
msgid "Cashbook Line"
|
||||
msgstr "Cashbook Line"
|
||||
|
|
|
@ -96,7 +96,7 @@ full copyright notices and license terms. -->
|
|||
</record>
|
||||
<record model="ir.rule" id="rg_recon_write-1">
|
||||
<field name="domain" eval="['OR',
|
||||
('cashbook.owner.id', '=', Eval('user', {}).get('id', -1)),
|
||||
('cashbook.owner.id', '=', Eval('user_id', -1)),
|
||||
('cashbook.reviewer.id', 'in', Eval('groups', [])),
|
||||
]" pyson="1"/>
|
||||
<field name="rule_group" ref="rg_recon_write"/>
|
||||
|
|
5
setup.py
5
setup.py
|
@ -39,8 +39,8 @@ with open(path.join(here, 'versiondep.txt'), encoding='utf-8') as f:
|
|||
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 = ['python-slugify']
|
||||
for dep in info.get('depends', []):
|
||||
|
@ -91,6 +91,7 @@ setup(
|
|||
'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',
|
||||
|
|
|
@ -80,7 +80,7 @@ full copyright notices and license terms. -->
|
|||
</record>
|
||||
<record model="ir.rule" id="rg_split_write-1">
|
||||
<field name="domain" eval="['OR',
|
||||
('line.cashbook.owner.id', '=', Eval('user', {}).get('id', -1)),
|
||||
('line.cashbook.owner.id', '=', Eval('user_id', -1)),
|
||||
('line.cashbook.reviewer.id', 'in', Eval('groups', [])),
|
||||
]" pyson="1"/>
|
||||
<field name="rule_group" ref="rg_split_write"/>
|
||||
|
|
|
@ -1,10 +1,11 @@
|
|||
[tryton]
|
||||
version=6.8.35
|
||||
version=7.0.0
|
||||
depends:
|
||||
res
|
||||
currency
|
||||
party
|
||||
company
|
||||
irrulecontext
|
||||
xml:
|
||||
icon.xml
|
||||
group.xml
|
||||
|
|
|
@ -1 +1 @@
|
|||
|
||||
irrulecontext;7.0.1;7.0.999;mds
|
||||
|
|
|
@ -4,7 +4,7 @@ The COPYRIGHT file at the top level of this repository contains the
|
|||
full copyright notices and license terms. -->
|
||||
<tree keyword_open="1">
|
||||
<field name="rec_name" expand="1"/>
|
||||
<field name="balance" sum="Balance" symbol="currency"/>
|
||||
<field name="balance" sum="1" symbol="currency"/>
|
||||
<field name="balance_all" symbol="currency" optional="1"/>
|
||||
<field name="balance_ref" symbol="company_currency" optional="1"/>
|
||||
<field name="state" optional="0"/>
|
||||
|
|
|
@ -9,8 +9,8 @@ full copyright notices and license terms. -->
|
|||
<field name="payee"/>
|
||||
<field name="category_view"/>
|
||||
<field name="descr_short" expand="1"/>
|
||||
<field name="credit" sum="Credit" optional="0"/>
|
||||
<field name="debit" sum="Debit" optional="0"/>
|
||||
<field name="credit" sum="1" optional="0"/>
|
||||
<field name="debit" sum="1" optional="0"/>
|
||||
<field name="balance" optional="0"/>
|
||||
<field name="state" optional="0"/>
|
||||
<button name="wfcheck"/>
|
||||
|
|
|
@ -9,8 +9,8 @@ full copyright notices and license terms. -->
|
|||
<field name="payee" optional="0"/>
|
||||
<field name="category_view" optional="0"/>
|
||||
<field name="descr_short" expand="1" optional="0"/>
|
||||
<field name="credit" sum="Credit" optional="0"/>
|
||||
<field name="debit" sum="Debit" optional="0"/>
|
||||
<field name="credit" sum="1" optional="0"/>
|
||||
<field name="debit" sum="1" optional="0"/>
|
||||
<field name="state" optional="0"/>
|
||||
<button name="wfrecon"/>
|
||||
</tree>
|
||||
|
|
|
@ -9,6 +9,6 @@ full copyright notices and license terms. -->
|
|||
<field name="category"/>
|
||||
<field name="booktransf"/>
|
||||
<field name="description" expand="1" optional="0"/>
|
||||
<field name="amount" sum="Amount" symbol="currency" optional="0"/>
|
||||
<field name="amount" sum="1" symbol="currency" optional="0"/>
|
||||
<field name="amount_2nd_currency" symbol="currency2nd" optional="0"/>
|
||||
</tree>
|
||||
|
|
Loading…
Reference in a new issue